From konradm at fedoraproject.org Fri May 1 00:12:43 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Fri, 1 May 2009 00:12:43 +0000 (UTC) Subject: rpms/gmp-ecm/devel .cvsignore, 1.2, 1.3 gmp-ecm.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090501001243.509C17011D@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/gmp-ecm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv926 Modified Files: .cvsignore gmp-ecm.spec sources Log Message: * Thu Apr 30 2009 Conrad Meyer - 6.2.3-1 - Bump to 6.2.3. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gmp-ecm/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 5 Dec 2008 16:43:24 -0000 1.2 +++ .cvsignore 1 May 2009 00:12:12 -0000 1.3 @@ -1 +1 @@ -ecm-6.2.1.tar.gz +ecm-6.2.3.tar.gz Index: gmp-ecm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmp-ecm/devel/gmp-ecm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- gmp-ecm.spec 24 Feb 2009 22:26:21 -0000 1.2 +++ gmp-ecm.spec 1 May 2009 00:12:12 -0000 1.3 @@ -1,6 +1,6 @@ Name: gmp-ecm -Version: 6.2.1 -Release: 5%{?dist} +Version: 6.2.3 +Release: 1%{?dist} Summary: Elliptic Curve Method for Integer Factorization Group: Applications/Engineering License: LGPLv2+ and GPLv2+ @@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 30 2009 Conrad Meyer - 6.2.3-1 +- Bump to 6.2.3. + * Tue Feb 24 2009 Fedora Release Engineering - 6.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gmp-ecm/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 5 Dec 2008 16:43:24 -0000 1.2 +++ sources 1 May 2009 00:12:12 -0000 1.3 @@ -1 +1 @@ -acd90a6063072b2e5d6f7617fee1aab2 ecm-6.2.1.tar.gz +acd90a6063072b2e5d6f7617fee1aab2 ecm-6.2.3.tar.gz From jkeating at fedoraproject.org Fri May 1 00:20:02 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 1 May 2009 00:20:02 +0000 (UTC) Subject: rpms/anaconda/F-11 .cvsignore, 1.638, 1.639 anaconda.spec, 1.788, 1.789 import.log, 1.1, 1.2 sources, 1.772, 1.773 Message-ID: <20090501002002.1C9777011D@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/anaconda/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2816/F-11 Modified Files: .cvsignore anaconda.spec import.log sources Log Message: Import the build done on devel/ here on F-11 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/.cvsignore,v retrieving revision 1.638 retrieving revision 1.639 diff -u -p -r1.638 -r1.639 --- .cvsignore 22 Apr 2009 02:36:24 -0000 1.638 +++ .cvsignore 1 May 2009 00:19:30 -0000 1.639 @@ -1,2 +1 @@ -clog -anaconda-11.5.0.47.tar.bz2 +anaconda-11.5.0.48.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda.spec,v retrieving revision 1.788 retrieving revision 1.789 diff -u -p -r1.788 -r1.789 --- anaconda.spec 22 Apr 2009 02:36:24 -0000 1.788 +++ anaconda.spec 1 May 2009 00:19:31 -0000 1.789 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.5.0.47 +Version: 11.5.0.48 Release: 1 License: GPLv2+ Group: Applications/System @@ -213,6 +213,50 @@ update-desktop-database &> /dev/null || %endif %changelog +* Fri Apr 24 2009 Chris Lumens - 11.5.0.48-1 +- Fix handling of swap files. (#496529) (dlehman) +- Pass anaconda to turnOnSwap so we can use swap files. (dlehman) +- Fix incorrect attribute name use for retrofit flag. (dlehman) +- Use slightly better checks when testing for 0 size (#493656, #497186, + #497389). (clumens) +- If the LV has no child, don't attempt to grab its format (#497239). + (clumens) +- Apply the global passphrase when doing kickstart autopart (#497533). + (clumens) +- Add support for encryption passphrase retrofits. (dlehman) +- Bring luks_add_key and luks_remove_key back into devicelibs.crypto. + (dlehman) +- Don't let lvremove failures from incomplete vgs crash the install. + (#497401) (dlehman) +- Allow setting a mountpoint w/o formatting an encrypted partition. + (#495417) (dlehman) +- Remove encryption from preexisting device if "Encrypt" is deactivated. + (dlehman) +- Fix indentation of preexisting partition handling block. (dlehman) +- The device passed to the luks passphrase dialogs is a string. (#492123) + (dlehman) +- Protect against tracebacks from the partition isFoo properties. (dlehman) +- Fix handling of bind mounts. (#496406) (dlehman) +- Add more filesystem checks. (clumens) +- Support vfat filesystems in the partitioning UI (#496351). (clumens) +- Remove devices in leaves first order (#496630) (hdegoede) +- Don't remove an inconsistent lvm partition from the devicetree (#496638) + (hdegoede) +- Move isEfi to be a property on Platform instead of on X86 (#497394). + (clumens) +- Support --encrypted --useexisting on kickstart installs (#497147). + (clumens) +- When making a RAID device, require that some members be selected + (#491932). (clumens) +- When catching an OSError, handle it as an object instead of a tuple + (#497374). (clumens) +- Enforce the fstype that holds /boot on kickstart installs (#497238). + (clumens) +- Fix ps3 platform support (#497203) (katzj) +- Clean up rpmdb locks at the end of the install (#496961) (katzj) +- Don't allow /boot to be on an encrypted device (#496866). (clumens) +- Use the correct unmount method (#496764). (clumens) + * Tue Apr 21 2009 David Cantrell - 11.5.0.47-1 - Fix adding of fifth partition in UI (#496930). (rvykydal) - Define the fd variable before it can ever be referenced (#496930). Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 17 Apr 2009 05:55:54 -0000 1.1 +++ import.log 1 May 2009 00:19:31 -0000 1.2 @@ -1 +1,2 @@ anaconda-11_5_0_45-1:F-11:anaconda-11.5.0.45-1.src.rpm:1239947708 +anaconda-11_5_0_48-1:F-11:anaconda-11.5.0.48-1.src.rpm:1241137114 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/sources,v retrieving revision 1.772 retrieving revision 1.773 diff -u -p -r1.772 -r1.773 --- sources 22 Apr 2009 02:36:24 -0000 1.772 +++ sources 1 May 2009 00:19:31 -0000 1.773 @@ -1 +1 @@ -32dbbf60959b6ab88f8e5ac63b2ee614 anaconda-11.5.0.47.tar.bz2 +934d124c37c45d6ac04e43c692d5fce8 anaconda-11.5.0.48.tar.bz2 From konradm at fedoraproject.org Fri May 1 00:21:02 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Fri, 1 May 2009 00:21:02 +0000 (UTC) Subject: rpms/gmp-ecm/devel gmp-ecm.spec,1.3,1.4 sources,1.3,1.4 Message-ID: <20090501002102.8026B7011D@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/gmp-ecm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3138 Modified Files: gmp-ecm.spec sources Log Message: Real new sources. Index: gmp-ecm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmp-ecm/devel/gmp-ecm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- gmp-ecm.spec 1 May 2009 00:12:12 -0000 1.3 +++ gmp-ecm.spec 1 May 2009 00:20:32 -0000 1.4 @@ -5,7 +5,9 @@ Summary: Elliptic Curve Method fo Group: Applications/Engineering License: LGPLv2+ and GPLv2+ URL: http://gforge.inria.fr/projects/ecm/ -Source0: http://gforge.inria.fr/frs/download.php/4837/ecm-%{version}.tar.gz +# We have to get a new source URL every time the version changes, unfortunately. +# This means there's no reason to have %{version} in it. +Source0: http://gforge.inria.fr/frs/download.php/22124/ecm-6.2.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gmp-ecm/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 1 May 2009 00:12:12 -0000 1.3 +++ sources 1 May 2009 00:20:32 -0000 1.4 @@ -1 +1 @@ -acd90a6063072b2e5d6f7617fee1aab2 ecm-6.2.3.tar.gz +d8cca3784857aabfea9b3c9b0926c593 ecm-6.2.3.tar.gz From jkeating at fedoraproject.org Fri May 1 00:21:13 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 1 May 2009 00:21:13 +0000 (UTC) Subject: rpms/anaconda/F-11 anaconda.spec,1.789,1.790 Message-ID: <20090501002113.6BF5B7011D@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/anaconda/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3191 Modified Files: anaconda.spec Log Message: * Thu Apr 30 2009 Jesse Keating - 11.5.0.48-2 - Bump release to be able to tag. Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda.spec,v retrieving revision 1.789 retrieving revision 1.790 diff -u -p -r1.789 -r1.790 --- anaconda.spec 1 May 2009 00:19:31 -0000 1.789 +++ anaconda.spec 1 May 2009 00:20:43 -0000 1.790 @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.5.0.48 -Release: 1 +Release: 2 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -213,6 +213,9 @@ update-desktop-database &> /dev/null || %endif %changelog +* Thu Apr 30 2009 Jesse Keating - 11.5.0.48-2 +- Bump release to be able to tag. + * Fri Apr 24 2009 Chris Lumens - 11.5.0.48-1 - Fix handling of swap files. (#496529) (dlehman) - Pass anaconda to turnOnSwap so we can use swap files. (dlehman) From notting at fedoraproject.org Fri May 1 01:00:42 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Fri, 1 May 2009 01:00:42 +0000 (UTC) Subject: comps comps-f11.xml.in,1.209,1.210 Message-ID: <20090501010042.18CA37011D@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10505 Modified Files: comps-f11.xml.in Log Message: Fix package name Index: comps-f11.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f11.xml.in,v retrieving revision 1.209 retrieving revision 1.210 diff -u -p -r1.209 -r1.210 --- comps-f11.xml.in 30 Apr 2009 16:07:36 -0000 1.209 +++ comps-f11.xml.in 1 May 2009 01:00:11 -0000 1.210 @@ -354,7 +354,7 @@ system-config-firewall system-config-network system-config-printer - cupspk + cups-pk-helper system-config-services system-config-users xorg-x11-utils @@ -3374,7 +3374,7 @@ PolicyKit-kde scribus system-config-printer-kde - cupspk + cups-pk-helper xsettings-kde apollon basket @@ -4425,7 +4425,7 @@ mpage samba-client system-config-printer - cupspk + cups-pk-helper @@ -4586,7 +4586,7 @@ system-config-httpd system-config-nfs system-config-printer - cupspk + cups-pk-helper system-config-samba system-config-services system-config-bind From smilner at fedoraproject.org Fri May 1 01:25:24 2009 From: smilner at fedoraproject.org (Steve Milner) Date: Fri, 1 May 2009 01:25:24 +0000 (UTC) Subject: rpms/python-pp/devel .cvsignore, 1.8, 1.9 python-pp.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <20090501012524.AE5B37011D@cvs1.fedora.phx.redhat.com> Author: smilner Update of /cvs/pkgs/rpms/python-pp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14483 Modified Files: .cvsignore python-pp.spec sources Log Message: Updated for upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 14 Sep 2008 22:32:42 -0000 1.8 +++ .cvsignore 1 May 2009 01:24:53 -0000 1.9 @@ -1 +1 @@ -pp-1.5.6.tar.gz +pp-1.5.7.tar.gz Index: python-pp.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/devel/python-pp.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- python-pp.spec 26 Feb 2009 22:57:31 -0000 1.11 +++ python-pp.spec 1 May 2009 01:24:53 -0000 1.12 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pp -Version: 1.5.6 -Release: 3%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: Parallel execution of python on smp Group: Development/Libraries @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 30 2009 Steve 'Ashcrow' Milner - 1.5.7-1 +- Updated to upstream latest stable. + * Thu Feb 26 2009 Fedora Release Engineering - 1.5.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 14 Sep 2008 22:32:42 -0000 1.8 +++ sources 1 May 2009 01:24:53 -0000 1.9 @@ -1 +1 @@ -9482fe49bcce571a90e8544ded12f94d pp-1.5.6.tar.gz +50b52a7940f297d9bda769349fa78eb0 pp-1.5.7.tar.gz From smilner at fedoraproject.org Fri May 1 01:37:10 2009 From: smilner at fedoraproject.org (Steve Milner) Date: Fri, 1 May 2009 01:37:10 +0000 (UTC) Subject: rpms/python-pp/devel python-pp.spec,1.12,1.13 Message-ID: <20090501013710.988E37011D@cvs1.fedora.phx.redhat.com> Author: smilner Update of /cvs/pkgs/rpms/python-pp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16364 Modified Files: python-pp.spec Log Message: Including new dependency and docs Index: python-pp.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/devel/python-pp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- python-pp.spec 1 May 2009 01:24:53 -0000 1.12 +++ python-pp.spec 1 May 2009 01:36:39 -0000 1.13 @@ -2,7 +2,7 @@ Name: python-pp Version: 1.5.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parallel execution of python on smp Group: Development/Libraries @@ -12,7 +12,7 @@ Source0: http://www.parallelpytho BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.3 +Requires: python >= 2.3, python-configobj BuildRequires: python-devel, python-setuptools @@ -43,13 +43,16 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc PKG-INFO README +%doc PKG-INFO README doc/example.config doc/ppdoc.html # For noarch packages: sitelib %{python_sitelib}/* %attr (0755,root,root) %{_bindir}/ppserver %changelog +* Thu Apr 30 2009 Steve 'Ashcrow' Milner - 1.5.7-2 +- Including new dependency and docs + * Thu Apr 30 2009 Steve 'Ashcrow' Milner - 1.5.7-1 - Updated to upstream latest stable. From smilner at fedoraproject.org Fri May 1 01:42:07 2009 From: smilner at fedoraproject.org (Steve Milner) Date: Fri, 1 May 2009 01:42:07 +0000 (UTC) Subject: rpms/python-pp/F-11 .cvsignore, 1.8, 1.9 python-pp.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <20090501014207.836BA7011D@cvs1.fedora.phx.redhat.com> Author: smilner Update of /cvs/pkgs/rpms/python-pp/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17400 Modified Files: .cvsignore python-pp.spec sources Log Message: Including new dependency and docs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/F-11/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 14 Sep 2008 22:32:42 -0000 1.8 +++ .cvsignore 1 May 2009 01:41:36 -0000 1.9 @@ -1 +1 @@ -pp-1.5.6.tar.gz +pp-1.5.7.tar.gz Index: python-pp.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/F-11/python-pp.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- python-pp.spec 26 Feb 2009 22:57:31 -0000 1.11 +++ python-pp.spec 1 May 2009 01:41:36 -0000 1.12 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pp -Version: 1.5.6 -Release: 3%{?dist} +Version: 1.5.7 +Release: 2%{?dist} Summary: Parallel execution of python on smp Group: Development/Libraries @@ -12,7 +12,7 @@ Source0: http://www.parallelpytho BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.3 +Requires: python >= 2.3, python-configobj BuildRequires: python-devel, python-setuptools @@ -43,13 +43,19 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc PKG-INFO README +%doc PKG-INFO README doc/example.config doc/ppdoc.html # For noarch packages: sitelib %{python_sitelib}/* %attr (0755,root,root) %{_bindir}/ppserver %changelog +* Thu Apr 30 2009 Steve 'Ashcrow' Milner - 1.5.7-2 +- Including new dependency and docs + +* Thu Apr 30 2009 Steve 'Ashcrow' Milner - 1.5.7-1 +- Updated to upstream latest stable. + * Thu Feb 26 2009 Fedora Release Engineering - 1.5.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/F-11/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 14 Sep 2008 22:32:42 -0000 1.8 +++ sources 1 May 2009 01:41:37 -0000 1.9 @@ -1 +1 @@ -9482fe49bcce571a90e8544ded12f94d pp-1.5.6.tar.gz +50b52a7940f297d9bda769349fa78eb0 pp-1.5.7.tar.gz From smilner at fedoraproject.org Fri May 1 01:44:40 2009 From: smilner at fedoraproject.org (Steve Milner) Date: Fri, 1 May 2009 01:44:40 +0000 (UTC) Subject: rpms/python-pp/F-10 .cvsignore, 1.8, 1.9 python-pp.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <20090501014440.B69A07011D@cvs1.fedora.phx.redhat.com> Author: smilner Update of /cvs/pkgs/rpms/python-pp/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17950 Modified Files: .cvsignore python-pp.spec sources Log Message: Including new dependency and docs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 14 Sep 2008 22:32:42 -0000 1.8 +++ .cvsignore 1 May 2009 01:44:10 -0000 1.9 @@ -1 +1 @@ -pp-1.5.6.tar.gz +pp-1.5.7.tar.gz Index: python-pp.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/F-10/python-pp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- python-pp.spec 14 Sep 2008 22:32:42 -0000 1.9 +++ python-pp.spec 1 May 2009 01:44:10 -0000 1.10 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-pp -Version: 1.5.6 -Release: 1%{?dist} +Version: 1.5.7 +Release: 2%{?dist} Summary: Parallel execution of python on smp Group: Development/Libraries @@ -12,7 +12,7 @@ Source0: http://www.parallelpytho BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.3 +Requires: python >= 2.3, python-configobj BuildRequires: python-devel, python-setuptools @@ -43,13 +43,25 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc PKG-INFO README +%doc PKG-INFO README doc/example.config doc/ppdoc.html # For noarch packages: sitelib %{python_sitelib}/* %attr (0755,root,root) %{_bindir}/ppserver %changelog +* Thu Apr 30 2009 Steve 'Ashcrow' Milner - 1.5.7-2 +- Including new dependency and docs + +* Thu Apr 30 2009 Steve 'Ashcrow' Milner - 1.5.7-1 +- Updated to upstream latest stable. + +* Thu Feb 26 2009 Fedora Release Engineering - 1.5.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.5.6-2 +- Rebuild for Python 2.6 + * Sun Sep 14 2008 Steve 'Ashcrow' Milner - 1.5.6-1 - Updated to upstream latest stable. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pp/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 14 Sep 2008 22:32:42 -0000 1.8 +++ sources 1 May 2009 01:44:10 -0000 1.9 @@ -1 +1 @@ -9482fe49bcce571a90e8544ded12f94d pp-1.5.6.tar.gz +50b52a7940f297d9bda769349fa78eb0 pp-1.5.7.tar.gz From mbarnes at fedoraproject.org Fri May 1 01:46:53 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Fri, 1 May 2009 01:46:53 +0000 (UTC) Subject: rpms/pygobject2/devel .cvsignore, 1.21, 1.22 pygobject2.spec, 1.49, 1.50 sources, 1.21, 1.22 pygobject2-2.16.1-fix-classic-class-crash.patch, 1.1, NONE Message-ID: <20090501014653.5EBBA7011D@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/pygobject2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18427 Modified Files: .cvsignore pygobject2.spec sources Removed Files: pygobject2-2.16.1-fix-classic-class-crash.patch Log Message: * Thu Apr 30 2009 Matthew Barnes - 2.17.1-1.fc12 - Update to 2.17.0 - Remove patch for GNOME bug #566571 (fixed upstream). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 2 Mar 2009 23:10:09 -0000 1.21 +++ .cvsignore 1 May 2009 01:46:22 -0000 1.22 @@ -1 +1 @@ -pygobject-2.16.1.tar.bz2 +pygobject-2.17.0.tar.bz2 Index: pygobject2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- pygobject2.spec 22 Apr 2009 21:27:10 -0000 1.49 +++ pygobject2.spec 1 May 2009 01:46:22 -0000 1.50 @@ -1,6 +1,6 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Last updated for version 2.16.0 +# Last updated for version 2.17.0 %define glib2_version 2.16.0 %define python2_version 2.3.5 @@ -13,8 +13,8 @@ ### Abstract ### Name: pygobject2 -Version: 2.16.1 -Release: 4%{?dist} +Version: 2.17.0 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GObject @@ -22,11 +22,6 @@ URL: http://www.pygtk.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: pygobject-%{version}.tar.bz2 -### Patches ### - -# GNOME bug #566571 -Patch1: pygobject2-2.16.1-fix-classic-class-crash.patch - ### Build Dependencies ### BuildRequires: automake @@ -70,7 +65,6 @@ This package contains documentation file %prep %setup -q -n pygobject-%{version} -%patch1 -p1 -b .fix-classic-class-crash %build %configure --enable-thread @@ -125,6 +119,10 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/pygobject/xsl %changelog +* Thu Apr 30 2009 Matthew Barnes - 2.17.1-1.fc12 +- Update to 2.17.0 +- Remove patch for GNOME bug #566571 (fixed upstream). + * Wed Apr 22 2009 Matthew Barnes - 2.16.1-4.fc11 - Add patch for GNOME bug #566571 (classic vs new-style inheritance crash). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 2 Mar 2009 23:10:10 -0000 1.21 +++ sources 1 May 2009 01:46:22 -0000 1.22 @@ -1 +1 @@ -8e26f2572e6b72dbd2591677055f8d30 pygobject-2.16.1.tar.bz2 +0ff7f166cb6b41b89ddf2d7e156e6360 pygobject-2.17.0.tar.bz2 --- pygobject2-2.16.1-fix-classic-class-crash.patch DELETED --- From smilner at fedoraproject.org Fri May 1 01:57:23 2009 From: smilner at fedoraproject.org (Steve Milner) Date: Fri, 1 May 2009 01:57:23 +0000 (UTC) Subject: rpms/python-virtualenv/F-10 .cvsignore, 1.5, 1.6 python-virtualenv.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090501015723.76D267011D@cvs1.fedora.phx.redhat.com> Author: smilner Update of /cvs/pkgs/rpms/python-virtualenv/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21217 Modified Files: .cvsignore python-virtualenv.spec sources Log Message: Updated for upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtualenv/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 26 Dec 2008 04:57:32 -0000 1.5 +++ .cvsignore 1 May 2009 01:56:53 -0000 1.6 @@ -1 +1 @@ -virtualenv-1.3.2.tar.gz +virtualenv-1.3.3.tar.gz Index: python-virtualenv.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtualenv/F-10/python-virtualenv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- python-virtualenv.spec 26 Dec 2008 04:57:32 -0000 1.5 +++ python-virtualenv.spec 1 May 2009 01:56:53 -0000 1.6 @@ -2,7 +2,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-virtualenv -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Tool to create isolated Python environments @@ -52,12 +52,24 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 28 2009 Steve 'Ashcrow' Milner - 1.3.3-1 +- Updated for upstream release. + +* Thu Feb 26 2009 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Dec 25 2008 Steve 'Ashcrow' Milner - 1.3.2-1 - Updated for upstream release. +* Thu Dec 04 2008 Ignacio Vazquez-Abrams - 1.3.1-4 +- Rebuild for Python 2.6 + * Mon Dec 1 2008 Steve 'Ashcrow' Milner - 1.3.1-3 - Added missing dependencies. +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.3.1-2 +- Rebuild for Python 2.6 + * Fri Nov 28 2008 Steve 'Ashcrow' Milner - 1.3.1-1 - Updated for upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtualenv/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 26 Dec 2008 04:57:32 -0000 1.5 +++ sources 1 May 2009 01:56:53 -0000 1.6 @@ -1 +1 @@ -a013d5a7d9aeddc16bee88604d6de636 virtualenv-1.3.2.tar.gz +28e2955aed4ffc4dc3df02dc632b5c42 virtualenv-1.3.3.tar.gz From konradm at fedoraproject.org Fri May 1 03:41:20 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Fri, 1 May 2009 03:41:20 +0000 (UTC) Subject: rpms/gmp-ecm/devel gmp-ecm.spec,1.4,1.5 Message-ID: <20090501034121.01D2E7011D@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/gmp-ecm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8550 Modified Files: gmp-ecm.spec Log Message: Add m4 as a BR. Index: gmp-ecm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmp-ecm/devel/gmp-ecm.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- gmp-ecm.spec 1 May 2009 00:20:32 -0000 1.4 +++ gmp-ecm.spec 1 May 2009 03:40:50 -0000 1.5 @@ -10,6 +10,7 @@ URL: http://gforge.inria.fr/p Source0: http://gforge.inria.fr/frs/download.php/22124/ecm-6.2.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel +BuildRequires: m4 %description From pgordon at fedoraproject.org Fri May 1 04:03:52 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Fri, 1 May 2009 04:03:52 +0000 (UTC) Subject: rpms/midori/F-11 midori.spec,1.22,1.23 Message-ID: <20090501040352.26B837011D@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/midori/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13878/F-11 Modified Files: midori.spec Log Message: Let's try that rebuild for the new libunique again - but this time, without the oops... =) Index: midori.spec =================================================================== RCS file: /cvs/pkgs/rpms/midori/F-11/midori.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- midori.spec 21 Apr 2009 05:22:27 -0000 1.22 +++ midori.spec 1 May 2009 04:03:21 -0000 1.23 @@ -1,6 +1,6 @@ Name: midori Version: 0.1.6 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: A lightweight GTK+ web browser Group: Applications/Internet @@ -102,6 +102,9 @@ fi %changelog +* Thu Apr 30 2009 Peter Gordon - 0.1.6-2.1 +- This time REALLY build against the new libunique support. + * Mon Apr 20 2009 Peter Gordon - 0.1.6-2 - Re-enable libunique support, thanks to it being updated accordingly. From bskeggs at fedoraproject.org Fri May 1 05:58:50 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Fri, 1 May 2009 05:58:50 +0000 (UTC) Subject: rpms/xorg-x11-drv-nouveau/F-11 .cvsignore, 1.34, 1.35 nouveau-fb-resize.patch, 1.3, 1.4 nouveau-multiple-xserver.patch, 1.4, 1.5 nouveau-nv50-fb-accel.patch, 1.4, 1.5 nouveau-nv50-nva0-noaccel.patch, 1.4, 1.5 nouveau-store-vbios.patch, 1.4, 1.5 nouveau-transition-hack.patch, 1.4, 1.5 sources, 1.35, 1.36 xorg-x11-drv-nouveau.spec, 1.43, 1.44 Message-ID: <20090501055850.DE6A870133@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32568 Modified Files: .cvsignore nouveau-fb-resize.patch nouveau-multiple-xserver.patch nouveau-nv50-fb-accel.patch nouveau-nv50-nva0-noaccel.patch nouveau-store-vbios.patch nouveau-transition-hack.patch sources xorg-x11-drv-nouveau.spec Log Message: * Fri May 01 2009 Ben Skeggs 0.0.12-32.20090501gitf69b34a - upstream update fixing serious issues in nv50 output setup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- .cvsignore 20 Apr 2009 23:06:47 -0000 1.34 +++ .cvsignore 1 May 2009 05:58:19 -0000 1.35 @@ -1 +1 @@ -xf86-video-nouveau-0.0.12-20090421git47bb00f.tar.bz2 +xf86-video-nouveau-0.0.12-20090501gitf69b34a.tar.bz2 nouveau-fb-resize.patch: Index: nouveau-fb-resize.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-fb-resize.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- nouveau-fb-resize.patch 21 Apr 2009 05:10:01 -0000 1.3 +++ nouveau-fb-resize.patch 1 May 2009 05:58:20 -0000 1.4 @@ -1,4 +1,4 @@ -From 7e4b7775589cff4433de1f3dfa1416c66cdfe060 Mon Sep 17 00:00:00 2001 +From 61ac455bfcfaf4caa9cac9067f4693c2d56715c7 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 14 Apr 2009 09:23:07 +1000 Subject: [PATCH 6/6] f11: support framebuffer resize without driver pixmaps @@ -173,7 +173,7 @@ index aee2794..41e3f85 100644 exa->MarkSync = nouveau_exa_mark_sync; exa->WaitMarker = nouveau_exa_wait_marker; diff --git a/src/nv50_randr.c b/src/nv50_randr.c -index 538c883..c451ba3 100644 +index 61b9e79..b1fca9b 100644 --- a/src/nv50_randr.c +++ b/src/nv50_randr.c @@ -289,8 +289,14 @@ nv50_crtc_set_origin(xf86CrtcPtr crtc, int x, int y) @@ -192,10 +192,10 @@ index 538c883..c451ba3 100644 NV50DisplayCommand(pScrn, NV50_UPDATE_DISPLAY, 0); } diff --git a/src/nv_crtc.c b/src/nv_crtc.c -index 1d50874..cfa06e1 100644 +index 6de8733..dfc7f8e 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c -@@ -1154,7 +1154,10 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y) +@@ -1159,7 +1159,10 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y) ScrnInfoPtr pScrn = crtc->scrn; NVPtr pNv = NVPTR(pScrn); struct nouveau_crtc *nv_crtc = to_nouveau_crtc(crtc); @@ -207,7 +207,7 @@ index 1d50874..cfa06e1 100644 if (crtc->rotatedData != NULL) /* we do not exist on the real framebuffer */ #if NOUVEAU_EXA_PIXMAPS -@@ -1162,8 +1165,17 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y) +@@ -1167,8 +1170,17 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y) #else start = pNv->FB->offset + nv_crtc->shadow->offset; /* We do exist relative to the framebuffer */ #endif nouveau-multiple-xserver.patch: Index: nouveau-multiple-xserver.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-multiple-xserver.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- nouveau-multiple-xserver.patch 20 Apr 2009 23:06:47 -0000 1.4 +++ nouveau-multiple-xserver.patch 1 May 2009 05:58:20 -0000 1.5 @@ -1,4 +1,4 @@ -From e278ea7300169355b17b17a785aef938c3fbc1e3 Mon Sep 17 00:00:00 2001 +From 21d8dee1feb667a38296d087aa5ce355b8ce7b17 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 19:25:25 +1000 Subject: [PATCH 3/6] f11: hack to support multiple xserver instances nouveau-nv50-fb-accel.patch: Index: nouveau-nv50-fb-accel.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-fb-accel.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- nouveau-nv50-fb-accel.patch 20 Apr 2009 23:06:47 -0000 1.4 +++ nouveau-nv50-fb-accel.patch 1 May 2009 05:58:20 -0000 1.5 @@ -1,4 +1,4 @@ -From e31aa5217c97dfd1e2c678ce7391fcd255abb0bf Mon Sep 17 00:00:00 2001 +From 376840ad928ea51a5952bd1461b119e24d957b84 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 19:30:38 +1000 Subject: [PATCH 4/6] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout @@ -156,7 +156,7 @@ index b7bcc87..aee2794 100644 exa->WaitMarker = nouveau_exa_wait_marker; diff --git a/src/nv50_randr.c b/src/nv50_randr.c -index 8a9281b..538c883 100644 +index 3459f05..61b9e79 100644 --- a/src/nv50_randr.c +++ b/src/nv50_randr.c @@ -99,7 +99,7 @@ nv50_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjuste @@ -571,7 +571,7 @@ index 9f4c96f..a280257 100644 return vgaHWSaveScreen(pScreen, mode); diff --git a/src/nv_proto.h b/src/nv_proto.h -index 072c7c4..4e9b65c 100644 +index 614fa72..4e07aae 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h @@ -267,6 +267,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); nouveau-nv50-nva0-noaccel.patch: Index: nouveau-nv50-nva0-noaccel.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-nva0-noaccel.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- nouveau-nv50-nva0-noaccel.patch 20 Apr 2009 23:06:47 -0000 1.4 +++ nouveau-nv50-nva0-noaccel.patch 1 May 2009 05:58:20 -0000 1.5 @@ -1,4 +1,4 @@ -From 7460d8ebca84bd5e7c26e88143f14f4909598b68 Mon Sep 17 00:00:00 2001 +From 6ce46f688243aaa010bb18642f32a18e4eeea77a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 20:20:39 +1000 Subject: [PATCH 5/6] nv50/f11: disable acceleration on NVAx chipsets nouveau-store-vbios.patch: Index: nouveau-store-vbios.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-store-vbios.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- nouveau-store-vbios.patch 20 Apr 2009 23:06:47 -0000 1.4 +++ nouveau-store-vbios.patch 1 May 2009 05:58:20 -0000 1.5 @@ -1,4 +1,4 @@ -From 514eb5a03b8ca223a4d832e1675cda3a6a56b02d Mon Sep 17 00:00:00 2001 +From ce581a86984390d77863d91ce4c05886980ee982 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 19:13:26 +1000 Subject: [PATCH 2/6] bios/f11: store a copy of used vbios image in /var/run @@ -8,7 +8,7 @@ Subject: [PATCH 2/6] bios/f11: store a c 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/nv_bios.c b/src/nv_bios.c -index ebf4027..ad4ff1f 100644 +index cc5f5c4..2d4169c 100644 --- a/src/nv_bios.c +++ b/src/nv_bios.c @@ -22,6 +22,9 @@ @@ -21,7 +21,7 @@ index ebf4027..ad4ff1f 100644 #include "nv_include.h" #if defined(__FreeBSD__) || defined(__NetBSD__) -@@ -4492,7 +4495,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn) +@@ -4680,7 +4683,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn) bool NVInitVBIOS(ScrnInfoPtr pScrn) { @@ -32,7 +32,7 @@ index ebf4027..ad4ff1f 100644 memset(bios, 0, sizeof(struct nvbios)); -@@ -4503,6 +4509,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn) +@@ -4691,6 +4697,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn) if (bios->length > NV_PROM_SIZE) bios->length = NV_PROM_SIZE; nouveau-transition-hack.patch: Index: nouveau-transition-hack.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-transition-hack.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- nouveau-transition-hack.patch 20 Apr 2009 23:06:47 -0000 1.4 +++ nouveau-transition-hack.patch 1 May 2009 05:58:20 -0000 1.5 @@ -1,4 +1,4 @@ -From 98cd8bd95073e6248a0f63a2b5299736e6d097ef Mon Sep 17 00:00:00 2001 +From 76ec695211c0337f96731f85554d3f299e9ef2dc Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 19:12:25 +1000 Subject: [PATCH 1/6] kms/f11: hack in transition support without driver pixmaps Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- sources 20 Apr 2009 23:06:47 -0000 1.35 +++ sources 1 May 2009 05:58:20 -0000 1.36 @@ -1 +1 @@ -0f0047cd0a3c84101b025082f0441ae6 xf86-video-nouveau-0.0.12-20090421git47bb00f.tar.bz2 +3ad8e3ca4568ae7017c9c462a613fdc0 xf86-video-nouveau-0.0.12-20090501gitf69b34a.tar.bz2 Index: xorg-x11-drv-nouveau.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- xorg-x11-drv-nouveau.spec 21 Apr 2009 05:10:01 -0000 1.43 +++ xorg-x11-drv-nouveau.spec 1 May 2009 05:58:20 -0000 1.44 @@ -7,8 +7,8 @@ # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2 -%define gitdate 20090421 -%define git_version 47bb00f +%define gitdate 20090501 +%define git_version f69b34a %define snapshot %{gitdate}git%{git_version} @@ -19,7 +19,7 @@ Name: xorg-x11-drv-nouveau # need to set an epoch to get version number in sync with upstream Epoch: 1 Version: %{nouveau_version} -Release: 31.%{snapshot}%{?dist} +Release: 32.%{snapshot}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/nouveau.4* %changelog +* Fri May 01 2009 Ben Skeggs 0.0.12-32.20090501gitf69b34a +- upstream update fixing serious issues in nv50 output setup + * Mon Apr 21 2009 Ben Skeggs 0.0.12-31.20090421git47bb00f - fix for rh#496559 From scop at fedoraproject.org Fri May 1 07:37:24 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Fri, 1 May 2009 07:37:24 +0000 (UTC) Subject: rpms/javasqlite/devel javasqlite-20090430-jnipath.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 javasqlite.spec, 1.13, 1.14 sources, 1.7, 1.8 javasqlite-20081006-jnipath.patch, 1.1, NONE Message-ID: <20090501073724.BE9377011D@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/javasqlite/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18657 Modified Files: .cvsignore javasqlite.spec sources Added Files: javasqlite-20090430-jnipath.patch Removed Files: javasqlite-20081006-jnipath.patch Log Message: * Fri May 1 2009 Ville Skytt?? - 20090430-1 - Update to 20090430. javasqlite-20090430-jnipath.patch: --- NEW FILE javasqlite-20090430-jnipath.patch --- diff -up javasqlite-20090430/SQLite/Database.java~ javasqlite-20090430/SQLite/Database.java --- javasqlite-20090430/SQLite/Database.java~ 2009-04-08 11:53:00.000000000 +0300 +++ javasqlite-20090430/SQLite/Database.java 2009-05-01 00:59:29.000000000 +0300 @@ -868,7 +868,7 @@ public class Database { try { String path = System.getProperty("SQLite.library.path"); if (path == null || path.length() == 0) { - System.loadLibrary("sqlite_jni"); + System.load("@JNIPATH@/" + System.mapLibraryName("sqlite_jni")); } else { try { java.lang.reflect.Method mapLibraryName; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/javasqlite/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 21 Apr 2009 19:52:35 -0000 1.7 +++ .cvsignore 1 May 2009 07:36:52 -0000 1.8 @@ -1 +1 @@ -javasqlite-20090420.tar.gz +javasqlite-20090430.tar.gz Index: javasqlite.spec =================================================================== RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- javasqlite.spec 21 Apr 2009 19:52:35 -0000 1.13 +++ javasqlite.spec 1 May 2009 07:36:52 -0000 1.14 @@ -1,5 +1,5 @@ Name: javasqlite -Version: 20090420 +Version: 20090430 Release: 1%{?dist} Summary: SQLite Java Wrapper/JDBC Driver @@ -8,7 +8,7 @@ License: BSD URL: http://www.ch-werner.de/javasqlite/ Source0: http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz # jnipath: Fedora specific, no need to send upstream. -Patch0: %{name}-20081006-jnipath.patch +Patch0: %{name}-20090430-jnipath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # >= 3.4 for zeroblob stuff in %%check's test3 @@ -45,8 +45,7 @@ f=ChangeLog ; iconv -f iso-8859-1 -t utf %build origpath="$PATH" -# Note that --enable-load-extension has security concerns, it enables library -# users to load arbitrary native code to the JVM bypassing its SecurityManager +# Note that --enable-load-extension has security concerns, see configure --help common_flags=" --with-jardir=%{_libdir}/%{name} --libdir=%{_libdir}/%{name} @@ -103,6 +102,9 @@ done %changelog +* Fri May 1 2009 Ville Skytt?? - 20090430-1 +- Update to 20090430. + * Tue Apr 21 2009 Ville Skytt?? - 20090420-1 - Update to 20090420, feature check patch applied upstream. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/javasqlite/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 21 Apr 2009 19:52:35 -0000 1.7 +++ sources 1 May 2009 07:36:52 -0000 1.8 @@ -1 +1 @@ -4d5b06f39c8bac8eed85a1af0da8e324 javasqlite-20090420.tar.gz +fe17f7a5154cef4dbc5e5829b5c9682a javasqlite-20090430.tar.gz --- javasqlite-20081006-jnipath.patch DELETED --- From drago01 at fedoraproject.org Fri May 1 10:49:52 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Fri, 1 May 2009 10:49:52 +0000 (UTC) Subject: rpms/fsarchiver/devel .cvsignore, 1.6, 1.7 fsarchiver.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090501104952.1D0617011D@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/fsarchiver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14328 Modified Files: .cvsignore fsarchiver.spec sources Log Message: Update to 0.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 28 Mar 2009 16:03:08 -0000 1.6 +++ .cvsignore 1 May 2009 10:49:21 -0000 1.7 @@ -1 +1 @@ -fsarchiver-0.4.6.tar.gz +fsarchiver-0.5.2.tar.gz Index: fsarchiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- fsarchiver.spec 28 Mar 2009 16:03:09 -0000 1.8 +++ fsarchiver.spec 1 May 2009 10:49:21 -0000 1.9 @@ -1,5 +1,5 @@ Name: fsarchiver -Version: 0.4.6 +Version: 0.5.2 Release: 1%{?dist} Summary: Safe and flexible file-system backup/deployment tool @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING README THANKS NEWS %changelog +* Fri May 01 2009 Adel Gadllah - 0.5.2-1 +- Update to 0.5.2 + * Sat Mar 28 2009 Adel Gadllah - 0.4.6-1 - Update to 0.4.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 28 Mar 2009 16:03:09 -0000 1.6 +++ sources 1 May 2009 10:49:21 -0000 1.7 @@ -1 +1 @@ -ff46d7343ea12939aec246e9ac05aaaf fsarchiver-0.4.6.tar.gz +80d9966f79b77e2bce40f513b335a868 fsarchiver-0.5.2.tar.gz From drago01 at fedoraproject.org Fri May 1 10:50:41 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Fri, 1 May 2009 10:50:41 +0000 (UTC) Subject: rpms/fsarchiver/F-11 .cvsignore, 1.6, 1.7 fsarchiver.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090501105041.8095D7011D@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/fsarchiver/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14538 Modified Files: .cvsignore fsarchiver.spec sources Log Message: Update to 0.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 28 Mar 2009 16:03:08 -0000 1.6 +++ .cvsignore 1 May 2009 10:50:11 -0000 1.7 @@ -1 +1 @@ -fsarchiver-0.4.6.tar.gz +fsarchiver-0.5.2.tar.gz Index: fsarchiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/fsarchiver.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- fsarchiver.spec 28 Mar 2009 16:03:09 -0000 1.8 +++ fsarchiver.spec 1 May 2009 10:50:11 -0000 1.9 @@ -1,5 +1,5 @@ Name: fsarchiver -Version: 0.4.6 +Version: 0.5.2 Release: 1%{?dist} Summary: Safe and flexible file-system backup/deployment tool @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING README THANKS NEWS %changelog +* Fri May 01 2009 Adel Gadllah - 0.5.2-1 +- Update to 0.5.2 + * Sat Mar 28 2009 Adel Gadllah - 0.4.6-1 - Update to 0.4.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 28 Mar 2009 16:03:09 -0000 1.6 +++ sources 1 May 2009 10:50:11 -0000 1.7 @@ -1 +1 @@ -ff46d7343ea12939aec246e9ac05aaaf fsarchiver-0.4.6.tar.gz +80d9966f79b77e2bce40f513b335a868 fsarchiver-0.5.2.tar.gz From drago01 at fedoraproject.org Fri May 1 10:51:49 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Fri, 1 May 2009 10:51:49 +0000 (UTC) Subject: rpms/fsarchiver/F-10 .cvsignore, 1.5, 1.6 fsarchiver.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090501105149.702C97011D@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/fsarchiver/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14837 Modified Files: .cvsignore fsarchiver.spec sources Log Message: Update to 0.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 28 Mar 2009 16:03:18 -0000 1.5 +++ .cvsignore 1 May 2009 10:51:18 -0000 1.6 @@ -1 +1 @@ -fsarchiver-0.4.6.tar.gz +fsarchiver-0.5.2.tar.gz Index: fsarchiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/fsarchiver.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- fsarchiver.spec 28 Mar 2009 16:03:18 -0000 1.4 +++ fsarchiver.spec 1 May 2009 10:51:18 -0000 1.5 @@ -1,5 +1,5 @@ Name: fsarchiver -Version: 0.4.6 +Version: 0.5.2 Release: 1%{?dist} Summary: Safe and flexible file-system backup/deployment tool @@ -50,16 +50,29 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING README THANKS NEWS %changelog +* Fri May 01 2009 Adel Gadllah - 0.5.2-1 +- Update to 0.5.2 + * Sat Mar 28 2009 Adel Gadllah - 0.4.6-1 - Update to 0.4.6 * Sun Mar 22 2009 Adel Gadllah - 0.4.5-1 - Update to 0.4.5 +* Sun Mar 07 2009 Adel Gadllah - 0.4.4-2 +- Fix file section +- Fix changelog + +* Sun Mar 07 2009 Adel Gadllah - 0.4.4-1 +- Update to 0.4.4 + * Sat Feb 28 2009 Adel Gadllah - 0.4.3-1 - 0.4.3 - Drop build patch, no longer needed +* Tue Feb 24 2009 Fedora Release Engineering - 0.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 15 2009 Adel Gadllah - 0.4.1-2 - Fix description Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 28 Mar 2009 16:03:18 -0000 1.5 +++ sources 1 May 2009 10:51:18 -0000 1.6 @@ -1 +1 @@ -ff46d7343ea12939aec246e9ac05aaaf fsarchiver-0.4.6.tar.gz +80d9966f79b77e2bce40f513b335a868 fsarchiver-0.5.2.tar.gz From jdieter at fedoraproject.org Fri May 1 11:13:35 2009 From: jdieter at fedoraproject.org (Jonathan Dieter) Date: Fri, 1 May 2009 11:13:35 +0000 (UTC) Subject: rpms/yum-presto/devel yum-presto.spec,1.15,1.16 Message-ID: <20090501111335.5FEB87011D@cvs1.fedora.phx.redhat.com> Author: jdieter Update of /cvs/extras/rpms/yum-presto/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22058 Modified Files: yum-presto.spec Log Message: 0.5.0 release / remove patches / reduce summary to one-line Index: yum-presto.spec =================================================================== RCS file: /cvs/extras/rpms/yum-presto/devel/yum-presto.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- yum-presto.spec 30 Apr 2009 20:24:49 -0000 1.15 +++ yum-presto.spec 1 May 2009 11:13:03 -0000 1.16 @@ -2,8 +2,8 @@ Summary: Presto plugin for yum Name: yum-presto -Version: 0.4.5 -Release: 8%{?dist} +Version: 0.5.0 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2 @@ -52,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf %changelog +* Fri May 1 2009 Jonathan Dieter - 0.5.0-1 +- Remove patches (now upstream) +- Reduce summary to one-line sentence + * Thu Apr 30 2009 James Antill - 0.4.5-8 - Fix total for current filename (stupid python threading). From jdieter at fedoraproject.org Fri May 1 11:20:05 2009 From: jdieter at fedoraproject.org (Jonathan Dieter) Date: Fri, 1 May 2009 11:20:05 +0000 (UTC) Subject: rpms/yum-presto/devel import.log, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 yum-presto.spec, 1.16, 1.17 cleanup.patch, 1.1, NONE speedup.patch, 1.1, NONE total-progress+stat-fixes.patch, 1.3, NONE Message-ID: <20090501112005.689FF7011D@cvs1.fedora.phx.redhat.com> Author: jdieter Update of /cvs/extras/rpms/yum-presto/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22999/devel Modified Files: .cvsignore sources yum-presto.spec Added Files: import.log Removed Files: cleanup.patch speedup.patch total-progress+stat-fixes.patch Log Message: 0.5.0 release / remove upstreamed patches / reduce summary to one-line sentence --- NEW FILE import.log --- yum-presto-0_5_0-1_fc10:HEAD:yum-presto-0.5.0-1.fc10.src.rpm:1241176734 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-presto/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 10 Apr 2008 07:25:15 -0000 1.9 +++ .cvsignore 1 May 2009 11:19:33 -0000 1.10 @@ -1 +1 @@ -yum-presto-0.4.5.tar.bz2 +yum-presto-0.5.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-presto/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 10 Apr 2008 07:25:15 -0000 1.9 +++ sources 1 May 2009 11:19:34 -0000 1.10 @@ -1 +1 @@ -300932287f96c7c1633c48f26198f2cc yum-presto-0.4.5.tar.bz2 +1b292f04005220f0963d9efc45a03ef5 yum-presto-0.5.0.tar.bz2 Index: yum-presto.spec =================================================================== RCS file: /cvs/extras/rpms/yum-presto/devel/yum-presto.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- yum-presto.spec 1 May 2009 11:13:03 -0000 1.16 +++ yum-presto.spec 1 May 2009 11:19:34 -0000 1.17 @@ -7,9 +7,6 @@ Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2 -Patch0: speedup.patch -Patch1: cleanup.patch -Patch2: total-progress+stat-fixes.patch URL: http://www.lesbg.com/jdieter/presto/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -29,10 +26,6 @@ foo-1.1 package from your installed foo- %prep %setup -q -%patch0 -p2 -%patch1 -p2 -%patch2 -p2 - %build %install --- cleanup.patch DELETED --- --- speedup.patch DELETED --- --- total-progress+stat-fixes.patch DELETED --- From pbrobinson at fedoraproject.org Fri May 1 11:28:17 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Fri, 1 May 2009 11:28:17 +0000 (UTC) Subject: rpms/evince/devel evince.spec,1.160,1.161 Message-ID: <20090501112817.2B5687011D@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/evince/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23992 Modified Files: evince.spec Log Message: - Split libs out to a subpackage - RHBZ 480729 Index: evince.spec =================================================================== RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -p -r1.160 -r1.161 --- evince.spec 17 Mar 2009 02:45:09 -0000 1.160 +++ evince.spec 1 May 2009 11:27:45 -0000 1.161 @@ -6,7 +6,7 @@ Name: evince Version: 2.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Document viewer License: GPLv2+ and GFDL @@ -51,6 +51,7 @@ Requires(post): GConf2 Requires(post): scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper +Requires: %{name}-libs = %{version}-%{release} %description Evince is simple multi-page document viewer. It can display and print @@ -63,10 +64,18 @@ Support for other document formats such installing additional backends. +%package libs +Summary: Libraries for the evince document viewer +Group: System Environment/Libraries + +%description libs +This package contains shared libraries needed for evince + + %package devel Summary: Support for developing backends for the evince document viewer Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description devel This package contains libraries and header files needed for evince @@ -76,7 +85,7 @@ backend development. %package dvi Summary: Evince backend for dvi files Group: Applications/Publishing -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description dvi This package contains a backend to let evince display dvi files. @@ -85,7 +94,7 @@ This package contains a backend to let e %package djvu Summary: Evince backend for djvu files Group: Applications/Publishing -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description djvu This package contains a backend to let evince display djvu files. @@ -127,9 +136,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # don't ship icon caches rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache -# we don't have a -devel package, so we don't need backend api docs -rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc - %clean rm -rf $RPM_BUILD_ROOT @@ -175,6 +181,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ] /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor; fi +%post libs +/sbin/ldconfig + %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -190,7 +199,6 @@ fi %postun -/sbin/ldconfig update-desktop-database &> /dev/null ||: scrollkeeper-update -q || : @@ -199,6 +207,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ] /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor; fi +%postun libs +/sbin/ldconfig %files -f evince.lang %defattr(-,root,root,-) @@ -210,6 +220,9 @@ fi %{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/icons/hicolor/*/apps/evince.* %{_mandir}/man1/evince.1.gz + +%files libs +%defattr(-,root,root,-) %{_libdir}/libevview.so.* %{_libdir}/libevdocument.so.* %dir %{_libdir}/evince @@ -224,8 +237,11 @@ fi %{_libdir}/evince/1/backends/libcomicsdocument.so %{_libdir}/evince/1/backends/comicsdocument.evince-backend - %files devel +%defattr(-,root,root,-) +%{_datadir}/gtk-doc/html/evince/ +%{_datadir}/gtk-doc/html/libevdocument/ +%{_datadir}/gtk-doc/html/libevview/ %{_includedir}/evince/2.25 %{_libdir}/libevview.so %{_libdir}/libevdocument.so @@ -233,14 +249,19 @@ fi %{_libdir}/pkgconfig/evince-document-2.25.pc %files dvi +%defattr(-,root,root,-) %{_libdir}/evince/1/backends/libdvidocument.so* %{_libdir}/evince/1/backends/dvidocument.evince-backend %files djvu +%defattr(-,root,root,-) %{_libdir}/evince/1/backends/libdjvudocument.so %{_libdir}/evince/1/backends/djvudocument.evince-backend %changelog +* Fri May 01 2009 Peter Robinson - 2.26.0-2 +- Split libs out to a subpackage - RHBZ 480729 + * Mon Mar 16 2009 Matthias Clasen - 2.26.0-1 - Update to 2.26.0 From pbrobinson at fedoraproject.org Fri May 1 11:34:24 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Fri, 1 May 2009 11:34:24 +0000 (UTC) Subject: rpms/evince/devel .cvsignore, 1.61, 1.62 evince.spec, 1.161, 1.162 sources, 1.60, 1.61 Message-ID: <20090501113424.5460B7011D@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/evince/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24826 Modified Files: .cvsignore evince.spec sources Log Message: - Update to 2.26.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- .cvsignore 17 Mar 2009 02:45:09 -0000 1.61 +++ .cvsignore 1 May 2009 11:33:53 -0000 1.62 @@ -1 +1 @@ -evince-2.26.0.tar.bz2 +evince-2.26.1.tar.bz2 From stingray at fedoraproject.org Fri May 1 11:54:49 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Fri, 1 May 2009 11:54:49 +0000 (UTC) Subject: rpms/libnetfilter_conntrack/F-10 .cvsignore, 1.11, 1.12 libnetfilter_conntrack.spec, 1.20, 1.21 sources, 1.11, 1.12 Message-ID: <20090501115449.4C50B7011D@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15754 Modified Files: .cvsignore libnetfilter_conntrack.spec sources Log Message: libnetfilter_conntrack-0.0.99-2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/F-10/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 26 Oct 2008 09:37:47 -0000 1.11 +++ .cvsignore 1 May 2009 11:54:18 -0000 1.12 @@ -1 +1 @@ -libnetfilter_conntrack-0.0.97.tar.bz2 +libnetfilter_conntrack-0.0.99.tar.bz2 Index: libnetfilter_conntrack.spec =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/F-10/libnetfilter_conntrack.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- libnetfilter_conntrack.spec 26 Oct 2008 13:11:38 -0000 1.20 +++ libnetfilter_conntrack.spec 1 May 2009 11:54:18 -0000 1.21 @@ -2,8 +2,8 @@ # %define basever 0.0.82 Name: libnetfilter_conntrack -Version: 0.0.97 -Release: 1%{?dist} +Version: 0.0.99 +Release: 2%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPLv2+ @@ -61,6 +61,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.0.99-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 13 2009 Paul P. Komkoff Jr - 0.0.99-1 +- new upstream version + * Sun Oct 26 2008 Paul P. Komkoff Jr - 0.0.97-1 - new upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/F-10/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 26 Oct 2008 09:37:47 -0000 1.11 +++ sources 1 May 2009 11:54:18 -0000 1.12 @@ -1 +1 @@ -25b341b6ae14e0c40e9cf5088fd7ae09 libnetfilter_conntrack-0.0.97.tar.bz2 +960c3d347d7f4e3fe7437aa198f36e6e libnetfilter_conntrack-0.0.99.tar.bz2 From caolanm at fedoraproject.org Fri May 1 11:59:59 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 1 May 2009 11:59:59 +0000 (UTC) Subject: rpms/openoffice.org/F-10 openoffice.org.spec,1.1730,1.1731 Message-ID: <20090501115959.669F67011D@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16445 Modified Files: openoffice.org.spec Log Message: lets build this, and get rid of some lowhangers Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v retrieving revision 1.1730 retrieving revision 1.1731 diff -u -p -r1.1730 -r1.1731 --- openoffice.org.spec 28 Apr 2009 09:32:21 -0000 1.1730 +++ openoffice.org.spec 1 May 2009 11:59:28 -0000 1.1731 @@ -3791,7 +3791,7 @@ fi unopkg list --shared > /dev/null 2>&1 || : %changelog -* Tue Apr 28 2009 Caol??n McNamara - 1:3.0.1-15.4-UNRELEASED +* Fri May 01 2009 Caol??n McNamara - 1:3.0.1-15.4 - Resolves: rhbz#494643 EMF polypolygons issue - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch - Resolves: rhbz#496315 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch From caolanm at fedoraproject.org Fri May 1 12:14:12 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 1 May 2009 12:14:12 +0000 (UTC) Subject: rpms/hunspell/devel hunspell-1.2.8-2784983.defaultlanguage.patch, NONE, 1.1 hunspell.spec, 1.59, 1.60 Message-ID: <20090501121412.DDB1570133@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18210/devel Modified Files: hunspell.spec Added Files: hunspell-1.2.8-2784983.defaultlanguage.patch Log Message: Resolves: rhbz#498556 fix default language detection hunspell-1.2.8-2784983.defaultlanguage.patch: --- NEW FILE hunspell-1.2.8-2784983.defaultlanguage.patch --- diff -ru hunspell-1.2.8.orig/man/hunspell.1 hunspell-1.2.8/man/hunspell.1 --- hunspell-1.2.8.orig/man/hunspell.1 2008-06-12 09:50:43.000000000 +0100 +++ hunspell-1.2.8/man/hunspell.1 2009-05-01 09:05:15.000000000 +0100 @@ -309,9 +309,10 @@ .IP \fB\-p\ dict\fR Set path of personal dictionary. -Default dictionary depends from the locale settings. -Without locale support, the default personal dictionary is -the $HOME/.hunspell_default. +The default dictionary depends on the locale settings. The +following environment variables are searched: LANGUAGE, LC_ALL, +LC_MESSAGES, and LANG. If none are set then the default personal +dictionary is $HOME/.hunspell_default. Setting .I \-d @@ -360,6 +361,11 @@ Equivalent to .I \-p. .SH FILES +The default dictionary depends on the locale settings. The +following environment variables are searched: LANGUAGE, LC_ALL, +LC_MESSAGES, and LANG. If none are set then the following +fallbacks are used: + .BI /usr/share/myspell/default.aff Path of default affix file. See hunspell(4). .PP diff -ru hunspell-1.2.8.orig/src/tools/hunspell.cxx hunspell-1.2.8/src/tools/hunspell.cxx --- hunspell-1.2.8.orig/src/tools/hunspell.cxx 2008-09-04 14:44:19.000000000 +0100 +++ hunspell-1.2.8/src/tools/hunspell.cxx 2009-05-01 09:15:33.000000000 +0100 @@ -168,7 +168,6 @@ int printgood = 0; // print only good words and lines int showpath = 0; // show detected path of the dictionary int checkurl = 0; // check URLs and mail addresses -char * ui_lang = NULL; // locale for default dic_name const char * ui_enc = NULL; // locale character encoding (default for I/O) const char * io_enc = NULL; // I/O character encoding @@ -1383,7 +1382,7 @@ #ifdef ENABLE_NLS #ifdef HAVE_LOCALE_H - ui_lang = setlocale(LC_ALL, ""); + setlocale(LC_ALL, ""); textdomain("hunspell"); ui_enc = nl_langinfo(CODESET); #endif @@ -1515,13 +1514,23 @@ if (! dicname) { if (! (dicname=getenv("DICTIONARY"))) { - if ((dicname=ui_lang) || (dicname=getenv("LANG"))) { - dicname = mystrdup(dicname); - char * dot = strchr(dicname, '.'); - if (dot) *dot = '\0'; - char * at = strchr(dicname, '@'); - if (at) *at = '\0'; - } else { + /* + * Search in order of LANGUAGE, LC_ALL, LC_MESSAGES & + * LANG + */ + const char *tests[] = { "LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG" }; + for (int i = 0; i < sizeof(tests) / sizeof(const char*); ++i) { + if (dicname=getenv(tests[i])) { + dicname = mystrdup(dicname); + char * dot = strchr(dicname, '.'); + if (dot) *dot = '\0'; + char * at = strchr(dicname, '@'); + if (at) *at = '\0'; + break; + } + } + + if (! dicname) { dicname=mystrdup(DEFAULTDICNAME); } } else { @@ -1535,6 +1544,12 @@ path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP); path = add(path, OOODIR); + if (showpath) { + fprintf(stderr, gettext("SEARCH PATH:\n%s\n"), path); + fprintf(stderr, gettext("AVAILABLE DICTIONARIES (path is not mandatory for -d option):\n"), path); + search(path, NULL, NULL); + } + if (!privdicname) privdicname = mystrdup(getenv("WORDLIST")); int diclen = strlen(dicname); @@ -1544,9 +1559,6 @@ char * dic = search(path, dicname, ".dic"); if (aff && dic) { if (showpath) { - fprintf(stderr, gettext("SEARCH PATH:\n%s\n"), path); - fprintf(stderr, gettext("AVAILABLE DICTIONARIES (path is not mandatory for -d option):\n"), path); - search(path, NULL, NULL); fprintf(stderr, gettext("LOADED DICTIONARY:\n%s\n%s\n"), aff, dic); } pMS[0] = new Hunspell(aff, dic, key); @@ -1569,7 +1581,7 @@ } else if (dic) pMS[dmax-1]->add_dic(dic); } } else { - fprintf(stderr,gettext("Can't open affix or dictionary files.\n")); + fprintf(stderr,gettext("Can't open affix or dictionary files for dictionary named \"%s\".\n"), dicname); exit(1); } Index: hunspell.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- hunspell.spec 25 Feb 2009 04:22:51 -0000 1.59 +++ hunspell.spec 1 May 2009 12:14:11 -0000 1.60 @@ -1,7 +1,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.2.8 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell Source2: http://people.redhat.com/caolanm/hunspell/wordlist2hunspell @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version License: LGPLv2+ or GPLv2+ or MPLv1.1 BuildRequires: libtool, ncurses-devel Patch1: hunspell-1.2.7-2314461.ispell-alike.patch +Patch2: hunspell-1.2.8-2784983.defaultlanguage.patch %description Hunspell is a spell checker and morphological analyzer library and program @@ -29,6 +30,7 @@ Includes and definitions for developing %prep %setup -q %patch1 -p1 -b .ispell-alike.patch +%patch2 -p1 -b .defaultlanguage.patch # Filter unwanted Requires for the "use explicitely" string in ispellaff2myspell cat << \EOF > %{name}-req #!/bin/sh @@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/hunspell.3.gz %changelog +* Fri May 01 2009 Caolan McNamara - 1.2.8-5 +- Resolves: rhbz#498556 fix default language detection + * Tue Feb 24 2009 Fedora Release Engineering - 1.2.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From markmc at fedoraproject.org Fri May 1 12:14:28 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Fri, 1 May 2009 12:14:28 +0000 (UTC) Subject: rpms/qemu/F-11 qemu.spec,1.86,1.87 Message-ID: <20090501121428.9314470133@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18189 Modified Files: qemu.spec Log Message: * Fri May 1 2009 Mark McLoughlin - 2:0.10-16 - Really provide qemu-kvm as a metapackage Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -p -r1.86 -r1.87 --- qemu.spec 28 Apr 2009 00:37:11 -0000 1.86 +++ qemu.spec 1 May 2009 12:13:58 -0000 1.87 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 15%{?dist} +Release: 16%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -377,6 +377,9 @@ fi %files %defattr(-,root,root) +%files kvm +%defattr(-,root,root) + %files common %defattr(-,root,root) %doc %{qemudocdir}/Changelog @@ -475,6 +478,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Fri May 1 2009 Mark McLoughlin - 2:0.10-16 +- Really provide qemu-kvm as a metapackage + * Fri Apr 27 2009 Glauber Costa - 2:0.10-15 - provide qemu-kvm as a metapackage From caolanm at fedoraproject.org Fri May 1 12:14:41 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 1 May 2009 12:14:41 +0000 (UTC) Subject: rpms/hunspell/F-11 hunspell-1.2.8-2784983.defaultlanguage.patch, NONE, 1.1 hunspell.spec, 1.59, 1.60 Message-ID: <20090501121441.A103A70133@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18210/F-11 Modified Files: hunspell.spec Added Files: hunspell-1.2.8-2784983.defaultlanguage.patch Log Message: Resolves: rhbz#498556 fix default language detection hunspell-1.2.8-2784983.defaultlanguage.patch: --- NEW FILE hunspell-1.2.8-2784983.defaultlanguage.patch --- diff -ru hunspell-1.2.8.orig/man/hunspell.1 hunspell-1.2.8/man/hunspell.1 --- hunspell-1.2.8.orig/man/hunspell.1 2008-06-12 09:50:43.000000000 +0100 +++ hunspell-1.2.8/man/hunspell.1 2009-05-01 09:05:15.000000000 +0100 @@ -309,9 +309,10 @@ .IP \fB\-p\ dict\fR Set path of personal dictionary. -Default dictionary depends from the locale settings. -Without locale support, the default personal dictionary is -the $HOME/.hunspell_default. +The default dictionary depends on the locale settings. The +following environment variables are searched: LANGUAGE, LC_ALL, +LC_MESSAGES, and LANG. If none are set then the default personal +dictionary is $HOME/.hunspell_default. Setting .I \-d @@ -360,6 +361,11 @@ Equivalent to .I \-p. .SH FILES +The default dictionary depends on the locale settings. The +following environment variables are searched: LANGUAGE, LC_ALL, +LC_MESSAGES, and LANG. If none are set then the following +fallbacks are used: + .BI /usr/share/myspell/default.aff Path of default affix file. See hunspell(4). .PP diff -ru hunspell-1.2.8.orig/src/tools/hunspell.cxx hunspell-1.2.8/src/tools/hunspell.cxx --- hunspell-1.2.8.orig/src/tools/hunspell.cxx 2008-09-04 14:44:19.000000000 +0100 +++ hunspell-1.2.8/src/tools/hunspell.cxx 2009-05-01 09:15:33.000000000 +0100 @@ -168,7 +168,6 @@ int printgood = 0; // print only good words and lines int showpath = 0; // show detected path of the dictionary int checkurl = 0; // check URLs and mail addresses -char * ui_lang = NULL; // locale for default dic_name const char * ui_enc = NULL; // locale character encoding (default for I/O) const char * io_enc = NULL; // I/O character encoding @@ -1383,7 +1382,7 @@ #ifdef ENABLE_NLS #ifdef HAVE_LOCALE_H - ui_lang = setlocale(LC_ALL, ""); + setlocale(LC_ALL, ""); textdomain("hunspell"); ui_enc = nl_langinfo(CODESET); #endif @@ -1515,13 +1514,23 @@ if (! dicname) { if (! (dicname=getenv("DICTIONARY"))) { - if ((dicname=ui_lang) || (dicname=getenv("LANG"))) { - dicname = mystrdup(dicname); - char * dot = strchr(dicname, '.'); - if (dot) *dot = '\0'; - char * at = strchr(dicname, '@'); - if (at) *at = '\0'; - } else { + /* + * Search in order of LANGUAGE, LC_ALL, LC_MESSAGES & + * LANG + */ + const char *tests[] = { "LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG" }; + for (int i = 0; i < sizeof(tests) / sizeof(const char*); ++i) { + if (dicname=getenv(tests[i])) { + dicname = mystrdup(dicname); + char * dot = strchr(dicname, '.'); + if (dot) *dot = '\0'; + char * at = strchr(dicname, '@'); + if (at) *at = '\0'; + break; + } + } + + if (! dicname) { dicname=mystrdup(DEFAULTDICNAME); } } else { @@ -1535,6 +1544,12 @@ path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP); path = add(path, OOODIR); + if (showpath) { + fprintf(stderr, gettext("SEARCH PATH:\n%s\n"), path); + fprintf(stderr, gettext("AVAILABLE DICTIONARIES (path is not mandatory for -d option):\n"), path); + search(path, NULL, NULL); + } + if (!privdicname) privdicname = mystrdup(getenv("WORDLIST")); int diclen = strlen(dicname); @@ -1544,9 +1559,6 @@ char * dic = search(path, dicname, ".dic"); if (aff && dic) { if (showpath) { - fprintf(stderr, gettext("SEARCH PATH:\n%s\n"), path); - fprintf(stderr, gettext("AVAILABLE DICTIONARIES (path is not mandatory for -d option):\n"), path); - search(path, NULL, NULL); fprintf(stderr, gettext("LOADED DICTIONARY:\n%s\n%s\n"), aff, dic); } pMS[0] = new Hunspell(aff, dic, key); @@ -1569,7 +1581,7 @@ } else if (dic) pMS[dmax-1]->add_dic(dic); } } else { - fprintf(stderr,gettext("Can't open affix or dictionary files.\n")); + fprintf(stderr,gettext("Can't open affix or dictionary files for dictionary named \"%s\".\n"), dicname); exit(1); } Index: hunspell.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/F-11/hunspell.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- hunspell.spec 25 Feb 2009 04:22:51 -0000 1.59 +++ hunspell.spec 1 May 2009 12:14:09 -0000 1.60 @@ -1,7 +1,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.2.8 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell Source2: http://people.redhat.com/caolanm/hunspell/wordlist2hunspell @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version License: LGPLv2+ or GPLv2+ or MPLv1.1 BuildRequires: libtool, ncurses-devel Patch1: hunspell-1.2.7-2314461.ispell-alike.patch +Patch2: hunspell-1.2.8-2784983.defaultlanguage.patch %description Hunspell is a spell checker and morphological analyzer library and program @@ -29,6 +30,7 @@ Includes and definitions for developing %prep %setup -q %patch1 -p1 -b .ispell-alike.patch +%patch2 -p1 -b .defaultlanguage.patch # Filter unwanted Requires for the "use explicitely" string in ispellaff2myspell cat << \EOF > %{name}-req #!/bin/sh @@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/hunspell.3.gz %changelog +* Fri May 01 2009 Caolan McNamara - 1.2.8-5 +- Resolves: rhbz#498556 fix default language detection + * Tue Feb 24 2009 Fedora Release Engineering - 1.2.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From markmc at fedoraproject.org Fri May 1 12:16:48 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Fri, 1 May 2009 12:16:48 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.89,1.90 Message-ID: <20090501121648.706CA7011D@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19263 Modified Files: qemu.spec Log Message: * Fri May 1 2009 Mark McLoughlin - 2:0.10.50-3.kvm85 - Really provide qemu-kvm as a metapackage for comps Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- qemu.spec 28 Apr 2009 06:33:00 -0000 1.89 +++ qemu.spec 1 May 2009 12:16:18 -0000 1.90 @@ -5,7 +5,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.50 -Release: 2.%{kvmvertag}%{?dist} +Release: 3.%{kvmvertag}%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -372,6 +372,9 @@ fi %files %defattr(-,root,root) +%files kvm +%defattr(-,root,root) + %files common %defattr(-,root,root) %doc %{qemudocdir}/Changelog @@ -471,6 +474,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Fri May 1 2009 Mark McLoughlin - 2:0.10.50-3.kvm85 +- Really provide qemu-kvm as a metapackage for comps + * Tue Apr 28 2009 Mark McLoughlin - 2:0.10.50-2.kvm85 - Provide qemu-kvm as a metapackage for comps From stingray at fedoraproject.org Fri May 1 12:27:18 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Fri, 1 May 2009 12:27:18 +0000 (UTC) Subject: rpms/weechat/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 weechat.spec, 1.10, 1.11 Message-ID: <20090501122718.618627011D@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/weechat/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20702 Modified Files: .cvsignore sources weechat.spec Log Message: weechat-0.2.6.2-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/weechat/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 19 Mar 2009 02:23:29 -0000 1.6 +++ .cvsignore 1 May 2009 12:26:47 -0000 1.7 @@ -1,2 +1,2 @@ -weechat-0.2.6.1.tar.bz2 -weechat-0.2.6.1-pie-rollup.patch.bz2 +weechat-0.2.6.2.tar.bz2 +weechat-0.2.6.2-pie-rollup.patch.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/weechat/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 19 Mar 2009 02:23:29 -0000 1.6 +++ sources 1 May 2009 12:26:47 -0000 1.7 @@ -1,2 +1,2 @@ -6cf818482feb6a6ef90b70694d25c7e9 weechat-0.2.6.1.tar.bz2 -7ec9a2d934553d033d75a80d67484081 weechat-0.2.6.1-pie-rollup.patch.bz2 +b3e71366b2b9d73341eb2695103fbfc9 weechat-0.2.6.2.tar.bz2 +c2b9d2feb9ac09bd3042b3af38e686f6 weechat-0.2.6.2-pie-rollup.patch.bz2 Index: weechat.spec =================================================================== RCS file: /cvs/extras/rpms/weechat/devel/weechat.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- weechat.spec 19 Mar 2009 02:23:29 -0000 1.10 +++ weechat.spec 1 May 2009 12:26:47 -0000 1.11 @@ -1,9 +1,9 @@ Name: weechat Summary: Portable, fast, light and extensible IRC client -Version: 0.2.6.1 +Version: 0.2.6.2 Release: 1%{?dist} Source: http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2 -Patch0: weechat-0.2.6.1-pie-rollup.patch.bz2 +Patch0: %{name}-%{version}-pie-rollup.patch.bz2 URL: http://weechat.flashtux.org Group: Applications/Communications BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/plugins/* %changelog +* Fri May 1 2009 Paul P. Komkoff Jr - 0.2.6.2-1 +- fix some charset decoding problems. + * Thu Mar 19 2009 Paul P. Komkoff Jr - 0.2.6.1-1 - fix bz#490709 From ertzing at fedoraproject.org Fri May 1 12:45:21 2009 From: ertzing at fedoraproject.org (Ralf Ertzinger) Date: Fri, 1 May 2009 12:45:21 +0000 (UTC) Subject: rpms/audacious-plugins/F-11 audacious-plugins-1.5.1-amidi-symbol.patch, NONE, 1.1 audacious-plugins-1.5.1-timidity-cfg.patch, NONE, 1.1 audacious-plugins-1.5.1-vorbis-oga.patch, NONE, 1.1 audacious-plugins.spec, 1.33, 1.34 Message-ID: <20090501124521.5063E7012A@cvs1.fedora.phx.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious-plugins/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23043 Modified Files: audacious-plugins.spec Added Files: audacious-plugins-1.5.1-amidi-symbol.patch audacious-plugins-1.5.1-timidity-cfg.patch audacious-plugins-1.5.1-vorbis-oga.patch Log Message: * Fri May 01 2009 Ralf Ertzinger 1.5.1-4 - Accept .oga files (BZ#479120) - Look for timitidy.cfg in /etc (BZ#450933) - Fix missing symbols in amidi-plugin (BZ#478557) - Include CD-audio plugin (BZ#442921) audacious-plugins-1.5.1-amidi-symbol.patch: --- NEW FILE audacious-plugins-1.5.1-amidi-symbol.patch --- diff -uNr audacious-plugins-fedora-1.5.1-orig/src/amidi-plug/i_configure.c audacious-plugins-fedora-1.5.1/src/amidi-plug/i_configure.c --- audacious-plugins-fedora-1.5.1-orig/src/amidi-plug/i_configure.c 2008-06-08 10:37:44.000000000 +0200 +++ audacious-plugins-fedora-1.5.1/src/amidi-plug/i_configure.c 2009-05-01 14:32:02.744028553 +0200 @@ -29,6 +29,7 @@ #include "i_configure-dummy.h" #include "i_utils.h" #include +#include amidiplug_cfg_backend_t * amidiplug_cfg_backend; audacious-plugins-1.5.1-timidity-cfg.patch: --- NEW FILE audacious-plugins-1.5.1-timidity-cfg.patch --- diff -uNr audacious-plugins-fedora-1.5.1-orig/src/timidity/xmms-timidity.c audacious-plugins-fedora-1.5.1/src/timidity/xmms-timidity.c --- audacious-plugins-fedora-1.5.1-orig/src/timidity/xmms-timidity.c 2008-06-08 10:37:44.000000000 +0200 +++ audacious-plugins-fedora-1.5.1/src/timidity/xmms-timidity.c 2009-05-01 14:05:00.129006194 +0200 @@ -94,7 +94,7 @@ if (! aud_cfg_db_get_string(db, "timidity", "config_file", &xmmstimid_cfg.config_file)) - xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg"); + xmmstimid_cfg.config_file = g_strdup("/etc/timidity.cfg"); aud_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate); aud_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits); audacious-plugins-1.5.1-vorbis-oga.patch: --- NEW FILE audacious-plugins-1.5.1-vorbis-oga.patch --- diff -uNr audacious-plugins-fedora-1.5.1-orig/src/vorbis/vorbis.c audacious-plugins-fedora-1.5.1/src/vorbis/vorbis.c --- audacious-plugins-fedora-1.5.1-orig/src/vorbis/vorbis.c 2008-06-08 10:37:44.000000000 +0200 +++ audacious-plugins-fedora-1.5.1/src/vorbis/vorbis.c 2009-05-01 14:30:54.777004546 +0200 @@ -94,7 +94,7 @@ NULL }; -gchar *vorbis_fmts[] = { "ogg", "ogm", NULL }; +gchar *vorbis_fmts[] = { "ogg", "ogm", "oga", NULL }; InputPlugin vorbis_ip = { .description = "Ogg Vorbis Audio Plugin", /* description */ Index: audacious-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/audacious-plugins/F-11/audacious-plugins.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- audacious-plugins.spec 24 Feb 2009 03:05:57 -0000 1.33 +++ audacious-plugins.spec 1 May 2009 12:44:50 -0000 1.34 @@ -2,7 +2,7 @@ Name: audacious-plugins Version: 1.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plugins for the Audacious media player Group: Applications/Multimedia @@ -18,6 +18,9 @@ Patch0: audacious-plugins-1.2.2- Patch1: audacious-plugins-1.4.1-neon-locking.patch Patch2: audacious-plugins-1.4.4-gcc43.patch Patch3: audacious-plugins-1.5.1-libmtp.patch +Patch4: audacious-plugins-1.5.1-vorbis-oga.patch +Patch5: audacious-plugins-1.5.1-timidity-cfg.patch +Patch6: audacious-plugins-1.5.1-amidi-symbol.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: audacious-devel >= %{aud_ver}, esound-devel >= 0.2, libvorbis-devel >= 1.0 @@ -37,6 +40,10 @@ BuildRequires: libmtp-devel BuildRequires: neon-devel >= 0.25 BuildRequires: libmowgli >= 0.5.0 BuildRequires: mcs-devel >= 0.6.0 +BuildRequires: libcdio-devel >= 0.70 +BuildRequires: libcddb-devel >= 1.2.1 + + Requires: audacious >= %{aud_ver} @@ -91,7 +98,7 @@ KDE arts sound server. %package amidi -Summary: Audacious imput plugin for amidi +Summary: Audacious input plugin for amidi Group: Applications/Multimedia Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver} @@ -103,7 +110,7 @@ amidi sound service. %package wavpack -Summary: Audacious imput plugin for wavpack +Summary: Audacious input plugin for wavpack Group: Applications/Multimedia Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver} @@ -115,7 +122,7 @@ compressed files. %package metronome -Summary: Audacious imput plugin simulating a metronome +Summary: Audacious input plugin simulating a metronome Group: Applications/Multimedia Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver} @@ -127,7 +134,7 @@ a metronome. %package vortex -Summary: Audacious imput plugin for vortex audio files +Summary: Audacious input plugin for vortex audio files Group: Applications/Multimedia Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver} @@ -153,6 +160,15 @@ vortex compressed files. # Use libmtp 0.3 %patch3 -p1 -b .libmtp +# accept .oga files +%patch4 -p1 -b vorbis-oga + +# look for timidity.cfg in /etc +%patch5 -p1 -b timidity-cfg + +# fix missing symbols in amidi +%patch6 -p1 -b amidi-symbols + perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in %build @@ -249,6 +265,12 @@ update-desktop-database %{_datadir}/appl %changelog +* Fri May 01 2009 Ralf Ertzinger 1.5.1-4 +- Accept .oga files (BZ#479120) +- Look for timitidy.cfg in /etc (BZ#450933) +- Fix missing symbols in amidi-plugin (BZ#478557) +- Include CD-audio plugin (BZ#442921) + * Mon Feb 23 2009 Fedora Release Engineering - 1.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ertzing at fedoraproject.org Fri May 1 13:14:30 2009 From: ertzing at fedoraproject.org (Ralf Ertzinger) Date: Fri, 1 May 2009 13:14:30 +0000 (UTC) Subject: rpms/audacious-plugins/devel audacious-plugins-1.5.1-amidi-symbol.patch, NONE, 1.1 audacious-plugins-1.5.1-timidity-cfg.patch, NONE, 1.1 audacious-plugins-1.5.1-vorbis-oga.patch, NONE, 1.1 audacious-plugins.spec, 1.33, 1.34 Message-ID: <20090501131430.383E37011D@cvs1.fedora.phx.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27798 Modified Files: audacious-plugins.spec Added Files: audacious-plugins-1.5.1-amidi-symbol.patch audacious-plugins-1.5.1-timidity-cfg.patch audacious-plugins-1.5.1-vorbis-oga.patch Log Message: * Fri May 01 2009 Ralf Ertzinger 1.5.1-4 - Accept .oga files (BZ#479120) - Look for timitidy.cfg in /etc (BZ#450933) - Fix missing symbols in amidi-plugin (BZ#478557) - Include CD-audio plugin (BZ#442921) audacious-plugins-1.5.1-amidi-symbol.patch: --- NEW FILE audacious-plugins-1.5.1-amidi-symbol.patch --- diff -uNr audacious-plugins-fedora-1.5.1-orig/src/amidi-plug/i_configure.c audacious-plugins-fedora-1.5.1/src/amidi-plug/i_configure.c --- audacious-plugins-fedora-1.5.1-orig/src/amidi-plug/i_configure.c 2008-06-08 10:37:44.000000000 +0200 +++ audacious-plugins-fedora-1.5.1/src/amidi-plug/i_configure.c 2009-05-01 14:32:02.744028553 +0200 @@ -29,6 +29,7 @@ #include "i_configure-dummy.h" #include "i_utils.h" #include +#include amidiplug_cfg_backend_t * amidiplug_cfg_backend; audacious-plugins-1.5.1-timidity-cfg.patch: --- NEW FILE audacious-plugins-1.5.1-timidity-cfg.patch --- diff -uNr audacious-plugins-fedora-1.5.1-orig/src/timidity/xmms-timidity.c audacious-plugins-fedora-1.5.1/src/timidity/xmms-timidity.c --- audacious-plugins-fedora-1.5.1-orig/src/timidity/xmms-timidity.c 2008-06-08 10:37:44.000000000 +0200 +++ audacious-plugins-fedora-1.5.1/src/timidity/xmms-timidity.c 2009-05-01 14:05:00.129006194 +0200 @@ -94,7 +94,7 @@ if (! aud_cfg_db_get_string(db, "timidity", "config_file", &xmmstimid_cfg.config_file)) - xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg"); + xmmstimid_cfg.config_file = g_strdup("/etc/timidity.cfg"); aud_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate); aud_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits); audacious-plugins-1.5.1-vorbis-oga.patch: --- NEW FILE audacious-plugins-1.5.1-vorbis-oga.patch --- diff -uNr audacious-plugins-fedora-1.5.1-orig/src/vorbis/vorbis.c audacious-plugins-fedora-1.5.1/src/vorbis/vorbis.c --- audacious-plugins-fedora-1.5.1-orig/src/vorbis/vorbis.c 2008-06-08 10:37:44.000000000 +0200 +++ audacious-plugins-fedora-1.5.1/src/vorbis/vorbis.c 2009-05-01 14:30:54.777004546 +0200 @@ -94,7 +94,7 @@ NULL }; -gchar *vorbis_fmts[] = { "ogg", "ogm", NULL }; +gchar *vorbis_fmts[] = { "ogg", "ogm", "oga", NULL }; InputPlugin vorbis_ip = { .description = "Ogg Vorbis Audio Plugin", /* description */ Index: audacious-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- audacious-plugins.spec 24 Feb 2009 03:05:57 -0000 1.33 +++ audacious-plugins.spec 1 May 2009 13:13:59 -0000 1.34 @@ -2,7 +2,7 @@ Name: audacious-plugins Version: 1.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plugins for the Audacious media player Group: Applications/Multimedia @@ -18,6 +18,9 @@ Patch0: audacious-plugins-1.2.2- Patch1: audacious-plugins-1.4.1-neon-locking.patch Patch2: audacious-plugins-1.4.4-gcc43.patch Patch3: audacious-plugins-1.5.1-libmtp.patch +Patch4: audacious-plugins-1.5.1-vorbis-oga.patch +Patch5: audacious-plugins-1.5.1-timidity-cfg.patch +Patch6: audacious-plugins-1.5.1-amidi-symbol.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: audacious-devel >= %{aud_ver}, esound-devel >= 0.2, libvorbis-devel >= 1.0 @@ -37,6 +40,10 @@ BuildRequires: libmtp-devel BuildRequires: neon-devel >= 0.25 BuildRequires: libmowgli >= 0.5.0 BuildRequires: mcs-devel >= 0.6.0 +BuildRequires: libcdio-devel >= 0.70 +BuildRequires: libcddb-devel >= 1.2.1 + + Requires: audacious >= %{aud_ver} @@ -91,7 +98,7 @@ KDE arts sound server. %package amidi -Summary: Audacious imput plugin for amidi +Summary: Audacious input plugin for amidi Group: Applications/Multimedia Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver} @@ -103,7 +110,7 @@ amidi sound service. %package wavpack -Summary: Audacious imput plugin for wavpack +Summary: Audacious input plugin for wavpack Group: Applications/Multimedia Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver} @@ -115,7 +122,7 @@ compressed files. %package metronome -Summary: Audacious imput plugin simulating a metronome +Summary: Audacious input plugin simulating a metronome Group: Applications/Multimedia Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver} @@ -127,7 +134,7 @@ a metronome. %package vortex -Summary: Audacious imput plugin for vortex audio files +Summary: Audacious input plugin for vortex audio files Group: Applications/Multimedia Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver} @@ -153,6 +160,15 @@ vortex compressed files. # Use libmtp 0.3 %patch3 -p1 -b .libmtp +# accept .oga files +%patch4 -p1 -b vorbis-oga + +# look for timidity.cfg in /etc +%patch5 -p1 -b timidity-cfg + +# fix missing symbols in amidi +%patch6 -p1 -b amidi-symbols + perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in %build @@ -249,6 +265,12 @@ update-desktop-database %{_datadir}/appl %changelog +* Fri May 01 2009 Ralf Ertzinger 1.5.1-4 +- Accept .oga files (BZ#479120) +- Look for timitidy.cfg in /etc (BZ#450933) +- Fix missing symbols in amidi-plugin (BZ#478557) +- Include CD-audio plugin (BZ#442921) + * Mon Feb 23 2009 Fedora Release Engineering - 1.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From stingray at fedoraproject.org Fri May 1 13:39:54 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Fri, 1 May 2009 13:39:54 +0000 (UTC) Subject: rpms/weechat/F-10 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 weechat.spec, 1.8, 1.9 Message-ID: <20090501133954.B6DBF7011D@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/weechat/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31980/F-10 Modified Files: .cvsignore sources weechat.spec Log Message: weechat-0.2.6.2-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/weechat/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 19 Mar 2009 11:58:16 -0000 1.6 +++ .cvsignore 1 May 2009 13:39:24 -0000 1.7 @@ -1,2 +1,2 @@ -weechat-0.2.6.1.tar.bz2 -weechat-0.2.6.1-pie-rollup.patch.bz2 +weechat-0.2.6.2.tar.bz2 +weechat-0.2.6.2-pie-rollup.patch.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/weechat/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 19 Mar 2009 11:58:16 -0000 1.6 +++ sources 1 May 2009 13:39:24 -0000 1.7 @@ -1,2 +1,2 @@ -6cf818482feb6a6ef90b70694d25c7e9 weechat-0.2.6.1.tar.bz2 -7ec9a2d934553d033d75a80d67484081 weechat-0.2.6.1-pie-rollup.patch.bz2 +b3e71366b2b9d73341eb2695103fbfc9 weechat-0.2.6.2.tar.bz2 +c2b9d2feb9ac09bd3042b3af38e686f6 weechat-0.2.6.2-pie-rollup.patch.bz2 Index: weechat.spec =================================================================== RCS file: /cvs/extras/rpms/weechat/F-10/weechat.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- weechat.spec 19 Mar 2009 11:58:16 -0000 1.8 +++ weechat.spec 1 May 2009 13:39:24 -0000 1.9 @@ -1,9 +1,9 @@ Name: weechat Summary: Portable, fast, light and extensible IRC client -Version: 0.2.6.1 +Version: 0.2.6.2 Release: 1%{?dist} Source: http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2 -Patch0: weechat-0.2.6.1-pie-rollup.patch.bz2 +Patch0: %{name}-%{version}-pie-rollup.patch.bz2 URL: http://weechat.flashtux.org Group: Applications/Communications BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/plugins/* %changelog +* Fri May 1 2009 Paul P. Komkoff Jr - 0.2.6.2-1 +- fix some charset decoding problems. + * Thu Mar 19 2009 Paul P. Komkoff Jr - 0.2.6.1-1 - fix bz#490709 From stingray at fedoraproject.org Fri May 1 13:39:55 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Fri, 1 May 2009 13:39:55 +0000 (UTC) Subject: rpms/weechat/F-9 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 weechat.spec, 1.6, 1.7 Message-ID: <20090501133955.292DB7011D@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/weechat/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31980/F-9 Modified Files: .cvsignore sources weechat.spec Log Message: weechat-0.2.6.2-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/weechat/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 19 Mar 2009 11:58:20 -0000 1.6 +++ .cvsignore 1 May 2009 13:39:24 -0000 1.7 @@ -1,2 +1,2 @@ -weechat-0.2.6.1.tar.bz2 -weechat-0.2.6.1-pie-rollup.patch.bz2 +weechat-0.2.6.2.tar.bz2 +weechat-0.2.6.2-pie-rollup.patch.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/weechat/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 19 Mar 2009 11:58:20 -0000 1.6 +++ sources 1 May 2009 13:39:24 -0000 1.7 @@ -1,2 +1,2 @@ -6cf818482feb6a6ef90b70694d25c7e9 weechat-0.2.6.1.tar.bz2 -7ec9a2d934553d033d75a80d67484081 weechat-0.2.6.1-pie-rollup.patch.bz2 +b3e71366b2b9d73341eb2695103fbfc9 weechat-0.2.6.2.tar.bz2 +c2b9d2feb9ac09bd3042b3af38e686f6 weechat-0.2.6.2-pie-rollup.patch.bz2 Index: weechat.spec =================================================================== RCS file: /cvs/extras/rpms/weechat/F-9/weechat.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- weechat.spec 19 Mar 2009 11:58:20 -0000 1.6 +++ weechat.spec 1 May 2009 13:39:24 -0000 1.7 @@ -1,9 +1,9 @@ Name: weechat Summary: Portable, fast, light and extensible IRC client -Version: 0.2.6.1 +Version: 0.2.6.2 Release: 1%{?dist} Source: http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2 -Patch0: weechat-0.2.6.1-pie-rollup.patch.bz2 +Patch0: %{name}-%{version}-pie-rollup.patch.bz2 URL: http://weechat.flashtux.org Group: Applications/Communications BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/plugins/* %changelog +* Fri May 1 2009 Paul P. Komkoff Jr - 0.2.6.2-1 +- fix some charset decoding problems. + * Thu Mar 19 2009 Paul P. Komkoff Jr - 0.2.6.1-1 - fix bz#490709 From stingray at fedoraproject.org Fri May 1 13:39:54 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Fri, 1 May 2009 13:39:54 +0000 (UTC) Subject: rpms/weechat/F-11 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 weechat.spec, 1.10, 1.11 Message-ID: <20090501133954.D48577012A@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/weechat/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31980/F-11 Modified Files: .cvsignore sources weechat.spec Log Message: weechat-0.2.6.2-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/weechat/F-11/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 19 Mar 2009 02:23:29 -0000 1.6 +++ .cvsignore 1 May 2009 13:39:24 -0000 1.7 @@ -1,2 +1,2 @@ -weechat-0.2.6.1.tar.bz2 -weechat-0.2.6.1-pie-rollup.patch.bz2 +weechat-0.2.6.2.tar.bz2 +weechat-0.2.6.2-pie-rollup.patch.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/weechat/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 19 Mar 2009 02:23:29 -0000 1.6 +++ sources 1 May 2009 13:39:24 -0000 1.7 @@ -1,2 +1,2 @@ -6cf818482feb6a6ef90b70694d25c7e9 weechat-0.2.6.1.tar.bz2 -7ec9a2d934553d033d75a80d67484081 weechat-0.2.6.1-pie-rollup.patch.bz2 +b3e71366b2b9d73341eb2695103fbfc9 weechat-0.2.6.2.tar.bz2 +c2b9d2feb9ac09bd3042b3af38e686f6 weechat-0.2.6.2-pie-rollup.patch.bz2 Index: weechat.spec =================================================================== RCS file: /cvs/extras/rpms/weechat/F-11/weechat.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- weechat.spec 19 Mar 2009 02:23:29 -0000 1.10 +++ weechat.spec 1 May 2009 13:39:24 -0000 1.11 @@ -1,9 +1,9 @@ Name: weechat Summary: Portable, fast, light and extensible IRC client -Version: 0.2.6.1 +Version: 0.2.6.2 Release: 1%{?dist} Source: http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2 -Patch0: weechat-0.2.6.1-pie-rollup.patch.bz2 +Patch0: %{name}-%{version}-pie-rollup.patch.bz2 URL: http://weechat.flashtux.org Group: Applications/Communications BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/plugins/* %changelog +* Fri May 1 2009 Paul P. Komkoff Jr - 0.2.6.2-1 +- fix some charset decoding problems. + * Thu Mar 19 2009 Paul P. Komkoff Jr - 0.2.6.1-1 - fix bz#490709 From rjones at fedoraproject.org Fri May 1 13:42:37 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 1 May 2009 13:42:37 +0000 (UTC) Subject: rpms/febootstrap/F-11 .cvsignore, 1.3, 1.4 febootstrap.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090501134237.A9D697011D@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/febootstrap/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32431/F-11 Modified Files: .cvsignore febootstrap.spec sources Log Message: New upstream release 1.8. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 20 Apr 2009 19:19:32 -0000 1.3 +++ .cvsignore 1 May 2009 13:42:07 -0000 1.4 @@ -1 +1 @@ -febootstrap-1.7.tar.gz +febootstrap-1.8.tar.gz Index: febootstrap.spec =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/F-11/febootstrap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- febootstrap.spec 20 Apr 2009 19:19:32 -0000 1.2 +++ febootstrap.spec 1 May 2009 13:42:07 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Bootstrap a new Fedora system (like debootstrap) Name: febootstrap -Version: 1.7 +Version: 1.8 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 1 2009 Richard Jones - 1.8-1 +- New upstream release 1.8. + * Mon Apr 20 2009 Richard Jones - 1.7-1 - New upstream release 1.7. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 20 Apr 2009 19:19:32 -0000 1.3 +++ sources 1 May 2009 13:42:07 -0000 1.4 @@ -1 +1 @@ -df7ddb510513d5491ead77ac970b08d2 febootstrap-1.7.tar.gz +b86d7b6949288b4358b1f84da382af45 febootstrap-1.8.tar.gz From rjones at fedoraproject.org Fri May 1 13:42:37 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 1 May 2009 13:42:37 +0000 (UTC) Subject: rpms/febootstrap/devel .cvsignore, 1.3, 1.4 febootstrap.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090501134237.BC1617012A@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/febootstrap/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32431/devel Modified Files: .cvsignore febootstrap.spec sources Log Message: New upstream release 1.8. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 20 Apr 2009 19:19:25 -0000 1.3 +++ .cvsignore 1 May 2009 13:42:07 -0000 1.4 @@ -1 +1 @@ -febootstrap-1.7.tar.gz +febootstrap-1.8.tar.gz Index: febootstrap.spec =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/devel/febootstrap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- febootstrap.spec 20 Apr 2009 19:19:26 -0000 1.2 +++ febootstrap.spec 1 May 2009 13:42:07 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Bootstrap a new Fedora system (like debootstrap) Name: febootstrap -Version: 1.7 +Version: 1.8 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 1 2009 Richard Jones - 1.8-1 +- New upstream release 1.8. + * Mon Apr 20 2009 Richard Jones - 1.7-1 - New upstream release 1.7. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 20 Apr 2009 19:19:26 -0000 1.3 +++ sources 1 May 2009 13:42:07 -0000 1.4 @@ -1 +1 @@ -df7ddb510513d5491ead77ac970b08d2 febootstrap-1.7.tar.gz +b86d7b6949288b4358b1f84da382af45 febootstrap-1.8.tar.gz From rjones at fedoraproject.org Fri May 1 13:46:26 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 1 May 2009 13:46:26 +0000 (UTC) Subject: rpms/febootstrap/F-10 .cvsignore, 1.3, 1.4 febootstrap.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090501134626.5074E7011D@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/febootstrap/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv504 Modified Files: .cvsignore febootstrap.spec sources Log Message: New upstream version 1.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 20 Apr 2009 19:19:34 -0000 1.3 +++ .cvsignore 1 May 2009 13:46:25 -0000 1.4 @@ -1 +1 @@ -febootstrap-1.7.tar.gz +febootstrap-1.8.tar.gz Index: febootstrap.spec =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/F-10/febootstrap.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- febootstrap.spec 28 Apr 2009 08:54:59 -0000 1.4 +++ febootstrap.spec 1 May 2009 13:46:25 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Bootstrap a new Fedora system (like debootstrap) Name: febootstrap -Version: 1.7 -Release: 1%{?dist}.1 +Version: 1.8 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://et.redhat.com/~rjones/febootstrap/ @@ -79,15 +79,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 1 2009 Richard Jones - 1.8-1 +- New upstream release 1.8. + * Tue Apr 28 2009 Richard Jones - 1.7-1.fc10.1 - Fix bad Requires on non-existent fakechroot. * Mon Apr 20 2009 Richard Jones - 1.7-1 - New upstream release 1.7. -* Thu Apr 16 2009 Richard Jones - 1.5-3.fc10.1 -- Downgrade version of fakechroot required (just for F-10). - * Tue Apr 14 2009 Richard Jones - 1.5-3 - Configure script has (unnecessary) BuildRequires on fakeroot, fakechroot, yum. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/febootstrap/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 20 Apr 2009 19:19:34 -0000 1.3 +++ sources 1 May 2009 13:46:25 -0000 1.4 @@ -1 +1 @@ -df7ddb510513d5491ead77ac970b08d2 febootstrap-1.7.tar.gz +b86d7b6949288b4358b1f84da382af45 febootstrap-1.8.tar.gz From llaumgui at fedoraproject.org Fri May 1 14:11:30 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Fri, 1 May 2009 14:11:30 +0000 (UTC) Subject: rpms/php-ezc-Cache/devel import.log, NONE, 1.1 php-ezc-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501141130.90C5A7011D@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Cache/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5658/devel Modified Files: .cvsignore sources Added Files: import.log php-ezc-Cache.spec Log Message: Initial import branch devel --- NEW FILE import.log --- php-ezc-Cache-1_4-1_fc10:HEAD:php-ezc-Cache-1.4-1.fc10.src.rpm:1241186983 --- NEW FILE php-ezc-Cache.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Cache %define channel components.ez.no Name: php-ezc-Cache Version: 1.4 Release: 1%{?dist} Summary: Provides a collection of lightweight classes to cache different kinds of data Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-pear(%{channel}/Base) >= 1.5 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description A solution for caching, supporting multiple backends allowing you to specify the best performing solution for your caching-problem. APC cache storage is available only if php-pecl-apc extension installed. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # rpmlint (E): zero-length rm -f ./docdir/cache/content/dummy rm -f ./docdir/cache/templates/dummy # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/cache_autoload.php %changelog * Thu Apr 23 2009 Guillaume Kulakowski - 1.4-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Cache/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 30 Apr 2009 04:51:30 -0000 1.1 +++ .cvsignore 1 May 2009 14:11:29 -0000 1.2 @@ -0,0 +1 @@ +Cache-1.4.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Cache/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 30 Apr 2009 04:51:30 -0000 1.1 +++ sources 1 May 2009 14:11:30 -0000 1.2 @@ -0,0 +1 @@ +d1f3d512828f50274f62f6af82b30ad5 Cache-1.4.tgz From llaumgui at fedoraproject.org Fri May 1 14:12:00 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Fri, 1 May 2009 14:12:00 +0000 (UTC) Subject: rpms/php-ezc-Cache/F-9 import.log, NONE, 1.1 php-ezc-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501141200.8E1117011D@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Cache/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5675/F-9 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Cache.spec Log Message: Initial import branch F-9 --- NEW FILE import.log --- php-ezc-Cache-1_4-1_fc10:F-9:php-ezc-Cache-1.4-1.fc10.src.rpm:1241186992 --- NEW FILE php-ezc-Cache.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Cache %define channel components.ez.no Name: php-ezc-Cache Version: 1.4 Release: 1%{?dist} Summary: Provides a collection of lightweight classes to cache different kinds of data Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-pear(%{channel}/Base) >= 1.5 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description A solution for caching, supporting multiple backends allowing you to specify the best performing solution for your caching-problem. APC cache storage is available only if php-pecl-apc extension installed. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # rpmlint (E): zero-length rm -f ./docdir/cache/content/dummy rm -f ./docdir/cache/templates/dummy # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/cache_autoload.php %changelog * Thu Apr 23 2009 Guillaume Kulakowski - 1.4-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 30 Apr 2009 04:51:30 -0000 1.1 +++ .cvsignore 1 May 2009 14:11:30 -0000 1.2 @@ -0,0 +1 @@ +Cache-1.4.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 30 Apr 2009 04:51:30 -0000 1.1 +++ sources 1 May 2009 14:11:30 -0000 1.2 @@ -0,0 +1 @@ +d1f3d512828f50274f62f6af82b30ad5 Cache-1.4.tgz From llaumgui at fedoraproject.org Fri May 1 14:12:02 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Fri, 1 May 2009 14:12:02 +0000 (UTC) Subject: rpms/php-ezc-Cache/F-11 import.log, NONE, 1.1 php-ezc-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501141202.4D9D77011D@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Cache/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5721/F-11 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Cache.spec Log Message: Initial import branch F-11 --- NEW FILE import.log --- php-ezc-Cache-1_4-1_fc10:F-11:php-ezc-Cache-1.4-1.fc10.src.rpm:1241186998 --- NEW FILE php-ezc-Cache.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Cache %define channel components.ez.no Name: php-ezc-Cache Version: 1.4 Release: 1%{?dist} Summary: Provides a collection of lightweight classes to cache different kinds of data Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-pear(%{channel}/Base) >= 1.5 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description A solution for caching, supporting multiple backends allowing you to specify the best performing solution for your caching-problem. APC cache storage is available only if php-pecl-apc extension installed. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # rpmlint (E): zero-length rm -f ./docdir/cache/content/dummy rm -f ./docdir/cache/templates/dummy # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/cache_autoload.php %changelog * Thu Apr 23 2009 Guillaume Kulakowski - 1.4-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 30 Apr 2009 04:51:30 -0000 1.1 +++ .cvsignore 1 May 2009 14:11:32 -0000 1.2 @@ -0,0 +1 @@ +Cache-1.4.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 30 Apr 2009 04:51:30 -0000 1.1 +++ sources 1 May 2009 14:11:32 -0000 1.2 @@ -0,0 +1 @@ +d1f3d512828f50274f62f6af82b30ad5 Cache-1.4.tgz From llaumgui at fedoraproject.org Fri May 1 14:12:01 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Fri, 1 May 2009 14:12:01 +0000 (UTC) Subject: rpms/php-ezc-Cache/F-10 import.log, NONE, 1.1 php-ezc-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501141201.220237011D@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Cache/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5700/F-10 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Cache.spec Log Message: Initial import branch F-10 --- NEW FILE import.log --- php-ezc-Cache-1_4-1_fc10:F-10:php-ezc-Cache-1.4-1.fc10.src.rpm:1241186992 --- NEW FILE php-ezc-Cache.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Cache %define channel components.ez.no Name: php-ezc-Cache Version: 1.4 Release: 1%{?dist} Summary: Provides a collection of lightweight classes to cache different kinds of data Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-pear(%{channel}/Base) >= 1.5 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description A solution for caching, supporting multiple backends allowing you to specify the best performing solution for your caching-problem. APC cache storage is available only if php-pecl-apc extension installed. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # rpmlint (E): zero-length rm -f ./docdir/cache/content/dummy rm -f ./docdir/cache/templates/dummy # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/cache_autoload.php %changelog * Thu Apr 23 2009 Guillaume Kulakowski - 1.4-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 30 Apr 2009 04:51:30 -0000 1.1 +++ .cvsignore 1 May 2009 14:11:30 -0000 1.2 @@ -0,0 +1 @@ +Cache-1.4.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 30 Apr 2009 04:51:30 -0000 1.1 +++ sources 1 May 2009 14:11:30 -0000 1.2 @@ -0,0 +1 @@ +d1f3d512828f50274f62f6af82b30ad5 Cache-1.4.tgz From tanguy at fedoraproject.org Fri May 1 14:12:55 2009 From: tanguy at fedoraproject.org (Eric Tanguy) Date: Fri, 1 May 2009 14:12:55 +0000 (UTC) Subject: rpms/qucs/F-10 .cvsignore, 1.9, 1.10 qucs.desktop, 1.3, 1.4 qucs.spec, 1.23, 1.24 sources, 1.9, 1.10 Message-ID: <20090501141255.731877011D@cvs1.fedora.phx.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6077 Modified Files: .cvsignore qucs.desktop qucs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 19 Apr 2008 15:22:47 -0000 1.9 +++ .cvsignore 1 May 2009 14:12:25 -0000 1.10 @@ -1 +1 @@ -qucs-0.0.14.tar.gz +qucs-0.0.15.tar.gz Index: qucs.desktop =================================================================== RCS file: /cvs/extras/rpms/qucs/F-10/qucs.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- qucs.desktop 9 Sep 2007 17:25:46 -0000 1.3 +++ qucs.desktop 1 May 2009 14:12:25 -0000 1.4 @@ -9,4 +9,4 @@ Comment[fr]=Qucs est un simulateur de ci Terminal=false Type=Application Icon=/usr/share/qucs/bitmaps/big.qucs.xpm -Categories=Science;Engineering; +Categories=Electronics;Engineering; Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/F-10/qucs.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- qucs.spec 19 Apr 2008 15:22:47 -0000 1.23 +++ qucs.spec 1 May 2009 14:12:25 -0000 1.24 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.14 +Version: 0.0.15 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Fri May 01 2009 Eric Tanguy - 0.0.15-1 +- Update to 0.0.15 + * Sat Apr 05 2008 Eric Tanguy - 0.0.14-1 - Update to 0.0.14 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 19 Apr 2008 15:22:47 -0000 1.9 +++ sources 1 May 2009 14:12:25 -0000 1.10 @@ -1 +1 @@ -6c2b7ec626ccb167eb089c322d21aed0 qucs-0.0.14.tar.gz +5a35eee790c92eba97de181b12794823 qucs-0.0.15.tar.gz From tanguy at fedoraproject.org Fri May 1 14:21:50 2009 From: tanguy at fedoraproject.org (Eric Tanguy) Date: Fri, 1 May 2009 14:21:50 +0000 (UTC) Subject: rpms/qucs/F-11 .cvsignore, 1.9, 1.10 qucs.desktop, 1.3, 1.4 qucs.spec, 1.24, 1.25 sources, 1.9, 1.10 Message-ID: <20090501142150.DBBDD7011D@cvs1.fedora.phx.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8389 Modified Files: .cvsignore qucs.desktop qucs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/F-11/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 19 Apr 2008 15:22:47 -0000 1.9 +++ .cvsignore 1 May 2009 14:21:20 -0000 1.10 @@ -1 +1 @@ -qucs-0.0.14.tar.gz +qucs-0.0.15.tar.gz Index: qucs.desktop =================================================================== RCS file: /cvs/extras/rpms/qucs/F-11/qucs.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- qucs.desktop 9 Sep 2007 17:25:46 -0000 1.3 +++ qucs.desktop 1 May 2009 14:21:20 -0000 1.4 @@ -9,4 +9,4 @@ Comment[fr]=Qucs est un simulateur de ci Terminal=false Type=Application Icon=/usr/share/qucs/bitmaps/big.qucs.xpm -Categories=Science;Engineering; +Categories=Electronics;Engineering; Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/F-11/qucs.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- qucs.spec 25 Feb 2009 18:23:27 -0000 1.24 +++ qucs.spec 1 May 2009 14:21:20 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.14 -Release: 2%{?dist} +Version: 0.0.15 +Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop URL: http://qucs.sourceforge.net/ @@ -50,8 +50,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri May 01 2009 Eric Tanguy - 0.0.15-1 +- Update to 0.0.15 * Sat Apr 05 2008 Eric Tanguy - 0.0.14-1 - Update to 0.0.14 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/F-11/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 19 Apr 2008 15:22:47 -0000 1.9 +++ sources 1 May 2009 14:21:20 -0000 1.10 @@ -1 +1 @@ -6c2b7ec626ccb167eb089c322d21aed0 qucs-0.0.14.tar.gz +5a35eee790c92eba97de181b12794823 qucs-0.0.15.tar.gz From tanguy at fedoraproject.org Fri May 1 14:25:11 2009 From: tanguy at fedoraproject.org (Eric Tanguy) Date: Fri, 1 May 2009 14:25:11 +0000 (UTC) Subject: rpms/qucs/devel .cvsignore, 1.9, 1.10 qucs.desktop, 1.3, 1.4 qucs.spec, 1.24, 1.25 sources, 1.9, 1.10 Message-ID: <20090501142511.3D13C7011D@cvs1.fedora.phx.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8763 Modified Files: .cvsignore qucs.desktop qucs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 19 Apr 2008 15:22:47 -0000 1.9 +++ .cvsignore 1 May 2009 14:24:40 -0000 1.10 @@ -1 +1 @@ -qucs-0.0.14.tar.gz +qucs-0.0.15.tar.gz Index: qucs.desktop =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/qucs.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- qucs.desktop 9 Sep 2007 17:25:46 -0000 1.3 +++ qucs.desktop 1 May 2009 14:24:40 -0000 1.4 @@ -9,4 +9,4 @@ Comment[fr]=Qucs est un simulateur de ci Terminal=false Type=Application Icon=/usr/share/qucs/bitmaps/big.qucs.xpm -Categories=Science;Engineering; +Categories=Electronics;Engineering; Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- qucs.spec 25 Feb 2009 18:23:27 -0000 1.24 +++ qucs.spec 1 May 2009 14:24:40 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.14 -Release: 2%{?dist} +Version: 0.0.15 +Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop URL: http://qucs.sourceforge.net/ @@ -50,8 +50,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri May 01 2009 Eric Tanguy - 0.0.15-1 +- Update to 0.0.15 * Sat Apr 05 2008 Eric Tanguy - 0.0.14-1 - Update to 0.0.14 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 19 Apr 2008 15:22:47 -0000 1.9 +++ sources 1 May 2009 14:24:40 -0000 1.10 @@ -1 +1 @@ -6c2b7ec626ccb167eb089c322d21aed0 qucs-0.0.14.tar.gz +5a35eee790c92eba97de181b12794823 qucs-0.0.15.tar.gz From llaumgui at fedoraproject.org Fri May 1 14:45:22 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Fri, 1 May 2009 14:45:22 +0000 (UTC) Subject: rpms/php-ezc-Mail/F-9 import.log, NONE, 1.1 php-ezc-Mail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501144522.159EF7012F@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Mail/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12108/F-9 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Mail.spec Log Message: Initial import branch F-9 --- NEW FILE import.log --- php-ezc-Mail-1_6_1-3_fc10:F-9:php-ezc-Mail-1.6.1-3.fc10.src.rpm:1241189062 --- NEW FILE php-ezc-Mail.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Mail %define channel components.ez.no Name: php-ezc-Mail Version: 1.6.1 Release: 3%{?dist} Summary: Construct and/or parse Mail messages conforming to the mail standard Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-mcrypt Requires: php-pecl-Fileinfo Requires: php-pear(%{channel}/Base) >= 1.6.1 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description The component allows you construct and/or parse Mail messages conforming to the mail standard. It has support for attachments, multipart messages and HTML mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to retrieve e-mail. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # rpmlint (W): wrong-file-end-of-line-encoding sed -i -e 's|\r||g' ./docdir/tutorial/test-mail.mail # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/mail_autoload.php %changelog * Thu Apr 27 2009 Guillaume Kulakowski - 1.6.1-3 - Requires php-pecl-Fileinfo * Thu Apr 23 2009 Guillaume Kulakowski - 1.6.1-2 - rpmlint is now silent * Thu Mar 19 2009 Guillaume Kulakowski - 1.6.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 30 Apr 2009 04:53:47 -0000 1.1 +++ .cvsignore 1 May 2009 14:45:20 -0000 1.2 @@ -0,0 +1 @@ +Mail-1.6.1.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 30 Apr 2009 04:53:47 -0000 1.1 +++ sources 1 May 2009 14:45:20 -0000 1.2 @@ -0,0 +1 @@ +81cb0b0f2e21508e54891ab1358379d4 Mail-1.6.1.tgz From llaumgui at fedoraproject.org Fri May 1 14:45:23 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Fri, 1 May 2009 14:45:23 +0000 (UTC) Subject: rpms/php-ezc-Mail/F-10 import.log, NONE, 1.1 php-ezc-Mail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501144523.5444A70131@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Mail/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12134/F-10 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Mail.spec Log Message: Initial import branch F-10 --- NEW FILE import.log --- php-ezc-Mail-1_6_1-3_fc10:F-10:php-ezc-Mail-1.6.1-3.fc10.src.rpm:1241189066 --- NEW FILE php-ezc-Mail.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Mail %define channel components.ez.no Name: php-ezc-Mail Version: 1.6.1 Release: 3%{?dist} Summary: Construct and/or parse Mail messages conforming to the mail standard Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-mcrypt Requires: php-pecl-Fileinfo Requires: php-pear(%{channel}/Base) >= 1.6.1 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description The component allows you construct and/or parse Mail messages conforming to the mail standard. It has support for attachments, multipart messages and HTML mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to retrieve e-mail. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # rpmlint (W): wrong-file-end-of-line-encoding sed -i -e 's|\r||g' ./docdir/tutorial/test-mail.mail # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/mail_autoload.php %changelog * Thu Apr 27 2009 Guillaume Kulakowski - 1.6.1-3 - Requires php-pecl-Fileinfo * Thu Apr 23 2009 Guillaume Kulakowski - 1.6.1-2 - rpmlint is now silent * Thu Mar 19 2009 Guillaume Kulakowski - 1.6.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 30 Apr 2009 04:53:47 -0000 1.1 +++ .cvsignore 1 May 2009 14:45:22 -0000 1.2 @@ -0,0 +1 @@ +Mail-1.6.1.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 30 Apr 2009 04:53:47 -0000 1.1 +++ sources 1 May 2009 14:45:22 -0000 1.2 @@ -0,0 +1 @@ +81cb0b0f2e21508e54891ab1358379d4 Mail-1.6.1.tgz From llaumgui at fedoraproject.org Fri May 1 14:45:50 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Fri, 1 May 2009 14:45:50 +0000 (UTC) Subject: rpms/php-ezc-Mail/devel import.log, NONE, 1.1 php-ezc-Mail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501144550.B730E7012F@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Mail/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12088/devel Modified Files: .cvsignore sources Added Files: import.log php-ezc-Mail.spec Log Message: Initial import branch devel --- NEW FILE import.log --- php-ezc-Mail-1_6_1-3_fc10:HEAD:php-ezc-Mail-1.6.1-3.fc10.src.rpm:1241189050 --- NEW FILE php-ezc-Mail.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Mail %define channel components.ez.no Name: php-ezc-Mail Version: 1.6.1 Release: 3%{?dist} Summary: Construct and/or parse Mail messages conforming to the mail standard Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-mcrypt Requires: php-pecl-Fileinfo Requires: php-pear(%{channel}/Base) >= 1.6.1 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description The component allows you construct and/or parse Mail messages conforming to the mail standard. It has support for attachments, multipart messages and HTML mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to retrieve e-mail. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # rpmlint (W): wrong-file-end-of-line-encoding sed -i -e 's|\r||g' ./docdir/tutorial/test-mail.mail # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/mail_autoload.php %changelog * Thu Apr 27 2009 Guillaume Kulakowski - 1.6.1-3 - Requires php-pecl-Fileinfo * Thu Apr 23 2009 Guillaume Kulakowski - 1.6.1-2 - rpmlint is now silent * Thu Mar 19 2009 Guillaume Kulakowski - 1.6.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Mail/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 30 Apr 2009 04:53:47 -0000 1.1 +++ .cvsignore 1 May 2009 14:45:19 -0000 1.2 @@ -0,0 +1 @@ +Mail-1.6.1.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Mail/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 30 Apr 2009 04:53:47 -0000 1.1 +++ sources 1 May 2009 14:45:20 -0000 1.2 @@ -0,0 +1 @@ +81cb0b0f2e21508e54891ab1358379d4 Mail-1.6.1.tgz From llaumgui at fedoraproject.org Fri May 1 14:45:54 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Fri, 1 May 2009 14:45:54 +0000 (UTC) Subject: rpms/php-ezc-Mail/F-11 import.log, NONE, 1.1 php-ezc-Mail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501144554.4D2307012F@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Mail/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12156/F-11 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Mail.spec Log Message: Initial import branch F-11 --- NEW FILE import.log --- php-ezc-Mail-1_6_1-3_fc10:F-11:php-ezc-Mail-1.6.1-3.fc10.src.rpm:1241189053 --- NEW FILE php-ezc-Mail.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Mail %define channel components.ez.no Name: php-ezc-Mail Version: 1.6.1 Release: 3%{?dist} Summary: Construct and/or parse Mail messages conforming to the mail standard Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-mcrypt Requires: php-pecl-Fileinfo Requires: php-pear(%{channel}/Base) >= 1.6.1 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description The component allows you construct and/or parse Mail messages conforming to the mail standard. It has support for attachments, multipart messages and HTML mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to retrieve e-mail. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # rpmlint (W): wrong-file-end-of-line-encoding sed -i -e 's|\r||g' ./docdir/tutorial/test-mail.mail # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/mail_autoload.php %changelog * Thu Apr 27 2009 Guillaume Kulakowski - 1.6.1-3 - Requires php-pecl-Fileinfo * Thu Apr 23 2009 Guillaume Kulakowski - 1.6.1-2 - rpmlint is now silent * Thu Mar 19 2009 Guillaume Kulakowski - 1.6.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 30 Apr 2009 04:53:47 -0000 1.1 +++ .cvsignore 1 May 2009 14:45:23 -0000 1.2 @@ -0,0 +1 @@ +Mail-1.6.1.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 30 Apr 2009 04:53:47 -0000 1.1 +++ sources 1 May 2009 14:45:23 -0000 1.2 @@ -0,0 +1 @@ +81cb0b0f2e21508e54891ab1358379d4 Mail-1.6.1.tgz From kaitlin at fedoraproject.org Fri May 1 14:53:24 2009 From: kaitlin at fedoraproject.org (Kaitlin Rupert) Date: Fri, 1 May 2009 14:53:24 +0000 (UTC) Subject: rpms/libvirt-cim/F-11 .cvsignore, 1.12, 1.13 libvirt-cim.spec, 1.25, 1.26 sources, 1.14, 1.15 emu_1_sdc.patch, 1.1, NONE host_enum_sys.patch, 1.1, NONE Message-ID: <20090501145324.3B92A7012F@cvs1.fedora.phx.redhat.com> Author: kaitlin Update of /cvs/pkgs/rpms/libvirt-cim/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14197 Modified Files: .cvsignore libvirt-cim.spec sources Removed Files: emu_1_sdc.patch host_enum_sys.patch Log Message: Update spec file to use new sources for release 0.5.5. Also, remove old patches. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-11/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 17 Feb 2009 23:05:58 -0000 1.12 +++ .cvsignore 1 May 2009 14:52:53 -0000 1.13 @@ -1,2 +1,3 @@ libvirt-cim-0.5.3.tar.gz libvirt-cim-0.5.4.tar.gz +libvirt-cim-0.5.5.tar.gz Index: libvirt-cim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-11/libvirt-cim.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- libvirt-cim.spec 25 Feb 2009 19:47:26 -0000 1.25 +++ libvirt-cim.spec 1 May 2009 14:52:53 -0000 1.26 @@ -2,8 +2,8 @@ Summary: A CIM provider for libvirt Name: libvirt-cim -Version: 0.5.4 -Release: 2%{?dist} +Version: 0.5.5 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries Source: libvirt-cim-%{version}.tar.gz @@ -58,13 +58,7 @@ rm -fr $RPM_BUILD_ROOT %define SCHEMA %{_datadir}/%{name}/*.mof %define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration -%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile}.mof - -%define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,ElementConformsToProfile,HostedAccessPoint}.registration -%define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof - -%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration -%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile}.mof +%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile,AllocationCapabilities}.mof %define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,ElementConformsToProfile,HostedAccessPoint}.registration %define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof @@ -100,6 +94,12 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/%{name}/provider-register.sh -d -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 +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n root/cimv2\ + -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true %postun -p /sbin/ldconfig @@ -108,10 +108,9 @@ rm -fr $RPM_BUILD_ROOT /etc/libvirt/cim %doc README COPYING doc/CodingStyle doc/SubmittingPatches -#%doc base_schema/README.DMTF +%doc base_schema/README.DMTF %doc doc/*.html %{_libdir}/lib*.so* -# CIM providers are .so modules, thus they belong in the main package %{_libdir}/cmpi/lib*.so* %{_datadir}/libvirt-cim/*.sh %{_datadir}/libvirt-cim/*.mof @@ -123,6 +122,9 @@ rm -fr $RPM_BUILD_ROOT /etc/ld.so.conf.d/libvirt-cim.conf %changelog +* Tue Apr 21 2009 Kaitlin Rupert - 0.5.5-1 +- Updated to latest upstream source + * Wed Feb 25 2009 Fedora Release Engineering - 0.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-11/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 17 Feb 2009 23:05:58 -0000 1.14 +++ sources 1 May 2009 14:52:53 -0000 1.15 @@ -1,2 +1,3 @@ 69ad4eb18622482e6cd99c4c20ed01b0 libvirt-cim-0.5.3.tar.gz 26cec2226701a063325fac8f6e8cb75b libvirt-cim-0.5.4.tar.gz +dec0c3647ea3aa713022b31576e0b202 libvirt-cim-0.5.5.tar.gz --- emu_1_sdc.patch DELETED --- --- host_enum_sys.patch DELETED --- From kaitlin at fedoraproject.org Fri May 1 15:02:35 2009 From: kaitlin at fedoraproject.org (Kaitlin Rupert) Date: Fri, 1 May 2009 15:02:35 +0000 (UTC) Subject: rpms/libvirt-cim/F-11 libvirt-cim.spec,1.26,1.27 Message-ID: <20090501150235.159627012F@cvs1.fedora.phx.redhat.com> Author: kaitlin Update of /cvs/pkgs/rpms/libvirt-cim/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15624 Modified Files: libvirt-cim.spec Log Message: Append .1 to release - sources built properly in devel tree, but stale tag for F11 exists in this tree. Index: libvirt-cim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-11/libvirt-cim.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- libvirt-cim.spec 1 May 2009 14:52:53 -0000 1.26 +++ libvirt-cim.spec 1 May 2009 15:02:04 -0000 1.27 @@ -3,7 +3,7 @@ Summary: A CIM provider for libvirt Name: libvirt-cim Version: 0.5.5 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2+ Group: Development/Libraries Source: libvirt-cim-%{version}.tar.gz From mcpierce at fedoraproject.org Fri May 1 15:02:28 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Fri, 1 May 2009 15:02:28 +0000 (UTC) Subject: rpms/rubygem-rufus-scheduler/devel .cvsignore, 1.2, 1.3 rubygem-rufus-scheduler.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090501150228.C4BDB7012F@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15726 Modified Files: .cvsignore rubygem-rufus-scheduler.spec sources Log Message: Release 1.0.14 of Rufus Scheduler. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Apr 2009 13:23:45 -0000 1.2 +++ .cvsignore 1 May 2009 15:01:58 -0000 1.3 @@ -1 +1 @@ -rufus-scheduler-1.0.13.gem +rufus-scheduler-1.0.14.gem Index: rubygem-rufus-scheduler.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel/rubygem-rufus-scheduler.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-rufus-scheduler.spec 30 Apr 2009 12:50:00 -0000 1.1 +++ rubygem-rufus-scheduler.spec 1 May 2009 15:01:58 -0000 1.2 @@ -5,8 +5,8 @@ Summary: Scheduler for Ruby (at, cron and every jobs) Name: rubygem-%{gemname} -Version: 1.0.13 -Release: 3%{?dist} +Version: 1.0.14 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://openwferu.rubyforge.org/scheduler.html @@ -49,6 +49,9 @@ rm -rf %{buildroot} %changelog +* Fri May 1 2009 Darryl Pierce - 1.0.14-1 +- Release 1.0.14 of rufus-scheduler. + * Thu Apr 30 2009 Darryl Pierce - 1.0.13-3 - First official build for Fedora. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Apr 2009 13:23:45 -0000 1.2 +++ sources 1 May 2009 15:01:58 -0000 1.3 @@ -1 +1 @@ -274ed6e966f706c28f851ad712c9d2d2 rufus-scheduler-1.0.13.gem +a89720f49ddb414ab5f5b9f6c926ce5c rufus-scheduler-1.0.14.gem From mcpierce at fedoraproject.org Fri May 1 15:11:29 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Fri, 1 May 2009 15:11:29 +0000 (UTC) Subject: rpms/rubygem-rufus-scheduler/F-10 .cvsignore, 1.2, 1.3 rubygem-rufus-scheduler.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090501151129.E26BF7012F@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17295 Modified Files: .cvsignore rubygem-rufus-scheduler.spec sources Log Message: Release 1.0.14 of Rufus Scheduler. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Apr 2009 13:08:29 -0000 1.2 +++ .cvsignore 1 May 2009 15:10:58 -0000 1.3 @@ -1 +1 @@ -rufus-scheduler-1.0.13.gem +rufus-scheduler-1.0.14.gem Index: rubygem-rufus-scheduler.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-10/rubygem-rufus-scheduler.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-rufus-scheduler.spec 30 Apr 2009 13:08:29 -0000 1.1 +++ rubygem-rufus-scheduler.spec 1 May 2009 15:10:58 -0000 1.2 @@ -5,8 +5,8 @@ Summary: Scheduler for Ruby (at, cron and every jobs) Name: rubygem-%{gemname} -Version: 1.0.13 -Release: 3%{?dist} +Version: 1.0.14 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://openwferu.rubyforge.org/scheduler.html @@ -49,6 +49,9 @@ rm -rf %{buildroot} %changelog +* Fri May 1 2009 Darryl Pierce - 1.0.14-1 +- Release 1.0.14 of Rufus Scheduler. + * Thu Apr 30 2009 Darryl Pierce - 1.0.13-3 - First official build for Fedora. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Apr 2009 13:08:29 -0000 1.2 +++ sources 1 May 2009 15:10:58 -0000 1.3 @@ -1 +1 @@ -274ed6e966f706c28f851ad712c9d2d2 rufus-scheduler-1.0.13.gem +a89720f49ddb414ab5f5b9f6c926ce5c rufus-scheduler-1.0.14.gem From mcpierce at fedoraproject.org Fri May 1 15:28:29 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Fri, 1 May 2009 15:28:29 +0000 (UTC) Subject: rpms/rubygem-rufus-scheduler/F-11 .cvsignore, 1.2, 1.3 rubygem-rufus-scheduler.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090501152829.9D6CC7012F@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20588 Modified Files: .cvsignore rubygem-rufus-scheduler.spec sources Log Message: Release 1.0.14 of Rufus Scheduler. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Apr 2009 13:32:04 -0000 1.2 +++ .cvsignore 1 May 2009 15:27:59 -0000 1.3 @@ -1 +1 @@ -rufus-scheduler-1.0.13.gem +rufus-scheduler-1.0.14.gem Index: rubygem-rufus-scheduler.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-11/rubygem-rufus-scheduler.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-rufus-scheduler.spec 30 Apr 2009 13:32:04 -0000 1.1 +++ rubygem-rufus-scheduler.spec 1 May 2009 15:27:59 -0000 1.2 @@ -5,8 +5,8 @@ Summary: Scheduler for Ruby (at, cron and every jobs) Name: rubygem-%{gemname} -Version: 1.0.13 -Release: 3%{?dist} +Version: 1.0.14 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://openwferu.rubyforge.org/scheduler.html @@ -49,6 +49,9 @@ rm -rf %{buildroot} %changelog +* Fri May 1 2009 Darryl Pierce - 1.0.14-1 +- Release 1.0.14 of Rufus Scheduler. + * Thu Apr 30 2009 Darryl Pierce - 1.0.13-3 - First official build for Fedora. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Apr 2009 13:32:04 -0000 1.2 +++ sources 1 May 2009 15:27:59 -0000 1.3 @@ -1 +1 @@ -274ed6e966f706c28f851ad712c9d2d2 rufus-scheduler-1.0.13.gem +a89720f49ddb414ab5f5b9f6c926ce5c rufus-scheduler-1.0.14.gem From rdieter at fedoraproject.org Fri May 1 15:36:32 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 1 May 2009 15:36:32 +0000 (UTC) Subject: rpms/raptor/devel raptor.spec,1.15,1.16 Message-ID: <20090501153632.3C8BB7012F@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/raptor/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21780 Modified Files: raptor.spec Log Message: * Fri May 01 2009 Rex Dieter 1.4.18-3 - nuke rpaths - touchup %files - -devel: omit dup'd %doc's included in main pkg Index: raptor.spec =================================================================== RCS file: /cvs/pkgs/rpms/raptor/devel/raptor.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- raptor.spec 25 Feb 2009 18:47:21 -0000 1.15 +++ raptor.spec 1 May 2009 15:36:01 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Raptor RDF Parser Toolkit for Redland Name: raptor Version: 1.4.18 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ or ASL 2.0 Group: System Environment/Libraries Source: http://download.librdf.org/source/raptor-%{version}.tar.gz @@ -28,6 +28,11 @@ RDF/XML or N-Triples. %prep %setup -q +# hack to nuke rpaths +%if "%{_libdir}" != "/usr/lib" +sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure +%endif + %build %configure --disable-static make %{?_smp_mflags} @@ -36,7 +41,7 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.{a,la} +rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la %clean rm -rf $RPM_BUILD_ROOT @@ -49,23 +54,29 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc %{_mandir}/man1/rapper.1* -%{_libdir}/lib*.so.* +%{_libdir}/libraptor.so.1* %{_bindir}/rapper %files devel %defattr(-, root, root) -%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README -%doc INSTALL.html -%doc %{_mandir}/man1/raptor-config.1* -%doc %{_mandir}/man3/libraptor.3* -%doc %{_datadir}/gtk-doc/html/raptor -%{_libdir}/lib*.so +# include instuctions on how to build from source? omit for now, flog +# me with a wet noodle if I'm wrong -- Rex +#doc INSTALL.html +%{_mandir}/man1/raptor-config.1* +%{_mandir}/man3/libraptor.3* +%doc %{_datadir}/gtk-doc/html/raptor/ +%{_libdir}/libraptor.so %{_libdir}/pkgconfig/raptor.pc -%{_prefix}/include/* +%{_includedir}/raptor.h %{_bindir}/raptor-config %changelog +* Fri May 01 2009 Rex Dieter 1.4.18-3 +- nuke rpaths +- touchup %%files +- -devel: omit dup'd %%doc's included in main pkg + * Wed Feb 25 2009 Fedora Release Engineering - 1.4.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Fri May 1 15:46:36 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 1 May 2009 15:46:36 +0000 (UTC) Subject: rpms/rasqal/devel rasqal.spec,1.8,1.9 Message-ID: <20090501154636.CCDDF7012F@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/rasqal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23246 Modified Files: rasqal.spec Log Message: (mostly cosmetic changes only, not built) * Fri May 01 2009 Rex Dieter - 0.9.15-5 - slightly less ugly rpath hacks - cleanup %files Index: rasqal.spec =================================================================== RCS file: /cvs/pkgs/rpms/rasqal/devel/rasqal.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- rasqal.spec 25 Feb 2009 18:50:20 -0000 1.8 +++ rasqal.spec 1 May 2009 15:46:06 -0000 1.9 @@ -1,6 +1,6 @@ Name: rasqal Version: 0.9.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RDF Query Library Group: System Environment/Libraries @@ -17,9 +17,6 @@ BuildRequires: libxml2-devel # for the testsuite #BuildRequires: perl(XML::DOM) -# to avoid /usr/lib64 rpath on x86_64 -BuildRequires: libtool - %description Rasqal is a library providing full support for querying Resource Description Framework (RDF) including parsing query syntaxes, constructing @@ -41,13 +38,17 @@ Libraries, includes etc to develop with %prep %setup -q +# hack to nuke rpaths +%if "%{_libdir}" != "/usr/lib" +sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure +%endif + + %build -# disable-static does not work if we override to use the system's libtool %configure --enable-release --with-raptor=system --disable-static -# avoid getting /usr/lib64 rpath on x86_64 build -make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} +make %{?_smp_mflags} %check #make check @@ -61,8 +62,6 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; -# remove .a files that we now get because of overriding libtool -find $RPM_BUILD_ROOT -name \*.a -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -73,26 +72,29 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) - %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE.txt NEWS README %doc LICENSE-2.0.txt NOTICE %doc *.html %{_bindir}/roqet -%{_libdir}/librasqal*.so.* +%{_libdir}/librasqal.so.0* %{_mandir}/man1/roqet.1* %{_mandir}/man3/librasqal.3* %files devel %defattr(-,root,root,-) %doc docs/README.html -%{_libdir}/librasqal*.so -%{_includedir}/* +%{_libdir}/librasqal.so +%{_includedir}/rasqal* %{_bindir}/rasqal-config %{_mandir}/man1/rasqal-config.1* %{_libdir}/pkgconfig/rasqal.pc -%{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/rasqal/ %changelog +* Fri May 01 2009 Rex Dieter - 0.9.15-5 +- slightly less ugly rpath hacks +- cleanup %%files + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Fri May 1 15:55:45 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 1 May 2009 15:55:45 +0000 (UTC) Subject: rpms/redland/devel redland.spec,1.15,1.16 Message-ID: <20090501155545.D4F467012F@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/redland/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25301 Modified Files: redland.spec Log Message: (mostly cosmetic changes only, not built) * Fri May 01 2009 Rex Dieter - 1.0.7-7 - slighgly less ugly rpath hack - cleanup %files Index: redland.spec =================================================================== RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- redland.spec 25 Feb 2009 19:31:58 -0000 1.15 +++ redland.spec 1 May 2009 15:55:14 -0000 1.16 @@ -1,6 +1,6 @@ Name: redland Version: 1.0.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: RDF Application Framework Group: System Environment/Libraries @@ -19,9 +19,6 @@ BuildRequires: sqlite-devel BuildRequires: postgresql-devel BuildRequires: gtk-doc -# to avoid /usr/lib64 rpath on x86_64 -BuildRequires: libtool - %description Redland is a library that provides a high-level interface for RDF (Resource Description Framework) implemented in an object-based API. @@ -44,6 +41,12 @@ Header files for development with Redlan %prep %setup -q +# hack to nuke rpaths +%if "%{_libdir}" != "/usr/lib" +sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure +%endif + + %build # disable-static does not work if we override to use the system's libtool %configure \ @@ -51,8 +54,7 @@ Header files for development with Redlan --with-raptor=system --with-rasqal=system --with-threestore=no \ --disable-static -# avoid getting /usr/lib64 rpath on x86_64 build -make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} +make %{?_smp_mflags} %check make check @@ -63,8 +65,6 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; -# remove .a files that we now get because of overriding libtool -find $RPM_BUILD_ROOT -name \*.a -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE.txt NEWS README %doc LICENSE-2.0.txt NOTICE %doc *.html -%{_libdir}/librdf*.so.* +%{_libdir}/librdf.so.0* %{_bindir}/rdfproc %{_bindir}/redland-db-upgrade %dir %{_datadir}/redland @@ -87,20 +87,24 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %{_bindir}/redland-config -%{_libdir}/librdf*.so +%{_libdir}/librdf.so %{_includedir}/redland.h %{_includedir}/librdf.h %{_includedir}/rdf_*.h %{_mandir}/man1/redland-config.1* %{_libdir}/pkgconfig/redland.pc %{_datadir}/redland/Redland.i -%{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/redland/ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog +* Fri May 01 2009 Rex Dieter - 1.0.7-7 +- slighgly less ugly rpath hack +- cleanup %%files + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Fri May 1 16:24:10 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Fri, 1 May 2009 16:24:10 +0000 (UTC) Subject: rpms/gnome-media/F-11 gvc-set-default-output-instant.patch, NONE, 1.1 gnome-media.spec, 1.170, 1.171 Message-ID: <20090501162411.03C077012F@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-media/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29241 Modified Files: gnome-media.spec Added Files: gvc-set-default-output-instant.patch Log Message: * Fri May 01 2009 Bastien Nocera 2.26.0-5 - Move streams straight away when changing the default sink (#489049) gvc-set-default-output-instant.patch: --- NEW FILE gvc-set-default-output-instant.patch --- diff --git a/gnome-volume-control/src/gvc-mixer-control.c b/gnome-volume-control/src/gvc-mixer-control.c index 4ac2c6c..0ff4b9c 100644 --- a/gnome-volume-control/src/gvc-mixer-control.c +++ b/gnome-volume-control/src/gvc-mixer-control.c @@ -65,6 +65,8 @@ struct GvcMixerControlPrivate GHashTable *sink_inputs; /* routable output streams */ GHashTable *source_outputs; /* routable input streams */ GHashTable *clients; + + const char *new_default_output; /* new default stream, used in gvc_mixer_control_set_default_sink () */ }; enum { @@ -104,6 +106,46 @@ gvc_mixer_control_get_event_sink_input (GvcMixerControl *control) return stream; } +static void +gvc_mixer_control_stream_restore_cb (pa_context *c, + const pa_ext_stream_restore_info *info, + int eol, + void *userdata) +{ + pa_operation *o; + GvcMixerControl *control = (GvcMixerControl *) userdata; + pa_ext_stream_restore_info new_info; + + if (eol) { + control->priv->new_default_output = NULL; + return; + } + + if (control->priv->new_default_output == NULL) + return; + + new_info.name = info->name; + new_info.channel_map = info->channel_map; + new_info.volume = info->volume; + new_info.mute = info->mute; + + new_info.device = control->priv->new_default_output; + + o = pa_ext_stream_restore_write (control->priv->pa_context, + PA_UPDATE_REPLACE, + &new_info, 1, + TRUE, NULL, NULL); + + if (o == NULL) { + g_warning ("pa_ext_stream_restore_write() failed"); + return; + } + + g_debug ("Changed default device for %s to %s", info->name, info->device); + + pa_operation_unref (o); +} + gboolean gvc_mixer_control_set_default_sink (GvcMixerControl *control, GvcMixerStream *stream) @@ -124,6 +166,19 @@ gvc_mixer_control_set_default_sink (GvcMixerControl *control, pa_operation_unref (o); + control->priv->new_default_output = gvc_mixer_stream_get_name (stream); + o = pa_ext_stream_restore_read (control->priv->pa_context, + gvc_mixer_control_stream_restore_cb, + control); + + if (o == NULL) { + control->priv->new_default_output = NULL; + g_warning ("pa_ext_stream_restore_read() failed"); + return FALSE; + } + + pa_operation_unref (o); + return TRUE; } Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v retrieving revision 1.170 retrieving revision 1.171 diff -u -p -r1.170 -r1.171 --- gnome-media.spec 27 Apr 2009 18:32:39 -0000 1.170 +++ gnome-media.spec 1 May 2009 16:23:40 -0000 1.171 @@ -14,7 +14,7 @@ Summary: GNOME media programs Name: gnome-media Version: 2.26.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and GFDL Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2 @@ -24,6 +24,9 @@ Patch3: gnome-media-add-100-mark.patch Patch4: fix-alignment-of-sliders.patch # https://bugzilla.redhat.com/show_bug.cgi?id=493138 Patch5: 0001-Don-t-show-debug-output-when-disabling-debugging.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=581024 +# https://bugzilla.redhat.com/show_bug.cgi?id=489049 +Patch6: gvc-set-default-output-instant.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome @@ -85,6 +88,7 @@ pushd gnome-volume-control/src popd %patch4 -p1 -b .fix-alignment-of-sliders %patch5 -p1 -b .debug +%patch6 -p1 -b .move-streams %build # try to work around a problem where gst-inspect does @@ -258,6 +262,9 @@ scrollkeeper-update -q || : %{_libdir}/pkgconfig/* %changelog +* Fri May 01 2009 Bastien Nocera 2.26.0-5 +- Move streams straight away when changing the default sink (#489049) + * Mon Apr 27 2009 Matthias Clasen - 2.26.0-4 - Fix alignment of sliders on the application tab as well From terjeros at fedoraproject.org Fri May 1 16:39:18 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Fri, 1 May 2009 16:39:18 +0000 (UTC) Subject: rpms/simdock/devel simdock-1.2-build-envvars.patch, NONE, 1.1 simdock.spec, 1.3, 1.4 Message-ID: <20090501163918.75D117012F@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/simdock/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31310 Modified Files: simdock.spec Added Files: simdock-1.2-build-envvars.patch Log Message: * Thu Apr 30 2009 Ville Skytt? - 1.2-5 - Patch to honor $RPM_OPT_FLAGS during build. - Disable autotools dependency tracking during build for cleaner build logs and possible slight build speedup. simdock-1.2-build-envvars.patch: --- NEW FILE simdock-1.2-build-envvars.patch --- diff -up trunk/configure~ trunk/configure --- trunk/configure~ 2007-07-07 23:32:31.000000000 +0300 +++ trunk/configure 2009-04-30 19:37:00.000000000 +0300 @@ -6315,9 +6315,9 @@ WX_CPPFLAGS="`$WXCONFIG --cppflags`" WX_CXXFLAGS="`$WXCONFIG --cxxflags | sed -e 's/-fno-exceptions//'`" WX_LIBS="`$WXCONFIG --libs`" -CPPFLAGS="$DEPS_CPPFLAGS $DEPS_CFLAGS $WX_CPPFLAGS " -CXXFLAGS="$DEPS_CXXFLAGS $DEPS_CFLAGS $WX_CPPFLAGS" -LIBS="$DEPS_LIBS $WX_LIBS" +CPPFLAGS="$CPPFLAGS $DEPS_CPPFLAGS $DEPS_CFLAGS $WX_CPPFLAGS " +CXXFLAGS="$CXXFLAGS $DEPS_CXXFLAGS $DEPS_CFLAGS $WX_CPPFLAGS" +LIBS="$LIBS $DEPS_LIBS $WX_LIBS" Index: simdock.spec =================================================================== RCS file: /cvs/extras/rpms/simdock/devel/simdock.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- simdock.spec 26 Feb 2009 01:08:51 -0000 1.3 +++ simdock.spec 1 May 2009 16:38:48 -0000 1.4 @@ -1,7 +1,7 @@ Name: simdock Summary: Fast and customizable dockbar Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: User Interface/Desktops URL: http://simdock.sourceforge.net/ @@ -11,6 +11,7 @@ Patch0: simdock-1.2.desktop.patch Patch1: simdock-1.2-pixmap.patch Patch2: simdock-1.2-readme.patch Patch3: simdock-1.2-tasks.patch +Patch4: simdock-1.2-build-envvars.patch Buildrequires: desktop-file-utils BuildRequires: GConf2-devel BuildRequires: libwnck-devel @@ -30,10 +31,11 @@ environments. Does not require Compiz no %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %{__install} -m 0644 %{SOURCE1} . %build -%configure +%configure --disable-dependency-tracking %{__make} %{?_smp_mflags} %install @@ -54,6 +56,11 @@ desktop-file-install --dir %{buildroot}% %{_datadir}/applications/%{name}.desktop %changelog +* Thu Apr 30 2009 Ville Skytt? - 1.2-5 +- Patch to honor $RPM_OPT_FLAGS during build. +- Disable autotools dependency tracking during build for cleaner build logs + and possible slight build speedup. + * Wed Feb 25 2009 Fedora Release Engineering - 1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Fri May 1 17:19:25 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Fri, 1 May 2009 17:19:25 +0000 (UTC) Subject: rpms/gnome-bluetooth/F-11 gnome-bluetooth.spec,1.76,1.77 Message-ID: <20090501171925.E91D17012F@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4395 Modified Files: gnome-bluetooth.spec Log Message: * Sat Apr 18 2009 Matthias Clasen - 2.27.4-3 - Add padding to the wizard Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gnome-bluetooth.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -p -r1.76 -r1.77 --- gnome-bluetooth.spec 18 Apr 2009 05:43:56 -0000 1.76 +++ gnome-bluetooth.spec 1 May 2009 17:18:55 -0000 1.77 @@ -117,6 +117,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/bluetooth-manager.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 @@ -152,6 +153,7 @@ fi %postun scrollkeeper-update -q update-desktop-database -q +touch %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi From hadess at fedoraproject.org Fri May 1 17:22:23 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Fri, 1 May 2009 17:22:23 +0000 (UTC) Subject: rpms/gnome-bluetooth/F-11 gnome-bluetooth.spec,1.77,1.78 Message-ID: <20090501172223.9FE1B7012F@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4824 Modified Files: gnome-bluetooth.spec Log Message: * Fri May 01 2009 Bastien Nocera 2.27.4-4 - Touch the icon theme directory, should fix the icon not appearing properly on new installs Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gnome-bluetooth.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 --- gnome-bluetooth.spec 1 May 2009 17:18:55 -0000 1.77 +++ gnome-bluetooth.spec 1 May 2009 17:21:53 -0000 1.78 @@ -1,6 +1,6 @@ Name: gnome-bluetooth Version: 2.27.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bluetooth graphical utilities Group: Applications/Communications @@ -187,6 +187,10 @@ fi %{_datadir}/gtk-doc/html/gnome-bluetooth/ %changelog +* Fri May 01 2009 Bastien Nocera 2.27.4-4 +- Touch the icon theme directory, should fix the icon not appearing + properly on new installs + * Sat Apr 18 2009 Matthias Clasen - 2.27.4-3 - Add padding to the wizard From transif at fedoraproject.org Fri May 1 17:28:30 2009 From: transif at fedoraproject.org (Transifex System User) Date: Fri, 1 May 2009 17:28:30 +0000 (UTC) Subject: comps/po ca.po,1.19,1.20 Message-ID: <20090501172830.B09937012F@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6409/po Modified Files: ca.po Log Message: Sending translation for Catalan Index: ca.po =================================================================== RCS file: /cvs/pkgs/comps/po/ca.po,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- ca.po 29 Apr 2009 20:00:17 -0000 1.19 +++ ca.po 1 May 2009 17:28:00 -0000 1.20 @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: comps-po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-03-14 23:25+0100\n" +"POT-Creation-Date: 2009-05-01 14:12+0000\n" +"PO-Revision-Date: 2009-05-01 23:25+0100\n" "Last-Translator: Oscar Osta Pueyo \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -1328,19 +1328,16 @@ msgid "Amazigh Support" msgstr "Suport per al berber" #: ../comps-f11.xml.in.h:13 -#, fuzzy msgid "Azerbaijani Support" -msgstr "Suport per al serbi" +msgstr "Suport per a l'??zeri" #: ../comps-f11.xml.in.h:27 -#, fuzzy msgid "Chichewa Support" -msgstr "Suport per al xin??s" +msgstr "" #: ../comps-f11.xml.in.h:31 -#, fuzzy msgid "Coptic Support" -msgstr "Suport per al croat" +msgstr "" #: ../comps-f11.xml.in.h:37 msgid "Design and Simulation tools for hardware engineers" @@ -1351,9 +1348,8 @@ msgid "Electronic Lab" msgstr "Laboratori electr??nic" #: ../comps-f11.xml.in.h:58 -#, fuzzy msgid "Fijian Support" -msgstr "Suport per al fris??" +msgstr "Suport per al fiji??" #: ../comps-f11.xml.in.h:61 msgid "Font design and packaging" @@ -1368,19 +1364,16 @@ msgid "Friulian Support" msgstr "Suport per al furl??" #: ../comps-f11.xml.in.h:83 -#, fuzzy msgid "Hiligaynon Support" -msgstr "Suport per al filip??" +msgstr "" #: ../comps-f11.xml.in.h:96 -#, fuzzy msgid "Interlingua Support" -msgstr "Suport per a l'itali??" +msgstr "Suport per a l'interlingua" #: ../comps-f11.xml.in.h:109 -#, fuzzy msgid "Kazakh Support" -msgstr "Suport per al kannada" +msgstr "Suport per al kazakh" #: ../comps-f11.xml.in.h:111 msgid "Kinyarwanda Support" @@ -1388,28 +1381,24 @@ msgstr "Suport per al kinyarwanda" # TODO #: ../comps-f11.xml.in.h:118 -#, fuzzy msgid "Latin Support" -msgstr "Suport per al let??" +msgstr "Suport per al llat??" #: ../comps-f11.xml.in.h:126 -#, fuzzy msgid "Luxembourgish Support" -msgstr "Suport per al turc" +msgstr "" #: ../comps-f11.xml.in.h:130 msgid "Malagasy Support" msgstr "Suport per al malgaix" #: ../comps-f11.xml.in.h:133 -#, fuzzy msgid "Maltese Support" -msgstr "Suport per al malai" +msgstr "Suport per al malt??s" #: ../comps-f11.xml.in.h:134 -#, fuzzy msgid "Manx Support" -msgstr "Suport per al malai" +msgstr "" #: ../comps-f11.xml.in.h:137 msgid "MinGW cross-compiler" @@ -1428,14 +1417,12 @@ msgid "Online Help and Documentation" msgstr "Documentaci?? i ajuda en l??nia" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "Suport per a l'espanyol" +msgstr "Suport per al s??nscrit" #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "Suport per a l'ucra??n??s" +msgstr "Suport per al sard" #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" @@ -1457,14 +1444,12 @@ msgstr "" "Permet desenvolupar programes en el llenguatge de programaci?? Objective CAML." #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "Suport per al swati" +msgstr "Suport per al swahili" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "Suport per al telugu" +msgstr "" #: ../comps-f11.xml.in.h:223 msgid "" From notting at fedoraproject.org Fri May 1 17:31:10 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Fri, 1 May 2009 17:31:10 +0000 (UTC) Subject: rpms/brasero/devel brasero.spec,1.45,1.46 Message-ID: <20090501173110.EC1257012F@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/brasero/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6879/devel Modified Files: brasero.spec Log Message: Require main package in brasero-nautilus; it doesn't work without it. (#498632) Index: brasero.spec =================================================================== RCS file: /cvs/extras/rpms/brasero/devel/brasero.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- brasero.spec 17 Apr 2009 16:50:54 -0000 1.45 +++ brasero.spec 1 May 2009 17:30:39 -0000 1.46 @@ -1,7 +1,7 @@ Name: brasero Version: 2.26.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia License: GPLv2+ @@ -67,6 +67,7 @@ Group: User Interface/Desktops Provides: nautilus-cd-burner = %{version}-%{release} Obsoletes: nautilus-cd-burner < 2.25.4 +Requires: brasero = %{version}-%{release} %description nautilus The %{name}-nautilus package contains the brasero nautilus extension. @@ -203,6 +204,9 @@ fi %changelog +* Fri May 1 2009 Bill Nottingham - 2.26.1-3 +- require main package in brasero-nautilus (#498632) + * Fri Apr 17 2009 Denis Leroy - 2.26.1-2 - Obsoletes nautilus-cd-burner From notting at fedoraproject.org Fri May 1 17:31:10 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Fri, 1 May 2009 17:31:10 +0000 (UTC) Subject: rpms/brasero/F-11 brasero.spec,1.45,1.46 Message-ID: <20090501173111.11AA570131@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/brasero/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6879/F-11 Modified Files: brasero.spec Log Message: Require main package in brasero-nautilus; it doesn't work without it. (#498632) Index: brasero.spec =================================================================== RCS file: /cvs/extras/rpms/brasero/F-11/brasero.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- brasero.spec 17 Apr 2009 16:52:30 -0000 1.45 +++ brasero.spec 1 May 2009 17:30:39 -0000 1.46 @@ -1,7 +1,7 @@ Name: brasero Version: 2.26.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia License: GPLv2+ @@ -67,6 +67,7 @@ Group: User Interface/Desktops Provides: nautilus-cd-burner = %{version}-%{release} Obsoletes: nautilus-cd-burner < 2.25.4 +Requires: brasero = %{version}-%{release} %description nautilus The %{name}-nautilus package contains the brasero nautilus extension. @@ -203,6 +204,9 @@ fi %changelog +* Fri May 1 2009 Bill Nottingham - 2.26.1-3 +- require main package in brasero-nautilus (#498632) + * Fri Apr 17 2009 Denis Leroy - 2.26.1-2 - Obsoletes nautilus-cd-burner From hadess at fedoraproject.org Fri May 1 17:32:01 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Fri, 1 May 2009 17:32:01 +0000 (UTC) Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.75,1.76 Message-ID: <20090501173201.DF2527012F@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7186 Modified Files: gnome-bluetooth.spec Log Message: * Fri May 01 2009 Bastien Nocera 2.27.4-3 - Touch the icon theme directory, should fix the icon not appearing properly on new installs Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -p -r1.75 -r1.76 --- gnome-bluetooth.spec 16 Apr 2009 18:08:43 -0000 1.75 +++ gnome-bluetooth.spec 1 May 2009 17:31:31 -0000 1.76 @@ -1,6 +1,6 @@ Name: gnome-bluetooth Version: 2.27.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bluetooth graphical utilities Group: Applications/Communications @@ -114,6 +114,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/bluetooth-manager.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 @@ -149,6 +150,7 @@ fi %postun scrollkeeper-update -q update-desktop-database -q +touch %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi @@ -182,6 +184,10 @@ fi %{_datadir}/gtk-doc/html/gnome-bluetooth/ %changelog +* Fri May 01 2009 Bastien Nocera 2.27.4-3 +- Touch the icon theme directory, should fix the icon not appearing + properly on new installs + * Thu Apr 16 2009 - Bastien Nocera - 2.27.4-2 - Require the PA Bluetooth plugins From pkgdb at fedoraproject.org Fri May 1 17:37:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:37:11 +0000 Subject: [pkgdb] mingw32-zlib: sailer has requested watchbugzilla Message-ID: <20090501173711.A130510F894@bastion2.fedora.phx.redhat.com> sailer has requested the watchbugzilla acl on mingw32-zlib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:37:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:37:11 +0000 Subject: [pkgdb] mingw32-zlib: sailer has requested approveacls Message-ID: <20090501173711.B63CF10F899@bastion2.fedora.phx.redhat.com> sailer has requested the approveacls acl on mingw32-zlib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:37:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:37:17 +0000 Subject: [pkgdb] mingw32-zlib: sailer has requested watchcommits Message-ID: <20090501173717.4BC8210F89F@bastion2.fedora.phx.redhat.com> sailer has requested the watchcommits acl on mingw32-zlib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:37:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:37:20 +0000 Subject: [pkgdb] mingw32-zlib: sailer has requested commit Message-ID: <20090501173720.BBFCF10F8A5@bastion2.fedora.phx.redhat.com> sailer has requested the commit acl on mingw32-zlib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:37:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:37:31 +0000 Subject: [pkgdb] mingw32-zlib: sailer has requested watchbugzilla Message-ID: <20090501173731.6965510F894@bastion2.fedora.phx.redhat.com> sailer has requested the watchbugzilla acl on mingw32-zlib (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:37:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:37:33 +0000 Subject: [pkgdb] mingw32-zlib: sailer has requested watchcommits Message-ID: <20090501173734.6820310F8AE@bastion2.fedora.phx.redhat.com> sailer has requested the watchcommits acl on mingw32-zlib (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:37:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:37:36 +0000 Subject: [pkgdb] mingw32-zlib: sailer has requested commit Message-ID: <20090501173736.4FED810F8B2@bastion2.fedora.phx.redhat.com> sailer has requested the commit acl on mingw32-zlib (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:37:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:37:38 +0000 Subject: [pkgdb] mingw32-zlib: sailer has requested approveacls Message-ID: <20090501173739.157A410F8B4@bastion2.fedora.phx.redhat.com> sailer has requested the approveacls acl on mingw32-zlib (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:40:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:40:29 +0000 Subject: [pkgdb] mingw32-zlib had acl change status Message-ID: <20090501174029.A822510F894@bastion2.fedora.phx.redhat.com> rjones has set the watchbugzilla acl on mingw32-zlib (Fedora devel) to Approved for sailer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:40:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:40:30 +0000 Subject: [pkgdb] mingw32-zlib had acl change status Message-ID: <20090501174030.2FFC010F899@bastion2.fedora.phx.redhat.com> rjones has set the watchcommits acl on mingw32-zlib (Fedora devel) to Approved for sailer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:40:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:40:30 +0000 Subject: [pkgdb] mingw32-zlib had acl change status Message-ID: <20090501174030.B816610F89E@bastion2.fedora.phx.redhat.com> rjones has set the commit acl on mingw32-zlib (Fedora devel) to Approved for sailer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:40:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:40:31 +0000 Subject: [pkgdb] mingw32-zlib had acl change status Message-ID: <20090501174031.297B910F8A3@bastion2.fedora.phx.redhat.com> rjones has set the approveacls acl on mingw32-zlib (Fedora devel) to Approved for sailer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:40:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:40:39 +0000 Subject: [pkgdb] mingw32-zlib had acl change status Message-ID: <20090501174039.3075310F8A7@bastion2.fedora.phx.redhat.com> rjones has set the watchbugzilla acl on mingw32-zlib (Fedora 11) to Approved for sailer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:40:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:40:39 +0000 Subject: [pkgdb] mingw32-zlib had acl change status Message-ID: <20090501174039.BF31D10F8AC@bastion2.fedora.phx.redhat.com> rjones has set the watchcommits acl on mingw32-zlib (Fedora 11) to Approved for sailer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:40:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:40:40 +0000 Subject: [pkgdb] mingw32-zlib had acl change status Message-ID: <20090501174040.A79F710F8B1@bastion2.fedora.phx.redhat.com> rjones has set the commit acl on mingw32-zlib (Fedora 11) to Approved for sailer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From pkgdb at fedoraproject.org Fri May 1 17:40:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 17:40:42 +0000 Subject: [pkgdb] mingw32-zlib had acl change status Message-ID: <20090501174042.5873D10F8B5@bastion2.fedora.phx.redhat.com> rjones has set the approveacls acl on mingw32-zlib (Fedora 11) to Approved for sailer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib From rstrode at fedoraproject.org Fri May 1 17:43:39 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Fri, 1 May 2009 17:43:39 +0000 (UTC) Subject: rpms/plymouth/F-11 plymouth.spec,1.126,1.127 Message-ID: <20090501174339.1D0AF7012F@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8785 Modified Files: plymouth.spec Log Message: - Make spinfinity provide plymouth(system-plugin) Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/F-11/plymouth.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- plymouth.spec 8 Apr 2009 23:07:54 -0000 1.126 +++ plymouth.spec 1 May 2009 17:43:08 -0000 1.127 @@ -5,7 +5,7 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.7.0 -Release: 0.2009.03.10.3%{?dist} +Release: 0.2009.03.10.4%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -130,6 +130,7 @@ Requires: %{name}-libs = %{version}-%{re Requires: plymouth-plugin-label BuildRequires: libpng-devel Requires(post): %{_sbindir}/plymouth-set-default-plugin +Provides: plymouth(system-plugin) = %{version}-%{release} %description plugin-spinfinity This package contains the "Spinfinity" boot splash plugin for @@ -143,7 +144,6 @@ Requires: %{name}-libs = %{version}-%{re Requires: plymouth-plugin-label Requires(post): %{_sbindir}/plymouth-set-default-plugin BuildRequires: libpng-devel -Provides: plymouth(system-plugin) = %{version}-%{release} %description plugin-solar This package contains the "Solar" boot splash plugin for @@ -322,6 +322,9 @@ fi %defattr(-, root, root) %changelog +* Fri May 01 2009 Ray Strode - 0.7.0-0.2009.03.10.4 +- Make spinfinity provide plymouth(system-plugin) + * Wed Apr 08 2009 Jesse Keating - 0.7.0-0.2009.03.10.3 - Drop the version on system-logos requires for now, causing hell with other -logos providers not having the same version. From ertzing at fedoraproject.org Fri May 1 17:45:06 2009 From: ertzing at fedoraproject.org (Ralf Ertzinger) Date: Fri, 1 May 2009 17:45:06 +0000 (UTC) Subject: rpms/audacious/devel audacious-1.5.1-playlist-length.patch, NONE, 1.1 audacious-1.5.1-playlist-play-clicked.patch, NONE, 1.1 audacious.spec, 1.44, 1.45 Message-ID: <20090501174506.9E4567012F@cvs1.fedora.phx.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9001 Modified Files: audacious.spec Added Files: audacious-1.5.1-playlist-length.patch audacious-1.5.1-playlist-play-clicked.patch Log Message: * Fri May 01 2009 Ralf Ertzinger 1.5.1-8 - Fix for "segfault with no playlist present" (BZ#475691) - Fix for broken playlist handling (BZ#475691), patch from http://launchpadlibrarian.net/19179891/audacious_1.5.1-3ubuntu1.1.debdiff audacious-1.5.1-playlist-length.patch: --- NEW FILE audacious-1.5.1-playlist-length.patch --- diff -uNr audacious-1.5.1-orig/src/audacious/playlist.c audacious-1.5.1/src/audacious/playlist.c --- audacious-1.5.1-orig/src/audacious/playlist.c 2008-05-24 00:00:34.000000000 +0200 +++ audacious-1.5.1/src/audacious/playlist.c 2009-05-01 19:29:17.663254934 +0200 @@ -1531,6 +1531,9 @@ gint playlist_get_length(Playlist *playlist) { + + g_return_val_if_fail(playlist != NULL, 0); + return g_list_length(playlist->entries); } audacious-1.5.1-playlist-play-clicked.patch: --- NEW FILE audacious-1.5.1-playlist-play-clicked.patch --- --- a/src/audacious/main.c Sun May 25 15:12:17 2008 +0200 +++ b/src/audacious/main.c Thu May 29 01:03:13 2008 +0300 @@ -315,7 +315,7 @@ parse_cmd_line_options(gint *argc, gchar } static void -handle_cmd_line_options() +handle_cmd_line_options(gboolean skip) { gchar **filenames = options.filenames; #ifdef USE_DBUS @@ -430,7 +430,7 @@ handle_cmd_line_options() } /* is_running */ else #endif - { /* !is_running */ + if (!skip) { /* !is_running */ if (filenames != NULL) { gint pos = 0; @@ -715,7 +715,7 @@ main(gint argc, gchar ** argv) signal_handlers_init(); - handle_cmd_line_options(); + handle_cmd_line_options(TRUE); if (options.headless == FALSE) { @@ -734,6 +734,8 @@ main(gint argc, gchar ** argv) plugin_system_init(); playlist_system_init(); + + handle_cmd_line_options(FALSE); #ifdef USE_DBUS init_dbus(); Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- audacious.spec 12 Apr 2009 16:11:52 -0000 1.44 +++ audacious.spec 1 May 2009 17:44:36 -0000 1.45 @@ -2,7 +2,7 @@ Name: audacious Version: 1.5.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -21,6 +21,8 @@ Patch6: audacious-1.2.1-shaded-s # Patch8: audacious-1.1.1-playlist-twenty.patch Patch9: audacious-1.4.2-id3tag-close-file.patch Patch10: audacious-1.5.1-libsad-header.patch +Patch11: audacious-1.5.1-playlist-length.patch +Patch12: audacious-1.5.1-playlist-play-clicked.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -119,6 +121,12 @@ Development files for Audacious # Remove libSAD references from the public headers %patch10 -p1 -b libsad-header +# Fix segfaults if no playlist exists +%patch11 -p1 -b playlist-length + +# When passing a file on the command line, play the file, not the first playlist entry +%patch12 -p1 -b playlist-play-clicked + perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in %build @@ -207,6 +215,11 @@ fi %changelog +* Fri May 01 2009 Ralf Ertzinger 1.5.1-8 +- Fix for "segfault with no playlist present" (BZ#475691) +- Fix for broken playlist handling (BZ#475691), patch from + http://launchpadlibrarian.net/19179891/audacious_1.5.1-3ubuntu1.1.debdiff + * Sun Apr 12 2009 Matthias Saou 1.5.1-7 - Add "xmms-gui" provides, to be required from xmms-skins package (#470135). From ertzing at fedoraproject.org Fri May 1 17:49:05 2009 From: ertzing at fedoraproject.org (Ralf Ertzinger) Date: Fri, 1 May 2009 17:49:05 +0000 (UTC) Subject: rpms/audacious/F-11 audacious.spec,1.44,1.45 Message-ID: <20090501174905.5D4F37012F@cvs1.fedora.phx.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9660 Modified Files: audacious.spec Log Message: * Fri May 01 2009 Ralf Ertzinger 1.5.1-8 - Fix for "segfault with no playlist present" (BZ#475691) - Fix for broken playlist handling (BZ#475691), patch from http://launchpadlibrarian.net/19179891/audacious_1.5.1-3ubuntu1.1.debdiff Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/F-11/audacious.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- audacious.spec 12 Apr 2009 16:11:52 -0000 1.44 +++ audacious.spec 1 May 2009 17:48:35 -0000 1.45 @@ -2,7 +2,7 @@ Name: audacious Version: 1.5.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -21,6 +21,8 @@ Patch6: audacious-1.2.1-shaded-s # Patch8: audacious-1.1.1-playlist-twenty.patch Patch9: audacious-1.4.2-id3tag-close-file.patch Patch10: audacious-1.5.1-libsad-header.patch +Patch11: audacious-1.5.1-playlist-length.patch +Patch12: audacious-1.5.1-playlist-play-clicked.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -119,6 +121,12 @@ Development files for Audacious # Remove libSAD references from the public headers %patch10 -p1 -b libsad-header +# Fix segfaults if no playlist exists +%patch11 -p1 -b playlist-length + +# When passing a file on the command line, play the file, not the first playlist entry +%patch12 -p1 -b playlist-play-clicked + perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in %build @@ -207,6 +215,11 @@ fi %changelog +* Fri May 01 2009 Ralf Ertzinger 1.5.1-8 +- Fix for "segfault with no playlist present" (BZ#475691) +- Fix for broken playlist handling (BZ#475691), patch from + http://launchpadlibrarian.net/19179891/audacious_1.5.1-3ubuntu1.1.debdiff + * Sun Apr 12 2009 Matthias Saou 1.5.1-7 - Add "xmms-gui" provides, to be required from xmms-skins package (#470135). From stingray at fedoraproject.org Fri May 1 17:53:02 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Fri, 1 May 2009 17:53:02 +0000 (UTC) Subject: rpms/libnfnetlink/F-9 .cvsignore, 1.6, 1.7 libnfnetlink.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <20090501175302.5EB977012F@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10411 Modified Files: .cvsignore libnfnetlink.spec sources Log Message: libnfnetlink-0.0.41-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 26 Oct 2008 16:32:14 -0000 1.6 +++ .cvsignore 1 May 2009 17:52:31 -0000 1.7 @@ -1 +1 @@ -libnfnetlink-0.0.39.tar.bz2 +libnfnetlink-0.0.41.tar.bz2 Index: libnfnetlink.spec =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/F-9/libnfnetlink.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- libnfnetlink.spec 26 Oct 2008 16:32:14 -0000 1.10 +++ libnfnetlink.spec 1 May 2009 17:52:32 -0000 1.11 @@ -2,8 +2,8 @@ # %define basever 0.0.30 Name: libnfnetlink -Version: 0.0.39 -Release: 3%{?dist} +Version: 0.0.41 +Release: 1%{?dist} Summary: Netfilter netlink userspace library Group: System Environment/Libraries License: GPLv2 @@ -13,7 +13,7 @@ Source1: http://www.gnu.org/licenses/gpl Patch0: libnfnetlink-sysheader.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: kernel-headers -BuildRequires: automake autoconf libtool +BuildRequires: automake autoconf libtool pkgconfig %description libnfnetlink is a userspace library that provides some low-level @@ -69,6 +69,18 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libnfnetlink/*.h %changelog +* Fri Mar 6 2009 Paul P. Komkoff Jr - 0.0.41-1 +- upstream release + +* Wed Feb 25 2009 Fedora Release Engineering - 0.0.40-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jan 19 2009 Paul P. Komkoff Jr - 0.0.40-1 +- upstream release + +* Tue Jan 13 2009 Caol??n McNamara - 0.0.39-4 +- rebuild to get provides pkgconfig(libnfnetlink) + * Sun Sep 21 2008 Ville Skytt?? - 0.0.39-3 - Fix Patch0:/%%patch mismatch. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 26 Oct 2008 16:32:14 -0000 1.6 +++ sources 1 May 2009 17:52:32 -0000 1.7 @@ -1 +1 @@ -348fed8c1edbe5b873ffc7b192140093 libnfnetlink-0.0.39.tar.bz2 +5d844ea1f557bad0364d5b85cd10c796 libnfnetlink-0.0.41.tar.bz2 From ertzing at fedoraproject.org Fri May 1 17:53:12 2009 From: ertzing at fedoraproject.org (Ralf Ertzinger) Date: Fri, 1 May 2009 17:53:12 +0000 (UTC) Subject: rpms/audacious/F-11 audacious-1.5.1-playlist-length.patch, NONE, 1.1 audacious-1.5.1-playlist-play-clicked.patch, NONE, 1.1 Message-ID: <20090501175312.D7E947012F@cvs1.fedora.phx.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10515 Added Files: audacious-1.5.1-playlist-length.patch audacious-1.5.1-playlist-play-clicked.patch Log Message: - Add missing patches to CVS audacious-1.5.1-playlist-length.patch: --- NEW FILE audacious-1.5.1-playlist-length.patch --- diff -uNr audacious-1.5.1-orig/src/audacious/playlist.c audacious-1.5.1/src/audacious/playlist.c --- audacious-1.5.1-orig/src/audacious/playlist.c 2008-05-24 00:00:34.000000000 +0200 +++ audacious-1.5.1/src/audacious/playlist.c 2009-05-01 19:29:17.663254934 +0200 @@ -1531,6 +1531,9 @@ gint playlist_get_length(Playlist *playlist) { + + g_return_val_if_fail(playlist != NULL, 0); + return g_list_length(playlist->entries); } audacious-1.5.1-playlist-play-clicked.patch: --- NEW FILE audacious-1.5.1-playlist-play-clicked.patch --- --- a/src/audacious/main.c Sun May 25 15:12:17 2008 +0200 +++ b/src/audacious/main.c Thu May 29 01:03:13 2008 +0300 @@ -315,7 +315,7 @@ parse_cmd_line_options(gint *argc, gchar } static void -handle_cmd_line_options() +handle_cmd_line_options(gboolean skip) { gchar **filenames = options.filenames; #ifdef USE_DBUS @@ -430,7 +430,7 @@ handle_cmd_line_options() } /* is_running */ else #endif - { /* !is_running */ + if (!skip) { /* !is_running */ if (filenames != NULL) { gint pos = 0; @@ -715,7 +715,7 @@ main(gint argc, gchar ** argv) signal_handlers_init(); - handle_cmd_line_options(); + handle_cmd_line_options(TRUE); if (options.headless == FALSE) { @@ -734,6 +734,8 @@ main(gint argc, gchar ** argv) plugin_system_init(); playlist_system_init(); + + handle_cmd_line_options(FALSE); #ifdef USE_DBUS init_dbus(); From hadess at fedoraproject.org Fri May 1 17:56:25 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Fri, 1 May 2009 17:56:25 +0000 (UTC) Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.76,1.77 Message-ID: <20090501175625.070337012F@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11511 Modified Files: gnome-bluetooth.spec Log Message: * Fri May 01 2009 Bastien Nocera 2.27.4-4 - Use the scriplets on the wiki for the icon update Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -p -r1.76 -r1.77 --- gnome-bluetooth.spec 1 May 2009 17:31:31 -0000 1.76 +++ gnome-bluetooth.spec 1 May 2009 17:55:54 -0000 1.77 @@ -1,6 +1,6 @@ Name: gnome-bluetooth Version: 2.27.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bluetooth graphical utilities Group: Applications/Communications @@ -114,10 +114,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/bluetooth-manager.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 +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %pre if [ "$1" -gt 1 ]; then @@ -150,9 +150,9 @@ fi %postun scrollkeeper-update -q update-desktop-database -q -touch %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %post libs -p /sbin/ldconfig @@ -184,6 +184,9 @@ fi %{_datadir}/gtk-doc/html/gnome-bluetooth/ %changelog +* Fri May 01 2009 Bastien Nocera 2.27.4-4 +- Use the scriplets on the wiki for the icon update + * Fri May 01 2009 Bastien Nocera 2.27.4-3 - Touch the icon theme directory, should fix the icon not appearing properly on new installs From sandeen at fedoraproject.org Fri May 1 18:29:46 2009 From: sandeen at fedoraproject.org (Eric Sandeen) Date: Fri, 1 May 2009 18:29:46 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-ext4-prealloc-fixes.patch, NONE, 1.1 kernel.spec, 1.1538, 1.1539 Message-ID: <20090501182946.5D04C7012F@cvs1.fedora.phx.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16868 Modified Files: kernel.spec Added Files: linux-2.6-ext4-prealloc-fixes.patch Log Message: * Fri May 01 2009 Eric Sandeen - Fix ext4 corruption on partial write into prealloc block linux-2.6-ext4-prealloc-fixes.patch: --- NEW FILE linux-2.6-ext4-prealloc-fixes.patch --- We need to mark the buffer_head mapping prealloc space as new during write_begin. Otherwise we don't zero out the page cache content properly for a partial write. This will cause file corruption with preallocation. Also use block number -1 as the fake block number so that unmap_underlying_metadata doesn't drop wrong buffer_head Signed-off-by: Aneesh Kumar K.V Block number '0' should not be used as the fake block number for the delayed new buffer. This will result in vfs calling umap_underlying_metadata for block number '0'. So use -1 instead. Signed-off-by: Aneesh Kumar K.V --- fs/ext4/inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Index: linux-2.6.29.noarch/fs/ext4/inode.c =================================================================== --- linux-2.6.29.noarch.orig/fs/ext4/inode.c +++ linux-2.6.29.noarch/fs/ext4/inode.c @@ -2318,11 +2318,21 @@ static int ext4_da_get_block_prep(struct /* not enough space to reserve */ return ret; - map_bh(bh_result, inode->i_sb, 0); + map_bh(bh_result, inode->i_sb, -1); set_buffer_new(bh_result); set_buffer_delay(bh_result); } else if (ret > 0) { bh_result->b_size = (ret << inode->i_blkbits); + /* + * With sub-block writes into unwritten extents + * we also need to mark the buffer as new so that + * the unwritten parts of the buffer gets correctly zeroed. + */ + if (buffer_unwritten(bh_result)) { + bh_result->b_bdev = inode->i_sb->s_bdev; + set_buffer_new(bh_result); + bh_result->b_blocknr = -1; + } ret = 0; } Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1538 retrieving revision 1.1539 diff -u -p -r1.1538 -r1.1539 --- kernel.spec 30 Apr 2009 21:03:29 -0000 1.1538 +++ kernel.spec 1 May 2009 18:29:15 -0000 1.1539 @@ -602,6 +602,9 @@ Patch147: linux-2.6-imac-transparent-bri Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch Patch160: linux-2.6-execshield.patch + +Patch200: linux-2.6-ext4-prealloc-fixes.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 @@ -1123,6 +1126,7 @@ ApplyPatch linux-2.6-execshield.patch # # ext4 +ApplyPatch linux-2.6-ext4-prealloc-fixes.patch # xfs @@ -1832,6 +1836,9 @@ fi # ||----w | # || || %changelog +* Fri May 01 2009 Eric Sandeen +- Fix ext4 corruption on partial write into prealloc block + * Thu Apr 30 2009 Kyle McMartin - 2.6.30-rc4 From kyle at fedoraproject.org Fri May 1 18:41:58 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Fri, 1 May 2009 18:41:58 +0000 (UTC) Subject: rpms/kernel/F-11 patch-2.6.29.2.bz2.sign, NONE, 1.1 .cvsignore, 1.1041, 1.1042 config-generic, 1.277, 1.278 drm-next.patch, 1.14, 1.15 kernel.spec, 1.1580, 1.1581 linux-2.6-v4l-dvb-experimental.patch, 1.8, 1.9 sources, 1.1003, 1.1004 upstream, 1.914, 1.915 linux-2.6-acer-wmi-bail-on-aao.patch, 1.2, NONE linux-2.6-e820-mark-esi-clobbered.patch, 1.1, NONE linux-2.6-kvm-kconfig-irqchip.patch, 1.1, NONE linux-2.6-kvm-mask-notifiers.patch, 1.1, NONE linux-2.6-kvm-reset-pit-irq-on-unmask.patch, 1.1, NONE linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch, 1.1, NONE linux-2.6-mm-define-unique-value-for-as_unevictable.patch, 1.1, NONE linux-2.6-net-fix-another-gro-bug.patch, 1.1, NONE linux-2.6-posix-timers-fix-clock-monotonicity.patch, 1.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch, 1.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch, 1.1, NONE linux-2.6-v4l-dvb-fixes.patch, 1.13, NONE linux-2.6-v4l-dvb-update.patch, 1.14, NONE linux-2.6.29.1-sparc-regression.patch, 1.1, NONE pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch, 1.1, NONE patch-2.6.29.1.bz2.sign, 1.1, NONE Message-ID: <20090501184158.A68CE7012F@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18953 Modified Files: .cvsignore config-generic drm-next.patch kernel.spec linux-2.6-v4l-dvb-experimental.patch sources upstream Added Files: patch-2.6.29.2.bz2.sign Removed Files: linux-2.6-acer-wmi-bail-on-aao.patch linux-2.6-e820-mark-esi-clobbered.patch linux-2.6-kvm-kconfig-irqchip.patch linux-2.6-kvm-mask-notifiers.patch linux-2.6-kvm-reset-pit-irq-on-unmask.patch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch linux-2.6-mm-define-unique-value-for-as_unevictable.patch linux-2.6-net-fix-another-gro-bug.patch linux-2.6-posix-timers-fix-clock-monotonicity.patch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch linux-2.6-v4l-dvb-fixes.patch linux-2.6-v4l-dvb-update.patch linux-2.6.29.1-sparc-regression.patch pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch patch-2.6.29.1.bz2.sign Log Message: * Thu Apr 30 2009 Kyle McMartin 2.6.29.2-119 - Update to 2.6.29.2 - Patches rebased: linux-2.6-v4l-dvb-experimental.patch drm-next.patch - Patches merged upstream: linux-2.6-acer-wmi-bail-on-aao.patch linux-2.6-e820-mark-esi-clobbered.patch linux-2.6-kvm-kconfig-irqchip.patch linux-2.6-kvm-mask-notifiers.patch linux-2.6-kvm-reset-pit-irq-on-unmask.patch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch linux-2.6-mm-define-unique-value-for-as_unevictable.patch linux-2.6-net-fix-another-gro-bug.patch linux-2.6-posix-timers-fix-clock-monotonicity.patch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch linux-2.6-v4l-dvb-fixes.patch linux-2.6-v4l-dvb-update.patch linux-2.6.29.1-sparc-regression.patch pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch --- NEW FILE patch-2.6.29.2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJ9fvQyGugalF9Dw4RAsB/AKCOOk344x+bwLrUgSXgLb0V0bsmigCfRXVj v9JWzcbgEEo+r6kMQyEnngE= =UsGN -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v retrieving revision 1.1041 retrieving revision 1.1042 diff -u -p -r1.1041 -r1.1042 --- .cvsignore 2 Apr 2009 23:41:46 -0000 1.1041 +++ .cvsignore 1 May 2009 18:41:25 -0000 1.1042 @@ -5,4 +5,4 @@ kernel-2.6.*.config temp-* kernel-2.6.29 linux-2.6.29.tar.bz2 -patch-2.6.29.1.bz2 +patch-2.6.29.2.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v retrieving revision 1.277 retrieving revision 1.278 diff -u -p -r1.277 -r1.278 --- config-generic 18 Apr 2009 17:45:46 -0000 1.277 +++ config-generic 1 May 2009 18:41:25 -0000 1.278 @@ -2276,7 +2276,7 @@ CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAESTRO=m CONFIG_MEDIA_ATTACH=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set # # Digital Video Broadcasting Devices @@ -2301,6 +2301,12 @@ CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_DW2102=m CONFIG_DVB_DM1105=m CONFIG_DVB_DYNAMIC_MINORS=y +CONFIG_DVB_LGDT3304=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_S921=m +# CONFIG_DVB_DUMMY_FE is not set +CONFIG_DVB_DRX397XD=m # # Supported SAA7146 based PCI Adapters drm-next.patch: Index: drm-next.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-next.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- drm-next.patch 17 Apr 2009 11:07:14 -0000 1.14 +++ drm-next.patch 1 May 2009 18:41:25 -0000 1.15 @@ -1196,10 +1196,10 @@ index f52663e..09a3571 100644 EXPORT_SYMBOL(drm_fasync); diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c -index 88d3368..4984aa8 100644 +index 7ee1ce1..4984aa8 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c -@@ -502,10 +502,9 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) +@@ -502,7 +502,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) struct drm_file *priv = filp->private_data; struct drm_device *dev = priv->minor->dev; struct drm_gem_mm *mm = dev->mm_private; @@ -1207,23 +1207,7 @@ index 88d3368..4984aa8 100644 + struct drm_local_map *map = NULL; struct drm_gem_object *obj; struct drm_hash_item *hash; -- unsigned long prot; int ret = 0; - - mutex_lock(&dev->struct_mutex); -@@ -538,11 +537,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) - vma->vm_ops = obj->dev->driver->gem_vm_ops; - vma->vm_private_data = map->handle; - /* FIXME: use pgprot_writecombine when available */ -- prot = pgprot_val(vma->vm_page_prot); --#ifdef CONFIG_X86 -- prot |= _PAGE_CACHE_WC; --#endif -- vma->vm_page_prot = __pgprot(prot); -+ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); - - /* Take a ref for this mapping of the object, so that the fault - * handler can dereference the mmap offset's pointer to the object. diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c new file mode 100644 index 0000000..f0f6c6b @@ -2842,33 +2826,10 @@ index 793cba3..51c5a05 100644 intel_display.o \ intel_crt.o \ diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c -index 6d21b9e..c23b3a9 100644 +index 908d24e..c23b3a9 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -41,7 +41,6 @@ - int i915_wait_ring(struct drm_device * dev, int n, const char *caller) - { - drm_i915_private_t *dev_priv = dev->dev_private; -- struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; - drm_i915_ring_buffer_t *ring = &(dev_priv->ring); - u32 acthd_reg = IS_I965G(dev) ? ACTHD_I965 : ACTHD; - u32 last_acthd = I915_READ(acthd_reg); -@@ -58,8 +57,12 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller) - if (ring->space >= n) - return 0; - -- if (master_priv->sarea_priv) -- master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; -+ if (dev->primary->master) { -+ struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; -+ if (master_priv->sarea_priv) -+ master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; -+ } -+ - - if (ring->head != last_head) - i = 0; -@@ -356,7 +359,7 @@ static int validate_cmd(int cmd) +@@ -359,7 +359,7 @@ static int validate_cmd(int cmd) return ret; } @@ -2877,7 +2838,7 @@ index 6d21b9e..c23b3a9 100644 { drm_i915_private_t *dev_priv = dev->dev_private; int i; -@@ -370,8 +373,7 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor +@@ -373,8 +373,7 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor for (i = 0; i < dwords;) { int cmd, sz; @@ -2887,7 +2848,7 @@ index 6d21b9e..c23b3a9 100644 if ((sz = validate_cmd(cmd)) == 0 || i + sz > dwords) return -EINVAL; -@@ -379,11 +381,7 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor +@@ -382,11 +381,7 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor OUT_RING(cmd); while (++i, --sz) { @@ -2900,7 +2861,7 @@ index 6d21b9e..c23b3a9 100644 } } -@@ -397,17 +395,13 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor +@@ -400,17 +395,13 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor int i915_emit_box(struct drm_device *dev, @@ -2920,7 +2881,7 @@ index 6d21b9e..c23b3a9 100644 if (box.y2 <= box.y1 || box.x2 <= box.x1 || box.y2 <= 0 || box.x2 <= 0) { DRM_ERROR("Bad box %d,%d..%d,%d\n", box.x1, box.y1, box.x2, box.y2); -@@ -460,7 +454,9 @@ static void i915_emit_breadcrumb(struct drm_device *dev) +@@ -463,7 +454,9 @@ static void i915_emit_breadcrumb(struct drm_device *dev) } static int i915_dispatch_cmdbuffer(struct drm_device * dev, @@ -2931,7 +2892,7 @@ index 6d21b9e..c23b3a9 100644 { int nbox = cmd->num_cliprects; int i = 0, count, ret; -@@ -476,13 +472,13 @@ static int i915_dispatch_cmdbuffer(struct drm_device * dev, +@@ -479,13 +472,13 @@ static int i915_dispatch_cmdbuffer(struct drm_device * dev, for (i = 0; i < count; i++) { if (i < nbox) { @@ -2947,7 +2908,7 @@ index 6d21b9e..c23b3a9 100644 if (ret) return ret; } -@@ -492,10 +488,10 @@ static int i915_dispatch_cmdbuffer(struct drm_device * dev, +@@ -495,10 +488,10 @@ static int i915_dispatch_cmdbuffer(struct drm_device * dev, } static int i915_dispatch_batchbuffer(struct drm_device * dev, @@ -2960,7 +2921,7 @@ index 6d21b9e..c23b3a9 100644 int nbox = batch->num_cliprects; int i = 0, count; RING_LOCALS; -@@ -511,7 +507,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev, +@@ -514,7 +507,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev, for (i = 0; i < count; i++) { if (i < nbox) { @@ -2969,7 +2930,7 @@ index 6d21b9e..c23b3a9 100644 batch->DR1, batch->DR4); if (ret) return ret; -@@ -626,6 +622,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data, +@@ -629,6 +622,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data, master_priv->sarea_priv; drm_i915_batchbuffer_t *batch = data; int ret; @@ -2977,7 +2938,7 @@ index 6d21b9e..c23b3a9 100644 if (!dev_priv->allow_batchbuffer) { DRM_ERROR("Batchbuffer ioctl disabled\n"); -@@ -637,17 +634,35 @@ static int i915_batchbuffer(struct drm_device *dev, void *data, +@@ -640,17 +634,35 @@ static int i915_batchbuffer(struct drm_device *dev, void *data, RING_LOCK_TEST_WITH_RETURN(dev, file_priv); @@ -3018,7 +2979,7 @@ index 6d21b9e..c23b3a9 100644 return ret; } -@@ -659,6 +674,8 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, +@@ -662,6 +674,8 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *) master_priv->sarea_priv; drm_i915_cmdbuffer_t *cmdbuf = data; @@ -3027,7 +2988,7 @@ index 6d21b9e..c23b3a9 100644 int ret; DRM_DEBUG("i915 cmdbuffer, buf %p sz %d cliprects %d\n", -@@ -666,25 +683,50 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, +@@ -669,25 +683,50 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, RING_LOCK_TEST_WITH_RETURN(dev, file_priv); @@ -3087,7 +3048,7 @@ index 6d21b9e..c23b3a9 100644 } static int i915_flip_bufs(struct drm_device *dev, void *data, -@@ -880,7 +922,7 @@ static int i915_probe_agp(struct drm_device *dev, unsigned long *aperture_size, +@@ -883,7 +922,7 @@ static int i915_probe_agp(struct drm_device *dev, unsigned long *aperture_size, * Some of the preallocated space is taken by the GTT * and popup. GTT is 1K per MB of aperture size, and popup is 4K. */ @@ -3096,7 +3057,7 @@ index 6d21b9e..c23b3a9 100644 overhead = 4096; else overhead = (*aperture_size / 1024) + 4096; -@@ -988,13 +1030,6 @@ static int i915_load_modeset_init(struct drm_device *dev) +@@ -991,13 +1030,6 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto destroy_ringbuffer; @@ -3110,7 +3071,7 @@ index 6d21b9e..c23b3a9 100644 /* Always safe in the mode setting case. */ /* FIXME: do pre/post-mode set stuff in core KMS code */ dev->vblank_disable_allowed = 1; -@@ -1007,7 +1042,7 @@ static int i915_load_modeset_init(struct drm_device *dev) +@@ -1010,7 +1042,7 @@ static int i915_load_modeset_init(struct drm_device *dev) intel_modeset_init(dev); @@ -3119,7 +3080,7 @@ index 6d21b9e..c23b3a9 100644 return 0; -@@ -1057,7 +1092,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) +@@ -1060,7 +1092,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) int i915_driver_load(struct drm_device *dev, unsigned long flags) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -3298,7 +3259,7 @@ index d6cc986..317b122 100644 #define PRIMARY_RINGBUFFER_SIZE (128*1024) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index 37427e4..1449b45 100644 +index fb6390a..1449b45 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -43,8 +43,8 @@ static int i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, @@ -4007,15 +3968,7 @@ index 37427e4..1449b45 100644 #if WATCH_PWRITE if (ret) -@@ -603,6 +1072,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - case -EAGAIN: - return VM_FAULT_OOM; - case -EFAULT: -+ case -EINVAL: - return VM_FAULT_SIGBUS; - default: - return VM_FAULT_NOPAGE; -@@ -627,7 +1097,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj) +@@ -628,7 +1097,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj) struct drm_gem_mm *mm = dev->mm_private; struct drm_i915_gem_object *obj_priv = obj->driver_private; struct drm_map_list *list; @@ -4024,7 +3977,7 @@ index 37427e4..1449b45 100644 int ret = 0; /* Set the object up for mmap'ing */ -@@ -816,29 +1286,30 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, +@@ -817,29 +1286,30 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, } static void @@ -4064,7 +4017,7 @@ index 37427e4..1449b45 100644 } static void -@@ -854,8 +1325,10 @@ i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno) +@@ -855,8 +1325,10 @@ i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno) obj_priv->active = 1; } /* Move from whatever list we were on to the tail of execution. */ @@ -4075,7 +4028,7 @@ index 37427e4..1449b45 100644 obj_priv->last_rendering_seqno = seqno; } -@@ -997,6 +1470,7 @@ i915_gem_retire_request(struct drm_device *dev, +@@ -998,6 +1470,7 @@ i915_gem_retire_request(struct drm_device *dev, /* Move any buffers on the active list that are no longer referenced * by the ringbuffer to the flushing/inactive lists as appropriate. */ @@ -4083,7 +4036,7 @@ index 37427e4..1449b45 100644 while (!list_empty(&dev_priv->mm.active_list)) { struct drm_gem_object *obj; struct drm_i915_gem_object *obj_priv; -@@ -1011,7 +1485,7 @@ i915_gem_retire_request(struct drm_device *dev, +@@ -1012,7 +1485,7 @@ i915_gem_retire_request(struct drm_device *dev, * this seqno. */ if (obj_priv->last_rendering_seqno != request->seqno) @@ -4092,7 +4045,7 @@ index 37427e4..1449b45 100644 #if WATCH_LRU DRM_INFO("%s: retire %d moves to inactive list %p\n", -@@ -1023,6 +1497,8 @@ i915_gem_retire_request(struct drm_device *dev, +@@ -1024,6 +1497,8 @@ i915_gem_retire_request(struct drm_device *dev, else i915_gem_object_move_to_inactive(obj); } @@ -4101,7 +4054,7 @@ index 37427e4..1449b45 100644 } /** -@@ -1290,7 +1766,7 @@ i915_gem_object_unbind(struct drm_gem_object *obj) +@@ -1291,7 +1766,7 @@ i915_gem_object_unbind(struct drm_gem_object *obj) if (obj_priv->fence_reg != I915_FENCE_REG_NONE) i915_gem_clear_fence_reg(obj); @@ -4110,7 +4063,7 @@ index 37427e4..1449b45 100644 if (obj_priv->gtt_space) { atomic_dec(&dev->gtt_count); -@@ -1409,7 +1885,7 @@ i915_gem_evict_everything(struct drm_device *dev) +@@ -1410,7 +1885,7 @@ i915_gem_evict_everything(struct drm_device *dev) } static int @@ -4119,7 +4072,7 @@ index 37427e4..1449b45 100644 { struct drm_i915_gem_object *obj_priv = obj->driver_private; int page_count, i; -@@ -1418,18 +1894,19 @@ i915_gem_object_get_page_list(struct drm_gem_object *obj) +@@ -1419,18 +1894,19 @@ i915_gem_object_get_page_list(struct drm_gem_object *obj) struct page *page; int ret; @@ -4144,7 +4097,7 @@ index 37427e4..1449b45 100644 return -ENOMEM; } -@@ -1440,10 +1917,10 @@ i915_gem_object_get_page_list(struct drm_gem_object *obj) +@@ -1441,10 +1917,10 @@ i915_gem_object_get_page_list(struct drm_gem_object *obj) if (IS_ERR(page)) { ret = PTR_ERR(page); DRM_ERROR("read_mapping_page failed: %d\n", ret); @@ -4157,7 +4110,7 @@ index 37427e4..1449b45 100644 } return 0; } -@@ -1519,20 +1996,23 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg) +@@ -1520,20 +1996,23 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg) int regnum = obj_priv->fence_reg; uint32_t val; uint32_t pitch_val; @@ -4185,7 +4138,7 @@ index 37427e4..1449b45 100644 val |= pitch_val << I830_FENCE_PITCH_SHIFT; val |= I830_FENCE_REG_VALID; -@@ -1723,7 +2203,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) +@@ -1724,7 +2203,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) return -EBUSY; if (alignment == 0) alignment = i915_gem_get_gtt_alignment(obj); @@ -4194,7 +4147,7 @@ index 37427e4..1449b45 100644 DRM_ERROR("Invalid object alignment requested %u\n", alignment); return -EINVAL; } -@@ -1740,15 +2220,20 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) +@@ -1741,15 +2220,20 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) } } if (obj_priv->gtt_space == NULL) { @@ -4218,7 +4171,7 @@ index 37427e4..1449b45 100644 DRM_ERROR("GTT full, but LRU list empty\n"); return -ENOMEM; } -@@ -1766,7 +2251,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) +@@ -1767,7 +2251,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) DRM_INFO("Binding object of size %d at 0x%08x\n", obj->size, obj_priv->gtt_offset); #endif @@ -4227,7 +4180,7 @@ index 37427e4..1449b45 100644 if (ret) { drm_mm_put_block(obj_priv->gtt_space); obj_priv->gtt_space = NULL; -@@ -1778,12 +2263,12 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) +@@ -1779,12 +2263,12 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) * into the GTT. */ obj_priv->agp_mem = drm_agp_bind_pages(dev, @@ -4242,7 +4195,7 @@ index 37427e4..1449b45 100644 drm_mm_put_block(obj_priv->gtt_space); obj_priv->gtt_space = NULL; return -ENOMEM; -@@ -1810,10 +2295,10 @@ i915_gem_clflush_object(struct drm_gem_object *obj) +@@ -1811,10 +2295,10 @@ i915_gem_clflush_object(struct drm_gem_object *obj) * to GPU, and we can ignore the cache flush because it'll happen * again at bind time. */ @@ -4255,7 +4208,7 @@ index 37427e4..1449b45 100644 } /** Flushes any GPU write domain for the object if it's dirty. */ -@@ -1913,7 +2398,6 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write) +@@ -1914,7 +2398,6 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write) static int i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write) { @@ -4263,7 +4216,7 @@ index 37427e4..1449b45 100644 int ret; i915_gem_object_flush_gpu_write_domain(obj); -@@ -1932,7 +2416,6 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write) +@@ -1933,7 +2416,6 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write) /* Flush the CPU cache if it's still invalid. */ if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) { i915_gem_clflush_object(obj); @@ -4271,7 +4224,7 @@ index 37427e4..1449b45 100644 obj->read_domains |= I915_GEM_DOMAIN_CPU; } -@@ -2144,7 +2627,6 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj) +@@ -2145,7 +2627,6 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj) static void i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj) { @@ -4279,7 +4232,7 @@ index 37427e4..1449b45 100644 struct drm_i915_gem_object *obj_priv = obj->driver_private; if (!obj_priv->page_cpu_valid) -@@ -2158,9 +2640,8 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj) +@@ -2159,9 +2640,8 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj) for (i = 0; i <= (obj->size - 1) / PAGE_SIZE; i++) { if (obj_priv->page_cpu_valid[i]) continue; @@ -4290,7 +4243,7 @@ index 37427e4..1449b45 100644 } /* Free the page_cpu_valid mappings which are now stale, whether -@@ -2224,7 +2705,7 @@ i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, +@@ -2225,7 +2705,7 @@ i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, if (obj_priv->page_cpu_valid[i]) continue; @@ -4299,7 +4252,7 @@ index 37427e4..1449b45 100644 obj_priv->page_cpu_valid[i] = 1; } -@@ -2245,12 +2726,11 @@ i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, +@@ -2246,12 +2726,11 @@ i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, static int i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, struct drm_file *file_priv, @@ -4314,7 +4267,7 @@ index 37427e4..1449b45 100644 struct drm_i915_gem_object *obj_priv = obj->driver_private; int i, ret; void __iomem *reloc_page; -@@ -2262,25 +2742,18 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, +@@ -2263,25 +2742,18 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, entry->offset = obj_priv->gtt_offset; @@ -4342,7 +4295,7 @@ index 37427e4..1449b45 100644 if (target_obj == NULL) { i915_gem_object_unpin(obj); return -EBADF; -@@ -2292,53 +2765,53 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, +@@ -2293,53 +2765,53 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, */ if (target_obj_priv->gtt_space == NULL) { DRM_ERROR("No GTT space found for object %d\n", @@ -4414,7 +4367,7 @@ index 37427e4..1449b45 100644 target_obj->pending_write_domain); drm_gem_object_unreference(target_obj); i915_gem_object_unpin(obj); -@@ -2351,22 +2824,22 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, +@@ -2352,22 +2824,22 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, "presumed %08x delta %08x\n", __func__, obj, @@ -4446,7 +4399,7 @@ index 37427e4..1449b45 100644 drm_gem_object_unreference(target_obj); continue; } -@@ -2381,32 +2854,26 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, +@@ -2382,32 +2854,26 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, /* Map the page containing the relocation we're going to * perform. */ @@ -4485,7 +4438,7 @@ index 37427e4..1449b45 100644 drm_gem_object_unreference(target_obj); } -@@ -2423,11 +2890,10 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, +@@ -2424,11 +2890,10 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, static int i915_dispatch_gem_execbuffer(struct drm_device *dev, struct drm_i915_gem_execbuffer *exec, @@ -4498,7 +4451,7 @@ index 37427e4..1449b45 100644 int nbox = exec->num_cliprects; int i = 0, count; uint32_t exec_start, exec_len; -@@ -2448,7 +2914,7 @@ i915_dispatch_gem_execbuffer(struct drm_device *dev, +@@ -2449,7 +2914,7 @@ i915_dispatch_gem_execbuffer(struct drm_device *dev, for (i = 0; i < count; i++) { if (i < nbox) { @@ -4507,7 +4460,7 @@ index 37427e4..1449b45 100644 exec->DR1, exec->DR4); if (ret) return ret; -@@ -2504,6 +2970,75 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file_priv) +@@ -2505,6 +2970,75 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file_priv) return ret; } @@ -4583,7 +4536,7 @@ index 37427e4..1449b45 100644 int i915_gem_execbuffer(struct drm_device *dev, void *data, struct drm_file *file_priv) -@@ -2515,9 +3050,11 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, +@@ -2516,9 +3050,11 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, struct drm_gem_object **object_list = NULL; struct drm_gem_object *batch_obj; struct drm_i915_gem_object *obj_priv; @@ -4597,7 +4550,7 @@ index 37427e4..1449b45 100644 int pin_tries; #if WATCH_EXEC -@@ -2551,6 +3088,28 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, +@@ -2552,6 +3088,28 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, goto pre_mutex_err; } @@ -4626,7 +4579,7 @@ index 37427e4..1449b45 100644 mutex_lock(&dev->struct_mutex); i915_verify_inactive(dev, __FILE__, __LINE__); -@@ -2593,15 +3152,19 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, +@@ -2594,15 +3152,19 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, /* Pin and relocate */ for (pin_tries = 0; ; pin_tries++) { ret = 0; @@ -4647,7 +4600,7 @@ index 37427e4..1449b45 100644 } /* success */ if (ret == 0) -@@ -2687,7 +3250,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, +@@ -2688,7 +3250,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, #endif /* Exec the batchbuffer */ @@ -4656,7 +4609,7 @@ index 37427e4..1449b45 100644 if (ret) { DRM_ERROR("dispatch failed %d\n", ret); goto err; -@@ -2751,11 +3314,27 @@ err: +@@ -2752,11 +3314,27 @@ err: args->buffer_count, ret); } @@ -4684,7 +4637,7 @@ index 37427e4..1449b45 100644 return ret; } -@@ -3110,6 +3689,7 @@ i915_gem_idle(struct drm_device *dev) +@@ -3111,6 +3689,7 @@ i915_gem_idle(struct drm_device *dev) i915_gem_retire_requests(dev); @@ -4692,7 +4645,7 @@ index 37427e4..1449b45 100644 if (!dev_priv->mm.wedged) { /* Active and flushing should now be empty as we've * waited for a sequence higher than any pending execbuffer -@@ -3136,6 +3716,7 @@ i915_gem_idle(struct drm_device *dev) +@@ -3137,6 +3716,7 @@ i915_gem_idle(struct drm_device *dev) obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS; i915_gem_object_move_to_inactive(obj_priv->obj); } @@ -4700,7 +4653,7 @@ index 37427e4..1449b45 100644 while (!list_empty(&dev_priv->mm.flushing_list)) { struct drm_i915_gem_object *obj_priv; -@@ -3192,7 +3773,7 @@ i915_gem_init_hws(struct drm_device *dev) +@@ -3193,7 +3773,7 @@ i915_gem_init_hws(struct drm_device *dev) dev_priv->status_gfx_addr = obj_priv->gtt_offset; @@ -4709,7 +4662,7 @@ index 37427e4..1449b45 100644 if (dev_priv->hw_status_page == NULL) { DRM_ERROR("Failed to map status page.\n"); memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map)); -@@ -3222,7 +3803,7 @@ i915_gem_cleanup_hws(struct drm_device *dev) +@@ -3223,7 +3803,7 @@ i915_gem_cleanup_hws(struct drm_device *dev) obj = dev_priv->hws_obj; obj_priv = obj->driver_private; @@ -4718,7 +4671,7 @@ index 37427e4..1449b45 100644 i915_gem_object_unpin(obj); drm_gem_object_unreference(obj); dev_priv->hws_obj = NULL; -@@ -3384,7 +3965,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, +@@ -3385,7 +3965,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, if (ret != 0) return ret; @@ -4729,7 +4682,7 @@ index 37427e4..1449b45 100644 BUG_ON(!list_empty(&dev_priv->mm.flushing_list)); BUG_ON(!list_empty(&dev_priv->mm.inactive_list)); BUG_ON(!list_empty(&dev_priv->mm.request_list)); -@@ -3428,6 +4012,7 @@ i915_gem_load(struct drm_device *dev) +@@ -3429,6 +4012,7 @@ i915_gem_load(struct drm_device *dev) { drm_i915_private_t *dev_priv = dev->dev_private; @@ -4737,7 +4690,7 @@ index 37427e4..1449b45 100644 INIT_LIST_HEAD(&dev_priv->mm.active_list); INIT_LIST_HEAD(&dev_priv->mm.flushing_list); INIT_LIST_HEAD(&dev_priv->mm.inactive_list); -@@ -3525,20 +4110,20 @@ void i915_gem_detach_phys_object(struct drm_device *dev, +@@ -3526,20 +4110,20 @@ void i915_gem_detach_phys_object(struct drm_device *dev, if (!obj_priv->phys_obj) return; @@ -4761,7 +4714,7 @@ index 37427e4..1449b45 100644 drm_agp_chipset_flush(dev); out: obj_priv->phys_obj->cur_obj = NULL; -@@ -3581,7 +4166,7 @@ i915_gem_attach_phys_object(struct drm_device *dev, +@@ -3582,7 +4166,7 @@ i915_gem_attach_phys_object(struct drm_device *dev, obj_priv->phys_obj = dev_priv->mm.phys_objs[id - 1]; obj_priv->phys_obj->cur_obj = obj; @@ -4770,7 +4723,7 @@ index 37427e4..1449b45 100644 if (ret) { DRM_ERROR("failed to get page list\n"); goto out; -@@ -3590,7 +4175,7 @@ i915_gem_attach_phys_object(struct drm_device *dev, +@@ -3591,7 +4175,7 @@ i915_gem_attach_phys_object(struct drm_device *dev, page_count = obj->size / PAGE_SIZE; for (i = 0; i < page_count; i++) { @@ -5408,62 +5361,10 @@ index 4d1b9de..0000000 - remove_proc_entry(i915_gem_proc_list[i].name, minor->dev_root); -} diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c -index 7fb4191..6be3f92 100644 +index 4cce1ae..6be3f92 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c -@@ -96,16 +96,16 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev) - */ - swizzle_x = I915_BIT_6_SWIZZLE_NONE; - swizzle_y = I915_BIT_6_SWIZZLE_NONE; -- } else if ((!IS_I965G(dev) && !IS_G33(dev)) || IS_I965GM(dev) || -- IS_GM45(dev)) { -+ } else if (IS_MOBILE(dev)) { - uint32_t dcc; - -- /* On 915-945 and GM965, channel interleave by the CPU is -- * determined by DCC. The CPU will alternate based on bit 6 -- * in interleaved mode, and the GPU will then also alternate -- * on bit 6, 9, and 10 for X, but the CPU may also optionally -- * alternate based on bit 17 (XOR not disabled and XOR -- * bit == 17). -+ /* On mobile 9xx chipsets, channel interleave by the CPU is -+ * determined by DCC. For single-channel, neither the CPU -+ * nor the GPU do swizzling. For dual channel interleaved, -+ * the GPU's interleave is bit 9 and 10 for X tiled, and bit -+ * 9 for Y tiled. The CPU's interleave is independent, and -+ * can be based on either bit 11 (haven't seen this yet) or -+ * bit 17 (common). - */ - dcc = I915_READ(DCC); - switch (dcc & DCC_ADDRESSING_MODE_MASK) { -@@ -115,19 +115,18 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev) - swizzle_y = I915_BIT_6_SWIZZLE_NONE; - break; - case DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED: -- if (IS_I915G(dev) || IS_I915GM(dev) || -- dcc & DCC_CHANNEL_XOR_DISABLE) { -+ if (dcc & DCC_CHANNEL_XOR_DISABLE) { -+ /* This is the base swizzling by the GPU for -+ * tiled buffers. -+ */ - swizzle_x = I915_BIT_6_SWIZZLE_9_10; - swizzle_y = I915_BIT_6_SWIZZLE_9; -- } else if ((IS_I965GM(dev) || IS_GM45(dev)) && -- (dcc & DCC_CHANNEL_XOR_BIT_17) == 0) { -- /* GM965/GM45 does either bit 11 or bit 17 -- * swizzling. -- */ -+ } else if ((dcc & DCC_CHANNEL_XOR_BIT_17) == 0) { -+ /* Bit 11 swizzling by the CPU in addition. */ - swizzle_x = I915_BIT_6_SWIZZLE_9_10_11; - swizzle_y = I915_BIT_6_SWIZZLE_9_11; - } else { -- /* Bit 17 or perhaps other swizzling */ -+ /* Bit 17 swizzling by the CPU in addition. */ - swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN; - swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN; - } -@@ -217,6 +216,22 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode) +@@ -216,6 +216,22 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode) else tile_width = 512; @@ -5617,7 +5518,7 @@ index 87b6b60..ee7ce7b 100644 I915_WRITE(PIPEASTAT, 0); I915_WRITE(PIPEBSTAT, 0); diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h -index 90600d8..e805b59 100644 +index cc2938d..e805b59 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -190,6 +190,8 @@ @@ -5666,25 +5567,10 @@ index 90600d8..e805b59 100644 #define FP_M2_DIV_SHIFT 0 #define DPLL_TEST 0x606c #define DPLLB_TEST_SDVO_DIV_1 (0 << 22) -@@ -629,6 +636,30 @@ - #define TV_HOTPLUG_INT_EN (1 << 18) - #define CRT_HOTPLUG_INT_EN (1 << 9) - #define CRT_HOTPLUG_FORCE_DETECT (1 << 3) -+#define CRT_HOTPLUG_ACTIVATION_PERIOD_32 (0 << 8) -+/* must use period 64 on GM45 according to docs */ -+#define CRT_HOTPLUG_ACTIVATION_PERIOD_64 (1 << 8) -+#define CRT_HOTPLUG_DAC_ON_TIME_2M (0 << 7) -+#define CRT_HOTPLUG_DAC_ON_TIME_4M (1 << 7) -+#define CRT_HOTPLUG_VOLTAGE_COMPARE_40 (0 << 5) -+#define CRT_HOTPLUG_VOLTAGE_COMPARE_50 (1 << 5) -+#define CRT_HOTPLUG_VOLTAGE_COMPARE_60 (2 << 5) -+#define CRT_HOTPLUG_VOLTAGE_COMPARE_70 (3 << 5) -+#define CRT_HOTPLUG_VOLTAGE_COMPARE_MASK (3 << 5) -+#define CRT_HOTPLUG_DETECT_DELAY_1G (0 << 4) -+#define CRT_HOTPLUG_DETECT_DELAY_2G (1 << 4) -+#define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2) -+#define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) -+#define CRT_HOTPLUG_MASK (0x3fc) /* Bits 9-2 */ +@@ -644,6 +651,14 @@ + #define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2) + #define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) + #define CRT_HOTPLUG_MASK (0x3fc) /* Bits 9-2 */ +#define CRT_FORCE_HOTPLUG_MASK 0xfffffe1f +#define HOTPLUG_EN_MASK (HDMIB_HOTPLUG_INT_EN | \ + HDMIC_HOTPLUG_INT_EN | \ @@ -5693,11 +5579,10 @@ index 90600d8..e805b59 100644 + SDVOC_HOTPLUG_INT_EN | \ + TV_HOTPLUG_INT_EN | \ + CRT_HOTPLUG_INT_EN) -+ + #define PORT_HOTPLUG_STAT 0x61114 - #define HDMIB_HOTPLUG_INT_STATUS (1 << 29) -@@ -856,7 +887,7 @@ +@@ -872,7 +887,7 @@ */ # define TV_ENC_C0_FIX (1 << 10) /** Bits that must be preserved by software */ @@ -5731,7 +5616,7 @@ index 5ea715a..de621aa 100644 } __attribute__((packed)); diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c -index dcaed34..9bdd959 100644 +index 61c108e..9bdd959 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -41,7 +41,7 @@ static void intel_crt_dpms(struct drm_encoder *encoder, int mode) @@ -5783,61 +5668,17 @@ index dcaed34..9bdd959 100644 I915_WRITE(ADPA, adpa); } -@@ -133,20 +146,39 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) - { - struct drm_device *dev = connector->dev; - struct drm_i915_private *dev_priv = dev->dev_private; -- u32 temp; -- -- unsigned long timeout = jiffies + msecs_to_jiffies(1000); -- -- temp = I915_READ(PORT_HOTPLUG_EN); -- -- I915_WRITE(PORT_HOTPLUG_EN, -- temp | CRT_HOTPLUG_FORCE_DETECT | (1 << 5)); -+ u32 hotplug_en; -+ int i, tries = 0; -+ /* -+ * On 4 series desktop, CRT detect sequence need to be done twice -+ * to get a reliable result. -+ */ - -- do { -- if (!(I915_READ(PORT_HOTPLUG_EN) & CRT_HOTPLUG_FORCE_DETECT)) -- break; -- msleep(1); -- } while (time_after(timeout, jiffies)); -+ if (IS_G4X(dev) && !IS_GM45(dev)) -+ tries = 2; -+ else -+ tries = 1; -+ hotplug_en = I915_READ(PORT_HOTPLUG_EN); +@@ -145,7 +158,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) + else + tries = 1; + hotplug_en = I915_READ(PORT_HOTPLUG_EN); +- hotplug_en &= ~(CRT_HOTPLUG_MASK); + hotplug_en &= CRT_FORCE_HOTPLUG_MASK; -+ hotplug_en |= CRT_HOTPLUG_FORCE_DETECT; -+ -+ if (IS_GM45(dev)) -+ hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64; -+ -+ hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50; -+ -+ for (i = 0; i < tries ; i++) { -+ unsigned long timeout; -+ /* turn on the FORCE_DETECT */ -+ I915_WRITE(PORT_HOTPLUG_EN, hotplug_en); -+ timeout = jiffies + msecs_to_jiffies(1000); -+ /* wait for FORCE_DETECT to go off */ -+ do { -+ if (!(I915_READ(PORT_HOTPLUG_EN) & -+ CRT_HOTPLUG_FORCE_DETECT)) -+ break; -+ msleep(1); -+ } while (time_after(timeout, jiffies)); -+ } + hotplug_en |= CRT_HOTPLUG_FORCE_DETECT; - if ((I915_READ(PORT_HOTPLUG_STAT) & CRT_HOTPLUG_MONITOR_MASK) == - CRT_HOTPLUG_MONITOR_COLOR) + if (IS_GM45(dev)) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index a283427..64773ce 100644 +index 601a76f..64773ce 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -56,11 +56,13 @@ typedef struct { @@ -6178,7 +6019,7 @@ index a283427..64773ce 100644 -static void intel_clock(int refclk, intel_clock_t *clock) +/* m1 is reserved as 0 in IGD, n is a ring counter */ +static void igd_clock(int refclk, intel_clock_t *clock) -+{ + { + clock->m = clock->m2 + 2; + clock->p = clock->p1 * clock->p2; + clock->vco = refclk * clock->m / clock->n; @@ -6186,7 +6027,7 @@ index a283427..64773ce 100644 +} + +static void intel_clock(struct drm_device *dev, int refclk, intel_clock_t *clock) - { ++{ + if (IS_IGD(dev)) { + igd_clock(refclk, clock); + return; @@ -6453,29 +6294,6 @@ index a283427..64773ce 100644 } } -@@ -1474,13 +1834,21 @@ static void intel_setup_outputs(struct drm_device *dev) - - if (IS_I9XX(dev)) { - int found; -+ u32 reg; - - if (I915_READ(SDVOB) & SDVO_DETECTED) { - found = intel_sdvo_init(dev, SDVOB); - if (!found && SUPPORTS_INTEGRATED_HDMI(dev)) - intel_hdmi_init(dev, SDVOB); - } -- if (!IS_G4X(dev) || (I915_READ(SDVOB) & SDVO_DETECTED)) { -+ -+ /* Before G4X SDVOC doesn't have its own detect register */ -+ if (IS_G4X(dev)) -+ reg = SDVOC; -+ else -+ reg = SDVOB; -+ -+ if (I915_READ(reg) & SDVO_DETECTED) { - found = intel_sdvo_init(dev, SDVOC); - if (!found && SUPPORTS_INTEGRATED_HDMI(dev)) - intel_hdmi_init(dev, SDVOC); diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 0d211af..6619f26 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c @@ -6867,7 +6685,7 @@ index 1117b9c..193938b 100644 /* I2C registers for SDVO */ diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c -index 56485d6..d2c3298 100644 +index b05cb67..0ab2d3a 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -217,8 +217,8 @@ static const u32 filter_table[] = { @@ -7294,59 +7112,11 @@ index 56485d6..d2c3298 100644 } static void -@@ -1558,33 +1570,49 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop - struct drm_device *dev = connector->dev; - struct intel_output *intel_output = to_intel_output(connector); - struct intel_tv_priv *tv_priv = intel_output->dev_priv; -+ struct drm_encoder *encoder = &intel_output->enc; -+ struct drm_crtc *crtc = encoder->crtc; - int ret = 0; -+ bool changed = false; - - ret = drm_connector_property_set_value(connector, property, val); - if (ret < 0) - goto out; - -- if (property == dev->mode_config.tv_left_margin_property) -+ if (property == dev->mode_config.tv_left_margin_property && -+ tv_priv->margin[TV_MARGIN_LEFT] != val) { - tv_priv->margin[TV_MARGIN_LEFT] = val; -- else if (property == dev->mode_config.tv_right_margin_property) -+ changed = true; -+ } else if (property == dev->mode_config.tv_right_margin_property && -+ tv_priv->margin[TV_MARGIN_RIGHT] != val) { - tv_priv->margin[TV_MARGIN_RIGHT] = val; -- else if (property == dev->mode_config.tv_top_margin_property) -+ changed = true; -+ } else if (property == dev->mode_config.tv_top_margin_property && -+ tv_priv->margin[TV_MARGIN_TOP] != val) { - tv_priv->margin[TV_MARGIN_TOP] = val; -- else if (property == dev->mode_config.tv_bottom_margin_property) -+ changed = true; -+ } else if (property == dev->mode_config.tv_bottom_margin_property && -+ tv_priv->margin[TV_MARGIN_BOTTOM] != val) { - tv_priv->margin[TV_MARGIN_BOTTOM] = val; -- else if (property == dev->mode_config.tv_mode_property) { -+ changed = true; -+ } else if (property == dev->mode_config.tv_mode_property) { - if (val >= NUM_TV_MODES) { - ret = -EINVAL; - goto out; - } -+ if (!strcmp(tv_priv->tv_format, tv_modes[val].name)) -+ goto out; -+ - tv_priv->tv_format = tv_modes[val].name; -- intel_tv_mode_set(&intel_output->enc, NULL, NULL); -+ changed = true; - } else { - ret = -EINVAL; - goto out; - } +@@ -1600,7 +1612,7 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop -- intel_tv_mode_set(&intel_output->enc, NULL, NULL); -+ if (changed && crtc) -+ drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x, + if (changed && crtc) + drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x, +- crtc->y, crtc->fb); + crtc->y, crtc->fb, 0); out: return ret; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1580 retrieving revision 1.1581 diff -u -p -r1.1580 -r1.1581 --- kernel.spec 30 Apr 2009 09:34:25 -0000 1.1580 +++ kernel.spec 1 May 2009 18:41:25 -0000 1.1581 @@ -37,7 +37,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 1 +%define stable_update 2 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -600,7 +600,6 @@ Patch30: linux-2.6-iommu-fixes.patch Patch41: linux-2.6-sysrq-c.patch -Patch100: linux-2.6-e820-mark-esi-clobbered.patch Patch101: linux-2.6-e820-save-restore-edi-ebp.patch Patch102: linux-2.6-e820-acpi3-bios-workaround.patch Patch103: linux-2.6-e820-guard-against-pre-acpi3.patch @@ -629,7 +628,6 @@ Patch392: linux-2.6-acpi-strict-resource Patch393: linux-2.6-hwmon-atk0110.patch Patch394: linux-2.6-acpi-video-didl-intel-outputs.patch Patch395: linux-2.6-sony-laptop-rfkill.patch -Patch396: linux-2.6-acer-wmi-bail-on-aao.patch Patch400: linux-2.6-scsi-cpqarray-set-master.patch Patch450: linux-2.6-input-kill-stupid-messages.patch Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch @@ -647,7 +645,6 @@ Patch511: linux-2.6-shut-up-efifb.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 -Patch590: linux-2.6.29.1-sparc-regression.patch Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch Patch601: alsa-rewrite-hw_ptr-updaters.patch Patch602: alsa-pcm-always-reset-invalid-position.patch @@ -707,8 +704,6 @@ Patch2201: linux-2.6-firewire-git-pendin # silence the ACPI blacklist code Patch2802: linux-2.6-silence-acpi-blacklist.patch -Patch2899: linux-2.6-v4l-dvb-fixes.patch -Patch2900: linux-2.6-v4l-dvb-update.patch Patch2901: linux-2.6-v4l-dvb-experimental.patch Patch2902: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch @@ -727,17 +722,8 @@ Patch4000: linux-2.6-usb-cdc-acm-remove- Patch5000: linux-2.6-add-qcserial.patch # patches headed for -stable -# fix oops in md raid1 (#495550) -Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch # fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages) Patch6010: squashfs-broken-when-pagesize-greater-than-blocksize.patch -# fix duplicated flags value -Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch -# fix posix clock monotonicity -Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch -# make RLIMIT_CPU work again -Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch -Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch Patch7005: linux-2.6-i2c-fix-bit-algorithm-timeout.patch Patch9000: hpet-fixes.patch @@ -749,18 +735,10 @@ Patch9002: cpufreq-add-atom-to-p4-clockm #Adding dropwatch into rawhide until we get to 2.6.30 Patch9003: linux-2.6-dropwatch-protocol.patch -# fix for net lockups, will be in 2.6.29.1 -Patch9101: linux-2.6-net-fix-another-gro-bug.patch - # kvm fixes -Patch9300: linux-2.6-kvm-kconfig-irqchip.patch -Patch9301: linux-2.6-kvm-mask-notifiers.patch -Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch Patch9303: linux-2.6-kvm-skip-pit-check.patch Patch9304: linux-2.6-xen-check-for-nx-support.patch -Patch9400: pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch - # FPU state can become corrupt Patch9510: linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch @@ -1171,7 +1149,6 @@ ApplyPatch linux-2.6-sysrq-c.patch # Architecture patches # x86(-64) -ApplyPatch linux-2.6-e820-mark-esi-clobbered.patch ApplyPatch linux-2.6-e820-save-restore-edi-ebp.patch ApplyPatch linux-2.6-e820-acpi3-bios-workaround.patch ApplyPatch linux-2.6-e820-guard-against-pre-acpi3.patch @@ -1196,7 +1173,6 @@ ApplyPatch linux-2.6-imac-transparent-br # ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch -ApplyPatch linux-2.6.29.1-sparc-regression.patch # # Exec shield # @@ -1233,7 +1209,6 @@ ApplyPatch linux-2.6-acpi-strict-resourc ApplyPatch linux-2.6-hwmon-atk0110.patch ApplyPatch linux-2.6-acpi-video-didl-intel-outputs.patch ApplyPatch linux-2.6-sony-laptop-rfkill.patch -ApplyPatch linux-2.6-acer-wmi-bail-on-aao.patch # Various low-impact patches to aid debugging. ApplyPatch linux-2.6-debug-sizeof-structs.patch @@ -1377,19 +1352,12 @@ C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-fire ApplyPatch linux-2.6-silence-acpi-blacklist.patch # V4L/DVB updates/fixes/experimental drivers -ApplyPatch linux-2.6-v4l-dvb-fixes.patch -ApplyPatch linux-2.6-v4l-dvb-update.patch ApplyPatch linux-2.6-v4l-dvb-experimental.patch ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch # patches headed for -stable -ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch -ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch -ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch -ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch -ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch ApplyPatch linux-2.6-i2c-fix-bit-algorithm-timeout.patch ApplyPatch hpet-fixes.patch @@ -1401,17 +1369,10 @@ ApplyPatch cpufreq-add-atom-to-p4-clockm ApplyPatch linux-2.6-dropwatch-protocol.patch -ApplyPatch linux-2.6-net-fix-another-gro-bug.patch - # kvm fixes -ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch -ApplyPatch linux-2.6-kvm-mask-notifiers.patch -ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch ApplyPatch linux-2.6-kvm-skip-pit-check.patch ApplyPatch linux-2.6-xen-check-for-nx-support.patch -ApplyPatch pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch - ApplyPatch linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch # END OF PATCH APPLICATIONS @@ -1999,6 +1960,28 @@ fi # and build. %changelog +* Thu Apr 30 2009 Kyle McMartin 2.6.29.2-119 +- Update to 2.6.29.2 +- Patches rebased: + linux-2.6-v4l-dvb-experimental.patch + drm-next.patch +- Patches merged upstream: + linux-2.6-acer-wmi-bail-on-aao.patch + linux-2.6-e820-mark-esi-clobbered.patch + linux-2.6-kvm-kconfig-irqchip.patch + linux-2.6-kvm-mask-notifiers.patch + linux-2.6-kvm-reset-pit-irq-on-unmask.patch + linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch + linux-2.6-mm-define-unique-value-for-as_unevictable.patch + linux-2.6-net-fix-another-gro-bug.patch + linux-2.6-posix-timers-fix-clock-monotonicity.patch + linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch + linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch + linux-2.6-v4l-dvb-fixes.patch + linux-2.6-v4l-dvb-update.patch + linux-2.6.29.1-sparc-regression.patch + pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch + * Thu Apr 30 2009 Dave Airlie 2.6.29.1-118 - drm-radeon-kms-fixes.patch: revert rs480 snoop break linux-2.6-v4l-dvb-experimental.patch: Index: linux-2.6-v4l-dvb-experimental.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-v4l-dvb-experimental.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- linux-2.6-v4l-dvb-experimental.patch 30 Mar 2009 12:11:44 -0000 1.8 +++ linux-2.6-v4l-dvb-experimental.patch 1 May 2009 18:41:26 -0000 1.9 @@ -392,10 +392,10 @@ index 0000000..31ba8c5 +MODULE_AUTHOR("Pierre Ossman"); +MODULE_LICENSE("GPL"); diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig -index 76bad58..58abbe3 100644 +index 19cf3b8..2409065 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig -@@ -795,6 +795,8 @@ source "drivers/media/video/hdpvr/Kconfig" +@@ -819,6 +819,8 @@ source "drivers/media/video/pvrusb2/Kconfig" source "drivers/media/video/em28xx/Kconfig" @@ -405,10 +405,10 @@ index 76bad58..58abbe3 100644 source "drivers/media/video/usbvideo/Kconfig" diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile -index b904674..08765d8 100644 +index 72f6d03..13cd579 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile -@@ -67,6 +67,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o +@@ -70,6 +70,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ obj-$(CONFIG_VIDEO_CX88) += cx88/ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ @@ -14281,7 +14281,7 @@ index 0000000..aa4a23e +} +#endif diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c -index 93d74be..2f846f5 100644 +index d199d80..95e3f95 100644 --- a/drivers/media/video/cx25840/cx25840-audio.c +++ b/drivers/media/video/cx25840/cx25840-audio.c @@ -32,7 +32,7 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq) @@ -14420,10 +14420,10 @@ index 93d74be..2f846f5 100644 static int get_volume(struct i2c_client *client) diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c -index 737ee4e..f8ed3c0 100644 +index 25eb3be..7d6b0bb 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c -@@ -345,6 +345,77 @@ static void cx23885_initialize(struct i2c_client *client) +@@ -348,6 +348,77 @@ static void cx23885_initialize(struct i2c_client *client) /* ----------------------------------------------------------------------- */ @@ -14501,7 +14501,7 @@ index 737ee4e..f8ed3c0 100644 void cx25840_std_setup(struct i2c_client *client) { struct cx25840_state *state = to_state(i2c_get_clientdata(client)); -@@ -414,39 +485,41 @@ void cx25840_std_setup(struct i2c_client *client) +@@ -417,39 +488,41 @@ void cx25840_std_setup(struct i2c_client *client) } /* DEBUG: Displays configured PLL frequency */ @@ -14575,7 +14575,7 @@ index 737ee4e..f8ed3c0 100644 } /* Sets horizontal blanking delay and active lines */ -@@ -596,7 +669,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp +@@ -599,7 +672,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp * configuration in reg (for the cx23885) so we have no * need to attempt to flip bits for earlier av decoders. */ @@ -14584,7 +14584,7 @@ index 737ee4e..f8ed3c0 100644 switch (aud_input) { case CX25840_AUDIO_SERIAL: /* do nothing, use serial audio input */ -@@ -619,7 +692,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp +@@ -622,7 +695,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp /* Set INPUT_MODE to Composite (0) or S-Video (1) */ cx25840_and_or(client, 0x401, ~0x6, is_composite ? 0 : 0x02); @@ -14593,7 +14593,7 @@ index 737ee4e..f8ed3c0 100644 /* Set CH_SEL_ADC2 to 1 if input comes from CH3 */ cx25840_and_or(client, 0x102, ~0x2, (reg & 0x80) == 0 ? 2 : 0); /* Set DUAL_MODE_ADC2 to 1 if input comes from both CH2&CH3 */ -@@ -659,6 +732,19 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp +@@ -662,6 +735,19 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp */ cx25840_write(client, 0x918, 0xa0); cx25840_write(client, 0x919, 0x01); @@ -14613,7 +14613,7 @@ index 737ee4e..f8ed3c0 100644 } return 0; -@@ -1118,6 +1204,8 @@ static int cx25840_init(struct v4l2_subdev *sd, u32 val) +@@ -1113,6 +1199,8 @@ static int cx25840_init(struct v4l2_subdev *sd, u32 val) cx25836_initialize(client); else if (state->is_cx23885) cx23885_initialize(client); @@ -14622,7 +14622,7 @@ index 737ee4e..f8ed3c0 100644 else cx25840_initialize(client); } -@@ -1159,7 +1247,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable) +@@ -1168,7 +1256,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable) v4l_dbg(1, cx25840_debug, client, "%s output\n", enable ? "enable" : "disable"); if (enable) { @@ -14631,7 +14631,7 @@ index 737ee4e..f8ed3c0 100644 u8 v = (cx25840_read(client, 0x421) | 0x0b); cx25840_write(client, 0x421, v); } else { -@@ -1169,7 +1257,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable) +@@ -1178,7 +1266,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable) state->is_cx25836 ? 0x04 : 0x07); } } else { @@ -14640,7 +14640,7 @@ index 737ee4e..f8ed3c0 100644 u8 v = cx25840_read(client, 0x421) & ~(0x0b); cx25840_write(client, 0x421, v); } else { -@@ -1350,6 +1438,8 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val) +@@ -1356,6 +1444,8 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val) cx25836_initialize(client); else if (state->is_cx23885) cx23885_initialize(client); @@ -14649,7 +14649,7 @@ index 737ee4e..f8ed3c0 100644 else cx25840_initialize(client); return 0; -@@ -1449,6 +1539,8 @@ static int cx25840_probe(struct i2c_client *client, +@@ -1468,6 +1558,8 @@ static int cx25840_probe(struct i2c_client *client, id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6; } else if (device_id == 0x1313) { id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6; @@ -14658,7 +14658,7 @@ index 737ee4e..f8ed3c0 100644 } else { v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n"); -@@ -1471,6 +1563,7 @@ static int cx25840_probe(struct i2c_client *client, +@@ -1490,6 +1582,7 @@ static int cx25840_probe(struct i2c_client *client, state->c = client; state->is_cx25836 = ((device_id & 0xff00) == 0x8300); state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313); @@ -14667,7 +14667,7 @@ index 737ee4e..f8ed3c0 100644 state->aud_input = CX25840_AUDIO8; state->audclk_freq = 48000; diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h -index 9ad0eb8..814b565 100644 +index be05582..93941be 100644 --- a/drivers/media/video/cx25840/cx25840-core.h +++ b/drivers/media/video/cx25840/cx25840-core.h @@ -50,6 +50,7 @@ struct cx25840_state { @@ -14718,17 +14718,17 @@ index 0b2dceb..0df53b0 100644 memcpy(buffer + 2, ptr, len); diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h -index f27604a..f9d48c9 100644 +index 1ffc23b..d252c9b 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h -@@ -88,6 +88,7 @@ +@@ -87,6 +87,7 @@ #define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */ #define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */ #define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ +#define I2C_HW_B_CX231XX 0x010024 /* Conexant CX231XX USB based cards */ - #define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */ /* --- SGI adapters */ + #define I2C_HW_SGI_VINO 0x160000 diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index ea1bf5b..3d7533d 100644 --- a/include/linux/mmc/sdio_ids.h Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v retrieving revision 1.1003 retrieving revision 1.1004 diff -u -p -r1.1003 -r1.1004 --- sources 2 Apr 2009 23:41:47 -0000 1.1003 +++ sources 1 May 2009 18:41:27 -0000 1.1004 @@ -1,2 +1,2 @@ 64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2 -87c6fbf4096b644d66d4da8bb00641a5 patch-2.6.29.1.bz2 +a3e79545ef18ff2a172f82fffef92deb patch-2.6.29.2.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v retrieving revision 1.914 retrieving revision 1.915 diff -u -p -r1.914 -r1.915 --- upstream 2 Apr 2009 23:41:47 -0000 1.914 +++ upstream 1 May 2009 18:41:27 -0000 1.915 @@ -1,2 +1,2 @@ linux-2.6.29.tar.bz2 -patch-2.6.29.1.bz2 +patch-2.6.29.2.bz2 --- linux-2.6-acer-wmi-bail-on-aao.patch DELETED --- --- linux-2.6-e820-mark-esi-clobbered.patch DELETED --- --- linux-2.6-kvm-kconfig-irqchip.patch DELETED --- --- linux-2.6-kvm-mask-notifiers.patch DELETED --- --- linux-2.6-kvm-reset-pit-irq-on-unmask.patch DELETED --- --- linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch DELETED --- --- linux-2.6-mm-define-unique-value-for-as_unevictable.patch DELETED --- --- linux-2.6-net-fix-another-gro-bug.patch DELETED --- --- linux-2.6-posix-timers-fix-clock-monotonicity.patch DELETED --- --- linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch DELETED --- --- linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch DELETED --- --- linux-2.6-v4l-dvb-fixes.patch DELETED --- --- linux-2.6-v4l-dvb-update.patch DELETED --- --- linux-2.6.29.1-sparc-regression.patch DELETED --- --- pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch DELETED --- --- patch-2.6.29.1.bz2.sign DELETED --- From deji at fedoraproject.org Fri May 1 18:55:56 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Fri, 1 May 2009 18:55:56 +0000 (UTC) Subject: rpms/tracker/devel .cvsignore, 1.16, 1.17 import.log, 1.1, 1.2 sources, 1.16, 1.17 tracker.spec, 1.50, 1.51 Message-ID: <20090501185556.200667012F@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/tracker/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21685/devel Modified Files: .cvsignore import.log sources tracker.spec Log Message: Update to 0.6.94 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tracker/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 11 Apr 2009 02:15:59 -0000 1.16 +++ .cvsignore 1 May 2009 18:55:25 -0000 1.17 @@ -1 +1 @@ -tracker-0.6.93.tar.bz2 +tracker-0.6.94.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/tracker/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 11 Apr 2009 02:15:59 -0000 1.1 +++ import.log 1 May 2009 18:55:25 -0000 1.2 @@ -1 +1,2 @@ tracker-0_6_93-1_fc11:HEAD:tracker-0.6.93-1.fc11.src.rpm:1239415821 +tracker-0_6_94-1_fc11:HEAD:tracker-0.6.94-1.fc11.src.rpm:1241204096 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tracker/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- sources 11 Apr 2009 02:15:59 -0000 1.16 +++ sources 1 May 2009 18:55:25 -0000 1.17 @@ -1 +1 @@ -768059a486ff73ae18595afab3b78a70 tracker-0.6.93.tar.bz2 +12d05088ef186c75bce9d1d6fb90e04a tracker-0.6.94.tar.bz2 Index: tracker.spec =================================================================== RCS file: /cvs/pkgs/rpms/tracker/devel/tracker.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- tracker.spec 11 Apr 2009 02:15:59 -0000 1.50 +++ tracker.spec 1 May 2009 18:55:25 -0000 1.51 @@ -1,6 +1,6 @@ Summary: An object database, tag/metadata database, search tool and indexer Name: tracker -Version: 0.6.93 +Version: 0.6.94 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -154,6 +154,9 @@ fi %{_sysconfdir}/xdg/autostart/tracker-applet.desktop %changelog +* Fri May 01 2009 Deji Akingunola - 0.6.94-1 +- Update to 0.6.94 release + * Thu Apr 09 2009 Deji Akingunola - 0.6.93-1 - Update to 0.6.93 release From deji at fedoraproject.org Fri May 1 18:57:41 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Fri, 1 May 2009 18:57:41 +0000 (UTC) Subject: rpms/tracker/F-11 .cvsignore, 1.16, 1.17 import.log, 1.1, 1.2 sources, 1.16, 1.17 tracker.spec, 1.50, 1.51 Message-ID: <20090501185741.9D4C570133@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/tracker/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22664/F-11 Modified Files: .cvsignore import.log sources tracker.spec Log Message: Update to 0.6.94 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tracker/F-11/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 11 Apr 2009 02:15:59 -0000 1.16 +++ .cvsignore 1 May 2009 18:57:39 -0000 1.17 @@ -1 +1 @@ -tracker-0.6.93.tar.bz2 +tracker-0.6.94.tar.bz2 From sandeen at fedoraproject.org Fri May 1 19:00:04 2009 From: sandeen at fedoraproject.org (Eric Sandeen) Date: Fri, 1 May 2009 19:00:04 +0000 (UTC) Subject: rpms/kernel/F-11 linux-2.6-ext4-prealloc-fixes.patch, NONE, 1.1 kernel.spec, 1.1581, 1.1582 Message-ID: <20090501190004.98C8B7012F@cvs1.fedora.phx.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23430 Modified Files: kernel.spec Added Files: linux-2.6-ext4-prealloc-fixes.patch Log Message: * Fri May 01 2009 Eric Sandeen - Fix ext4 corruption on partial write into prealloc block linux-2.6-ext4-prealloc-fixes.patch: --- NEW FILE linux-2.6-ext4-prealloc-fixes.patch --- We need to mark the buffer_head mapping prealloc space as new during write_begin. Otherwise we don't zero out the page cache content properly for a partial write. This will cause file corruption with preallocation. Also use block number -1 as the fake block number so that unmap_underlying_metadata doesn't drop wrong buffer_head Signed-off-by: Aneesh Kumar K.V Block number '0' should not be used as the fake block number for the delayed new buffer. This will result in vfs calling umap_underlying_metadata for block number '0'. So use -1 instead. Signed-off-by: Aneesh Kumar K.V --- fs/ext4/inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Index: linux-2.6.29.noarch/fs/ext4/inode.c =================================================================== --- linux-2.6.29.noarch.orig/fs/ext4/inode.c +++ linux-2.6.29.noarch/fs/ext4/inode.c @@ -2318,11 +2318,21 @@ static int ext4_da_get_block_prep(struct /* not enough space to reserve */ return ret; - map_bh(bh_result, inode->i_sb, 0); + map_bh(bh_result, inode->i_sb, -1); set_buffer_new(bh_result); set_buffer_delay(bh_result); } else if (ret > 0) { bh_result->b_size = (ret << inode->i_blkbits); + /* + * With sub-block writes into unwritten extents + * we also need to mark the buffer as new so that + * the unwritten parts of the buffer gets correctly zeroed. + */ + if (buffer_unwritten(bh_result)) { + bh_result->b_bdev = inode->i_sb->s_bdev; + set_buffer_new(bh_result); + bh_result->b_blocknr = -1; + } ret = 0; } Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1581 retrieving revision 1.1582 diff -u -p -r1.1581 -r1.1582 --- kernel.spec 1 May 2009 18:41:25 -0000 1.1581 +++ kernel.spec 1 May 2009 18:59:33 -0000 1.1582 @@ -711,6 +711,7 @@ Patch2903: linux-2.6-revert-dvb-net-kabi # fs fixes Patch2920: linux-2.6-ext4-flush-on-close.patch Patch2921: linux-2.6-ext4-really-print-warning-once.patch +Patch2922: linux-2.6-ext4-prealloc-fixes.patch Patch3000: linux-2.6-btrfs-experimental-branch.patch Patch3001: linux-2.6-btrfs-fix-umount-hang.patch @@ -1185,6 +1186,7 @@ ApplyPatch linux-2.6-execshield.patch # ext4 ApplyPatch linux-2.6-ext4-flush-on-close.patch ApplyPatch linux-2.6-ext4-really-print-warning-once.patch +ApplyPatch linux-2.6-ext4-prealloc-fixes.patch # xfs @@ -1960,6 +1962,9 @@ fi # and build. %changelog +* Fri May 01 2009 Eric Sandeen +- Fix ext4 corruption on partial write into prealloc block + * Thu Apr 30 2009 Kyle McMartin 2.6.29.2-119 - Update to 2.6.29.2 - Patches rebased: From pkgdb at fedoraproject.org Fri May 1 19:15:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:26 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191526.4FF2710F888@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on squeak-vm (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:31 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191531.DAA9310F894@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on squeak-vm (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:34 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191534.6037C10F896@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on squeak-vm (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:40 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191540.3CCE010F899@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on squeak-vm (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:42 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191542.4999610F89C@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on squeak-vm (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:44 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191545.00EE610F85F@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on squeak-vm (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:50 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191550.C2E6D10F89E@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on squeak-vm (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:52 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191552.2E9BD10F8A1@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on squeak-vm (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:53 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191553.EAEFD10F8A4@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on squeak-vm (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:15:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:15:59 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191559.C7BA810F896@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on squeak-vm (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:16:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:16:00 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191600.D85BC10F8A6@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on squeak-vm (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:16:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:16:02 +0000 Subject: [pkgdb] squeak-vm had acl change status Message-ID: <20090501191602.BA13510F8A9@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on squeak-vm (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm From pkgdb at fedoraproject.org Fri May 1 19:17:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:32 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191732.DA19710F896@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on squeak-image (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:29 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191729.C3CEE10F893@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on squeak-image (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:32 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191733.059CE10F899@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on squeak-image (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:37 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191737.9146010F87D@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on squeak-image (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:40 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191740.9D38C10F89D@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on squeak-image (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:40 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191740.B0E8810F8A0@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on squeak-image (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:45 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191745.C1BC510F893@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on squeak-image (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:47 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191747.D019310F896@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on squeak-image (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:49 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191749.C982010F8A7@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on squeak-image (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:55 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191756.0C6F810F89A@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on squeak-image (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:56 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191756.3960C10F8AB@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on squeak-image (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:17:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:17:57 +0000 Subject: [pkgdb] squeak-image had acl change status Message-ID: <20090501191758.0D5E210F897@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on squeak-image (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image From pkgdb at fedoraproject.org Fri May 1 19:18:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:18:54 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191854.A5CD010F8A1@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on etoys (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:18:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:18:56 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191856.1A19810F8A4@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on etoys (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:18:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:18:58 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191858.C3BDC10F8A8@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on etoys (Fedora devel) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:01 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191901.653F010F8B2@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on etoys (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:00 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191900.1373110F8AC@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on etoys (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:03 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191903.2F8C010F8AD@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on etoys (Fedora 10) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:08 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191908.2992810F898@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on etoys (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:08 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191908.DCAAF10F8B6@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on etoys (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:10 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191910.B2DA610F8B9@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on etoys (Fedora 9) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:13 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191913.D198510F8BD@bastion2.fedora.phx.redhat.com> gavin has set the watchbugzilla acl on etoys (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:16 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191917.134E610F8AE@bastion2.fedora.phx.redhat.com> gavin has set the watchcommits acl on etoys (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From pkgdb at fedoraproject.org Fri May 1 19:19:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 19:19:17 +0000 Subject: [pkgdb] etoys had acl change status Message-ID: <20090501191917.F1F0910F8BC@bastion2.fedora.phx.redhat.com> gavin has set the commit acl on etoys (Fedora 11) to Approved for tuxbrewr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etoys From mmahut at fedoraproject.org Fri May 1 19:38:15 2009 From: mmahut at fedoraproject.org (Marek Mahut) Date: Fri, 1 May 2009 19:38:15 +0000 (UTC) Subject: rpms/irssi/devel irssi-config.h, NONE, 1.1 irssi.spec, 1.37, 1.38 config.h, 1.1, NONE irssi-0.8.12-multiarch.patch, 1.1, NONE Message-ID: <20090501193815.C671A7012F@cvs1.fedora.phx.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/irssi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30309 Modified Files: irssi.spec Added Files: irssi-config.h Removed Files: config.h irssi-0.8.12-multiarch.patch Log Message: upstream release 0.8.13 --- NEW FILE irssi-config.h --- #include #if __WORDSIZE == 32 #include "irssi-config-32.h" #elif __WORDSIZE == 64 #include "irssi-config-64.h" #else #error "Unknown word size" #endif Index: irssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- irssi.spec 25 Feb 2009 08:05:30 -0000 1.37 +++ irssi.spec 1 May 2009 19:37:45 -0000 1.38 @@ -2,14 +2,14 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi -Version: 0.8.12 -Release: 13%{?dist} +Version: 0.8.13 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://irssi.org/ -Source0: http://irssi.org/files/irssi-%{version}.tar.bz2 -Source1: config.h +Source0: http://irssi.org/files/irssi-%{version}.tar.gz +Source1: irssi-config.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ncurses-devel openssl-devel zlib-devel @@ -45,14 +45,14 @@ being maintained. --with-perl-lib=vendor make %{_smp_mflags} -mv config.h config-$(getconf LONG_BIT).h -cp -p %{SOURCE1} config.h +mv irssi-config.h irssi-config-$(getconf LONG_BIT).h +cp -p %{SOURCE1} irssi-config.h %install rm -rf $RPM_BUILD_ROOT %makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p" -install -p config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/config-$(getconf LONG_BIT).h +install -p irssi-config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/irssi-config-$(getconf LONG_BIT).h rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name} @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 1 2009 Marek Mahut - 0.8.13-1 +- Upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.12-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- config.h DELETED --- --- irssi-0.8.12-multiarch.patch DELETED --- From mmahut at fedoraproject.org Fri May 1 19:48:12 2009 From: mmahut at fedoraproject.org (Marek Mahut) Date: Fri, 1 May 2009 19:48:12 +0000 (UTC) Subject: rpms/irssi/devel .cvsignore,1.9,1.10 sources,1.9,1.10 Message-ID: <20090501194812.5A2D77012F@cvs1.fedora.phx.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/irssi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31712 Modified Files: .cvsignore sources Log Message: new source file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/irssi/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 8 Oct 2007 20:58:12 -0000 1.9 +++ .cvsignore 1 May 2009 19:47:41 -0000 1.10 @@ -1 +1 @@ -irssi-0.8.12.tar.bz2 +irssi-0.8.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/irssi/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 8 Oct 2007 20:58:12 -0000 1.9 +++ sources 1 May 2009 19:47:41 -0000 1.10 @@ -1 +1 @@ -e407b557b3cfc7c91ce4de2571dd79cb irssi-0.8.12.tar.bz2 +226f194576895ff3075c164523806d06 irssi-0.8.13.tar.gz From thomasvs at fedoraproject.org Fri May 1 20:04:33 2009 From: thomasvs at fedoraproject.org (Thomas Vander Stichele) Date: Fri, 1 May 2009 20:04:33 +0000 (UTC) Subject: rpms/mach/EL-5 mach.spec,1.13,1.14 Message-ID: <20090501200433.307027012F@cvs1.fedora.phx.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/mach/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2407 Modified Files: mach.spec Log Message: update to 0.9.4 Index: mach.spec =================================================================== RCS file: /cvs/extras/rpms/mach/EL-5/mach.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- mach.spec 13 Sep 2007 16:24:13 -0000 1.13 +++ mach.spec 1 May 2009 20:04:02 -0000 1.14 @@ -1,6 +1,6 @@ Name: mach -Version: 0.9.2 -Release: 3%{?dist}.1 +Version: 0.9.4 +Release: 1%{?dist} Summary: Make a chroot Group: Applications/System @@ -107,6 +107,10 @@ fi %attr(04750,root,mach) %{_sbindir}/mach-helper %changelog +* Fri May 01 2009 Thomas Vander Stichele +- 0.9.4-1 +- Update to 0.9.4 release + * Thu Sep 13 2007 Ville Skytt?? - 0.9.2-3.1 - Patch to default to CentOS configs also when built on RHEL. From thomasvs at fedoraproject.org Fri May 1 20:09:09 2009 From: thomasvs at fedoraproject.org (Thomas Vander Stichele) Date: Fri, 1 May 2009 20:09:09 +0000 (UTC) Subject: rpms/mach/EL-5 .cvsignore,1.5,1.6 sources,1.7,1.8 Message-ID: <20090501200909.9C6CA7012F@cvs1.fedora.phx.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/mach/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3334 Modified Files: .cvsignore sources Log Message: update sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mach/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 12 Sep 2007 18:45:03 -0000 1.5 +++ .cvsignore 1 May 2009 20:08:39 -0000 1.6 @@ -1 +1,2 @@ mach-0.9.2.tar.bz2 +mach-0.9.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mach/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 12 Sep 2007 18:45:03 -0000 1.7 +++ sources 1 May 2009 20:08:39 -0000 1.8 @@ -1 +1,2 @@ 4e8aa40b2c44e7565b4fd665741fb95e mach-0.9.2.tar.bz2 +2717f5120d25ab971a1599e0902ca965 mach-0.9.4.tar.bz2 From ssp at fedoraproject.org Fri May 1 20:13:32 2009 From: ssp at fedoraproject.org (Soren Sandmann Pedersen) Date: Fri, 1 May 2009 20:13:32 +0000 (UTC) Subject: rpms/rdesktop/devel rdesktop.spec,1.33,1.34 Message-ID: <20090501201332.3B61B7012F@cvs1.fedora.phx.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/rdesktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4196 Modified Files: rdesktop.spec Log Message: Add smartcard support Index: rdesktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/rdesktop/devel/rdesktop.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- rdesktop.spec 25 Feb 2009 19:15:29 -0000 1.33 +++ rdesktop.spec 1 May 2009 20:13:01 -0000 1.34 @@ -1,6 +1,6 @@ Name: rdesktop Version: 1.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X client for remote desktop into Windows Terminal Server Group: User Interface/Desktops @@ -8,7 +8,8 @@ License: GPLv2+ URL: http://www.rdesktop.org/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, libX11-devel +BuildRequires: openssl-devel, libX11-devel, pcsc-lite-devel +Requires: pcsc-lite %description rdesktop is an open source client for Windows NT Terminal Server and @@ -20,7 +21,7 @@ desktop. Unlike Citrix ICA, no server ex %setup -q %build -%configure --with-ipv6 +%configure --with-ipv6 --enable-smartcard make %{?_smp_mflags} %install @@ -38,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Fri May 1 2009 Soren Sandmann - 1.6.0-5 +- Enable SmartCard support + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sailer at fedoraproject.org Fri May 1 20:18:02 2009 From: sailer at fedoraproject.org (Thomas M. Sailer) Date: Fri, 1 May 2009 20:18:02 +0000 (UTC) Subject: rpms/mingw32-zlib/devel minizip-1.2.3-malloc.patch, NONE, 1.1 zlib-1.2.3-autotools.patch, NONE, 1.1 mingw32-zlib.spec, 1.5, 1.6 Message-ID: <20090501201802.EE5927012F@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/mingw32-zlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4925 Modified Files: mingw32-zlib.spec Added Files: minizip-1.2.3-malloc.patch zlib-1.2.3-autotools.patch Log Message: - use buildsystem from native zlib package - add mingw32-minizip package minizip-1.2.3-malloc.patch: --- NEW FILE minizip-1.2.3-malloc.patch --- diff -up zlib-1.2.3/contrib/minizip/miniunz.c.pom zlib-1.2.3/contrib/minizip/miniunz.c --- zlib-1.2.3/contrib/minizip/miniunz.c.pom 2005-07-12 20:08:40.000000000 +0200 +++ zlib-1.2.3/contrib/minizip/miniunz.c 2008-12-01 11:12:23.000000000 +0100 @@ -112,6 +112,11 @@ int makedir (newdir) return 0; buffer = (char*)malloc(len+1); + if (buffer==NULL) + { + printf("Error allocating memory\n"); + return UNZ_INTERNALERROR; + } strcpy(buffer,newdir); if (buffer[len-1] == '/') { zlib-1.2.3-autotools.patch: --- NEW FILE zlib-1.2.3-autotools.patch --- diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am --- zlib-1.2.3.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ zlib-1.2.3.kasal/Makefile.am 2009-03-17 17:58:36.000000000 +0100 @@ -0,0 +1,67 @@ +ACLOCAL_AMFLAGS = -I m4 --install + +lib_LTLIBRARIES = libz.la + +libz_la_SOURCES = \ + adler32.c \ + compress.c \ + crc32.c \ + crc32.h \ + gzio.c \ + uncompr.c \ + deflate.c \ + deflate.h \ + trees.c \ + trees.h \ + zutil.c \ + zutil.h \ + inflate.c \ + inflate.h \ + infback.c \ + inftrees.c \ + inftrees.h \ + inffast.c \ + inffast.h \ + infflate.h + +# Use -version-number to match the file name used before autoconfiscation. +libz_la_LDFLAGS = -version-number 1:2:3 -no-undefined + +include_HEADERS = zlib.h +nodist_include_HEADERS = zconf.h + +dist_man_MANS = zlib.3 + +## libminizip: + +lib_LTLIBRARIES += libminizip.la + +libminizip_la_SOURCES = \ + contrib/minizip/ioapi.c \ + contrib/minizip/mztools.c \ + contrib/minizip/unzip.c \ + contrib/minizip/zip.c + +# do not build the static version of libminizip +libminizip_la_CFLAGS = -shared +libminizip_la_LDFLAGS = -version-info 1:0:0 -no-undefined +libminizip_la_LIBADD = libz.la + +minizip_includedir = $(includedir)/minizip +minizip_include_HEADERS = \ + contrib/minizip/crypt.h \ + contrib/minizip/ioapi.h \ + contrib/minizip/mztools.h \ + contrib/minizip/unzip.h \ + contrib/minizip/zip.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = minizip.pc + +EXTRA_PROGRAMS = miniunzip minizip + +miniunzip_SOURCES = contrib/minizip/miniunz.c +miniunzip_LDADD = libminizip.la + +minizip_SOURCES = contrib/minizip/minizip.c +minizip_LDADD = libminizip.la diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac --- zlib-1.2.3.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ zlib-1.2.3.kasal/configure.ac 2009-03-17 17:28:41.000000000 +0100 @@ -0,0 +1,13 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_INIT([zlib], [1.2.3], [bugzilla.redhat.com]) +AC_CONFIG_SRCDIR([minigzip.c]) +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([foreign]) +LT_INIT + +AC_SUBST([HAVE_UNISTD_H], [0]) +AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) +AC_CONFIG_FILES([Makefile minizip.pc zconf.h:zconf.in.h]) +AC_OUTPUT diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in --- zlib-1.2.3.orig/minizip.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ zlib-1.2.3.kasal/minizip.pc.in 2009-01-07 15:49:34.000000000 +0100 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@/minizip + +Name: minizip +Description: Minizip zip file manipulation library +Requires: +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lminizip -lz +Cflags: -I${includedir} diff -urN zlib-1.2.3.orig/zconf.in.h zlib-1.2.3.kasal/zconf.in.h --- zlib-1.2.3.orig/zconf.in.h 2005-05-28 08:40:35.000000000 +0200 +++ zlib-1.2.3.kasal/zconf.in.h 2009-03-17 17:17:11.000000000 +0100 @@ -284,7 +284,7 @@ typedef Byte *voidp; #endif -#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ +#if @HAVE_UNISTD_H@ /* HAVE_UNISTD_H -- this line is updated by ./configure */ # include /* for off_t */ # include /* for SEEK_* and off_t */ # ifdef VMS Index: mingw32-zlib.spec =================================================================== RCS file: /cvs/extras/rpms/mingw32-zlib/devel/mingw32-zlib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- mingw32-zlib.spec 10 Mar 2009 12:43:42 -0000 1.5 +++ mingw32-zlib.spec 1 May 2009 20:17:32 -0000 1.6 @@ -6,27 +6,25 @@ Name: mingw32-zlib Version: 1.2.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: MinGW Windows zlib compression library License: zlib Group: Development/Libraries URL: http://www.zlib.net/ Source0: http://www.zlib.net/zlib-%{version}.tar.gz +Patch3: zlib-1.2.3-autotools.patch +Patch6: minizip-1.2.3-malloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# From Fedora native package, none is applicable to us. -#Patch3: zlib-1.2.3-autotools.patch -#Patch4: minizip-1.2.3-autotools.patch -#Patch5: zlib-1.2.3-minizip.patch - # MinGW-specific patches. Patch100: zlib-win32.patch BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils +BuildRequires: perl %description @@ -40,14 +38,29 @@ Requires: mingw32-zlib = %{version}-%{re %description static The mingw32-zlib-static package contains static library for mingw32-zlib development. +%package -n mingw32-minizip +Summary: Minizip manipulates files from a .zip archive +Group: Development/Libraries +Requires: mingw32-zlib = %{version}-%{release} + +%description -n mingw32-minizip +MinGW Minizip manipulates files from a .zip archive. + %prep %setup -q -n zlib-1.2.3 - %patch100 -p1 - +cp -r . x || : +%patch3 -p1 -b .atools +# patch cannot create an empty dir +mkdir m4 +%patch6 -p1 -b .mal +iconv -f windows-1252 -t utf-8 ChangeLog.tmp +mv ChangeLog.tmp ChangeLog +cp Makefile Makefile.old %build +pushd x CC=%{_mingw32_cc} \ CFLAGS="%{_mingw32_cflags}" \ RANLIB=%{_mingw32_ranlib} \ @@ -61,28 +74,30 @@ make -f win32/Makefile.gcc \ DLLWRAP=i686-pc-mingw32-dllwrap \ STRIP=%{_mingw32_strip} \ all +popd + +autoreconf --install; +%{_mingw32_configure} +make %{?_smp_mflags} libz.la +perl -i -pe 's,libz-1.dll,zlib1.dll,' libz.la +rm -f libz.dll.a +cp x/libzdll.a libz.dll.a +cp x/zlib1.dll . +rm -f .libs/libz.dll.a +cp x/libzdll.a .libs/libz.dll.a +cp x/zlib1.dll .libs/ +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir} -mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir} -mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir} - -make -f win32/Makefile.gcc \ - INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw32_includedir} \ - LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw32_libdir} \ - BINARY_PATH=$RPM_BUILD_ROOT%{_mingw32_bindir} \ - install - -# .dll.a file is misnamed for some reason - fix that. -mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libzdll.a \ - $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.dll.a +make install DESTDIR=$RPM_BUILD_ROOT -# Do NOT remove static library. -# rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a +rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir} +rm -f $RPM_BUILD_ROOT/%{_mingw32_bindir}/libz-1.dll +install x/zlib1.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/ %clean rm -rf $RPM_BUILD_ROOT @@ -94,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_includedir}/zlib.h %{_mingw32_libdir}/libz.dll.a %{_mingw32_bindir}/zlib1.dll +%{_mingw32_libdir}/libz.la %files static @@ -101,7 +117,21 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libz.a +%files -n mingw32-minizip +%defattr(-,root,root,-) +%doc contrib/minizip/ChangeLogUnzip +%{_mingw32_libdir}/libminizip.dll.a +%{_mingw32_libdir}/libminizip.la +%{_mingw32_bindir}/libminizip-1.dll +%dir %{_mingw32_includedir}/minizip +%{_mingw32_includedir}/minizip/*.h +%{_mingw32_libdir}/pkgconfig/minizip.pc + + %changelog +* Thu Apr 30 2009 Thomas Sailer - 1.2.3-16 +- use autotools build system from native package + * Mon Mar 3 2009 W. Pilorz - 1.2.3-15 - Add static subpackage. From thomasvs at fedoraproject.org Fri May 1 20:25:05 2009 From: thomasvs at fedoraproject.org (Thomas Vander Stichele) Date: Fri, 1 May 2009 20:25:05 +0000 (UTC) Subject: rpms/mach/EL-5 mach.spec,1.14,1.15 Message-ID: <20090501202505.AECF87012F@cvs1.fedora.phx.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/mach/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5995 Modified Files: mach.spec Log Message: remove patch Index: mach.spec =================================================================== RCS file: /cvs/extras/rpms/mach/EL-5/mach.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- mach.spec 1 May 2009 20:04:02 -0000 1.14 +++ mach.spec 1 May 2009 20:24:35 -0000 1.15 @@ -7,7 +7,6 @@ Group: Applications/System License: GPLv2+ URL: http://thomas.apestaart.org/projects/mach/ Source: http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.9.2-centos4rhel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python @@ -47,9 +46,6 @@ Thomas Vander Stichele (thomas (at) apes %prep %setup -q -touch -r configure.in configure.in.stamp -%patch0 -p1 -touch -r configure.in.stamp configure.in %build %configure \ @@ -110,6 +106,7 @@ fi * Fri May 01 2009 Thomas Vander Stichele - 0.9.4-1 - Update to 0.9.4 release +- Remove CentOS patch that has been upstreamed * Thu Sep 13 2007 Ville Skytt?? - 0.9.2-3.1 - Patch to default to CentOS configs also when built on RHEL. From pkgdb at fedoraproject.org Fri May 1 20:33:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:33:04 +0000 Subject: [pkgdb] bind-dyndb-ldap was added for mnagy Message-ID: <20090501203305.0213B10F888@bastion2.fedora.phx.redhat.com> ausil has added Package bind-dyndb-ldap with summary LDAP back-end plug-in for BIND ausil has approved Package bind-dyndb-ldap ausil has added a Fedora devel branch for bind-dyndb-ldap with an owner of mnagy ausil has approved bind-dyndb-ldap in Fedora devel ausil has approved Package bind-dyndb-ldap ausil has set commit to Approved for provenpackager on bind-dyndb-ldap (Fedora devel) ausil has set build to Approved for provenpackager on bind-dyndb-ldap (Fedora devel) ausil has set checkout to Approved for provenpackager on bind-dyndb-ldap (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap From ausil at fedoraproject.org Fri May 1 20:33:14 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:33:14 +0000 (UTC) Subject: rpms/bind-dyndb-ldap - New directory Message-ID: <20090501203314.2B11D7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/bind-dyndb-ldap In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsXY8002/rpms/bind-dyndb-ldap Log Message: Directory /cvs/pkgs/rpms/bind-dyndb-ldap added to the repository From ausil at fedoraproject.org Fri May 1 20:33:14 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:33:14 +0000 (UTC) Subject: rpms/bind-dyndb-ldap/devel - New directory Message-ID: <20090501203314.5FC1D7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/bind-dyndb-ldap/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsXY8002/rpms/bind-dyndb-ldap/devel Log Message: Directory /cvs/pkgs/rpms/bind-dyndb-ldap/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:33:22 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:33:22 +0000 (UTC) Subject: rpms/bind-dyndb-ldap Makefile,NONE,1.1 Message-ID: <20090501203322.E584C7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/bind-dyndb-ldap In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsXY8002/rpms/bind-dyndb-ldap Added Files: Makefile Log Message: Setup of module bind-dyndb-ldap --- NEW FILE Makefile --- # Top level Makefile for module bind-dyndb-ldap 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 pkgdb at fedoraproject.org Fri May 1 20:33:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:33:06 +0000 Subject: [pkgdb] bind-dyndb-ldap (Fedora, 11) updated by ausil Message-ID: <20090501203306.8266310F894@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for bind-dyndb-ldap ausil has set commit to Approved for provenpackager on bind-dyndb-ldap (Fedora 11) ausil has set build to Approved for provenpackager on bind-dyndb-ldap (Fedora 11) ausil has set checkout to Approved for provenpackager on bind-dyndb-ldap (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap From ausil at fedoraproject.org Fri May 1 20:33:23 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:33:23 +0000 (UTC) Subject: rpms/bind-dyndb-ldap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501203323.26E0C7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/bind-dyndb-ldap/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsXY8002/rpms/bind-dyndb-ldap/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bind-dyndb-ldap --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: bind-dyndb-ldap # $Id: Makefile,v 1.1 2009/05/01 20:33:23 ausil Exp $ NAME := bind-dyndb-ldap 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 sailer at fedoraproject.org Fri May 1 20:36:53 2009 From: sailer at fedoraproject.org (Thomas M. Sailer) Date: Fri, 1 May 2009 20:36:53 +0000 (UTC) Subject: rpms/mingw32-zlib/devel mingw32-zlib.spec,1.6,1.7 Message-ID: <20090501203653.61C717012F@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/mingw32-zlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8613 Modified Files: mingw32-zlib.spec Log Message: fix BR's Index: mingw32-zlib.spec =================================================================== RCS file: /cvs/extras/rpms/mingw32-zlib/devel/mingw32-zlib.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- mingw32-zlib.spec 1 May 2009 20:17:32 -0000 1.6 +++ mingw32-zlib.spec 1 May 2009 20:36:22 -0000 1.7 @@ -6,7 +6,7 @@ Name: mingw32-zlib Version: 1.2.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: MinGW Windows zlib compression library License: zlib @@ -25,6 +25,9 @@ BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: perl +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool %description @@ -129,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 1 2009 Thomas Sailer - 1.2.3-17 +- BR autoconf, automake, libtool + * Thu Apr 30 2009 Thomas Sailer - 1.2.3-16 - use autotools build system from native package From notting at fedoraproject.org Fri May 1 20:38:23 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Fri, 1 May 2009 20:38:23 +0000 (UTC) Subject: rpms/initscripts/F-11 .cvsignore, 1.164, 1.165 initscripts.spec, 1.193, 1.194 sources, 1.183, 1.184 Message-ID: <20090501203823.9C7F27012F@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/initscripts/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9119 Modified Files: .cvsignore initscripts.spec sources Log Message: 8.95-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initscripts/F-11/.cvsignore,v retrieving revision 1.164 retrieving revision 1.165 diff -u -p -r1.164 -r1.165 --- .cvsignore 7 Apr 2009 15:54:31 -0000 1.164 +++ .cvsignore 1 May 2009 20:37:53 -0000 1.165 @@ -1 +1 @@ -initscripts-8.94.tar.bz2 +initscripts-8.95.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/extras/rpms/initscripts/F-11/initscripts.spec,v retrieving revision 1.193 retrieving revision 1.194 diff -u -p -r1.193 -r1.194 --- initscripts.spec 7 Apr 2009 15:54:31 -0000 1.193 +++ initscripts.spec 1 May 2009 20:37:53 -0000 1.194 @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.94 +Version: 8.95 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -249,6 +249,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri May 1 2009 Bill Nottingham - 8.95-1 +- don't kill runlevel events on subsequent entering of the same runlevel (#498514) +- lang.*sh: handle spaces in $HOME (#498482) +- network-functions: explicitly source from the proper directory. (#496233) +- remove persistent names on sys-unconfig. (#448322) +- init.d/functions: cgexec has moved to /bin (#495715) +- allow changing of VLAN type even if the module is already loaded. (#495053, ) +- translation updates: fr, ml, pt + * Tue Apr 7 2009 Bill Nottingham - 8.94-1 - prefdm: add simple fallbacks, sort rpmdb query for consistency (#494461) - translation updates; bn, de, pt, ru, te Index: sources =================================================================== RCS file: /cvs/extras/rpms/initscripts/F-11/sources,v retrieving revision 1.183 retrieving revision 1.184 diff -u -p -r1.183 -r1.184 --- sources 7 Apr 2009 15:54:31 -0000 1.183 +++ sources 1 May 2009 20:37:53 -0000 1.184 @@ -1 +1 @@ -bb0ee36cf2b695a669bb9efae0d67cb4 initscripts-8.94.tar.bz2 +b3c74ef959cf07dd6f9ba4fa878bd559 initscripts-8.95.tar.bz2 From kyle at fedoraproject.org Fri May 1 20:40:06 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Fri, 1 May 2009 20:40:06 +0000 (UTC) Subject: rpms/kernel/F-11 git-bluetooth3.patch, NONE, 1.1 linux-2.6-v4l-dvb-fixes.patch, 1.14, 1.15 config-generic, 1.278, 1.279 kernel.spec, 1.1582, 1.1583 linux-2.6-v4l-dvb-experimental.patch, 1.9, 1.10 Message-ID: <20090501204006.C21F27012F@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9706 Modified Files: config-generic kernel.spec linux-2.6-v4l-dvb-experimental.patch Added Files: git-bluetooth3.patch linux-2.6-v4l-dvb-fixes.patch Log Message: * Fri May 01 2009 Kyle McMartin 2.6.29.2-121 - More bluetooth fixes from 2.6.30-rc. - linux-2.6-v4l-dvb-fixes.patch: restore, accidently nuked. - linux-2.6-v4l-dvb-experimental.patch: restore to previous version to fix rejects against restored -fixes. git-bluetooth3.patch: --- NEW FILE git-bluetooth3.patch --- commit 3fdca1e1370ffe89980927cdef0583bebcd8caaf Author: Marcel Holtmann Date: Tue Apr 28 09:04:55 2009 -0700 Bluetooth: Fix connection establishment with low security requirement The Bluetooth 2.1 specification introduced four different security modes that can be mapped using Legacy Pairing and Simple Pairing. With the usage of Simple Pairing it is required that all connections (except the ones for SDP) are encrypted. So even the low security requirement mandates an encrypted connection when using Simple Pairing. When using Legacy Pairing (for Bluetooth 2.0 devices and older) this is not required since it causes interoperability issues. To support this properly the low security requirement translates into different host controller transactions depending if Simple Pairing is supported or not. However in case of Simple Pairing the command to switch on encryption after a successful authentication is not triggered for the low security mode. This patch fixes this and actually makes the logic to differentiate between Simple Pairing and Legacy Pairing a lot simpler. Based on a report by Ville Tervo Signed-off-by: Marcel Holtmann commit 052b30b0a8eec8db5b18ad49effdf2a9ba4c1e1a Author: Marcel Holtmann Date: Sun Apr 26 20:01:22 2009 +0200 Bluetooth: Add different pairing timeout for Legacy Pairing The Bluetooth stack uses a reference counting for all established ACL links and if no user (L2CAP connection) is present, the link will be terminated to save power. The problem part is the dedicated pairing when using Legacy Pairing (Bluetooth 2.0 and before). At that point no user is present and pairing attempts will be disconnected within 10 seconds or less. In previous kernel version this was not a problem since the disconnect timeout wasn't triggered on incoming connections for the first time. However this caused issues with broken host stacks that kept the connections around after dedicated pairing. When the support for Simple Pairing got added, the link establishment procedure needed to be changed and now causes issues when using Legacy Pairing When using Simple Pairing it is possible to do a proper reference counting of ACL link users. With Legacy Pairing this is not possible since the specification is unclear in some areas and too many broken Bluetooth devices have already been deployed. So instead of trying to deal with all the broken devices, a special pairing timeout will be introduced that increases the timeout to 60 seconds when pairing is triggered. If a broken devices now puts the stack into an unforeseen state, the worst that happens is the disconnect timeout triggers after 120 seconds instead of 4 seconds. This allows successful pairings with legacy and broken devices now. Based on a report by Johan Hedberg Signed-off-by: Marcel Holtmann commit f3784d834c71689336fa272df420b45345cb6b84 Author: Roger Quadros Date: Thu Apr 23 14:50:54 2009 +0300 Bluetooth: Ensure that HCI sysfs add/del is preempt safe Use a different work_struct variables for add_conn() and del_conn() and use single work queue instead of two for adding and deleting connections. It eliminates the following error on a preemptible kernel: [ 204.358032] Unable to handle kernel NULL pointer dereference at virtual address 0000000c [ 204.370697] pgd = c0004000 [ 204.373443] [0000000c] *pgd=00000000 [ 204.378601] Internal error: Oops: 17 [#1] PREEMPT [ 204.383361] Modules linked in: vfat fat rfcomm sco l2cap sd_mod scsi_mod iphb pvr2d drm omaplfb ps [ 204.438537] CPU: 0 Not tainted (2.6.28-maemo2 #1) [ 204.443664] PC is at klist_put+0x2c/0xb4 [ 204.447601] LR is at klist_put+0x18/0xb4 [ 204.451568] pc : [] lr : [] psr: a0000113 [ 204.451568] sp : cf1b3f10 ip : cf1b3f10 fp : cf1b3f2c [ 204.463104] r10: 00000000 r9 : 00000000 r8 : bf08029c [ 204.468353] r7 : c7869200 r6 : cfbe2690 r5 : c78692c8 r4 : 00000001 [ 204.474945] r3 : 00000001 r2 : cf1b2000 r1 : 00000001 r0 : 00000000 [ 204.481506] Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel [ 204.488861] Control: 10c5387d Table: 887fc018 DAC: 00000017 [ 204.494628] Process btdelconn (pid: 515, stack limit = 0xcf1b22e0) Signed-off-by: Roger Quadros Signed-off-by: Marcel Holtmann diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index f69f015..ed3aea1 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -101,6 +101,7 @@ enum { /* HCI timeouts */ #define HCI_CONNECT_TIMEOUT (40000) /* 40 seconds */ #define HCI_DISCONN_TIMEOUT (2000) /* 2 seconds */ +#define HCI_PAIRING_TIMEOUT (60000) /* 60 seconds */ #define HCI_IDLE_TIMEOUT (6000) /* 6 seconds */ #define HCI_INIT_TIMEOUT (10000) /* 10 seconds */ diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 01f9316..be5bd71 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -171,6 +171,7 @@ struct hci_conn { __u8 auth_type; __u8 sec_level; __u8 power_save; + __u16 disc_timeout; unsigned long pend; unsigned int sent; @@ -180,7 +181,8 @@ struct hci_conn { struct timer_list disc_timer; struct timer_list idle_timer; - struct work_struct work; + struct work_struct work_add; + struct work_struct work_del; struct device dev; @@ -348,9 +350,9 @@ static inline void hci_conn_put(struct hci_conn *conn) if (conn->type == ACL_LINK) { del_timer(&conn->idle_timer); if (conn->state == BT_CONNECTED) { - timeo = msecs_to_jiffies(HCI_DISCONN_TIMEOUT); + timeo = msecs_to_jiffies(conn->disc_timeout); if (!conn->out) - timeo *= 5; + timeo *= 2; } else timeo = msecs_to_jiffies(10); } else diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 1181db0..375f4b4 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -215,6 +215,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) conn->state = BT_OPEN; conn->power_save = 1; + conn->disc_timeout = HCI_DISCONN_TIMEOUT; switch (type) { case ACL_LINK: @@ -424,12 +425,9 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) if (sec_level == BT_SECURITY_SDP) return 1; - if (sec_level == BT_SECURITY_LOW) { - if (conn->ssp_mode > 0 && conn->hdev->ssp_mode > 0) - return hci_conn_auth(conn, sec_level, auth_type); - else - return 1; - } + if (sec_level == BT_SECURITY_LOW && + (!conn->ssp_mode || !conn->hdev->ssp_mode)) + return 1; if (conn->link_mode & HCI_LM_ENCRYPT) return hci_conn_auth(conn, sec_level, auth_type); diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 15f40ea..4e7cb88 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -883,6 +883,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s if (conn->type == ACL_LINK) { conn->state = BT_CONFIG; hci_conn_hold(conn); + conn->disc_timeout = HCI_DISCONN_TIMEOUT; } else conn->state = BT_CONNECTED; @@ -1063,9 +1064,14 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s hci_proto_connect_cfm(conn, ev->status); hci_conn_put(conn); } - } else + } else { hci_auth_cfm(conn, ev->status); + hci_conn_hold(conn); + conn->disc_timeout = HCI_DISCONN_TIMEOUT; + hci_conn_put(conn); + } + if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) { if (!ev->status) { struct hci_cp_set_conn_encrypt cp; @@ -1479,7 +1485,21 @@ static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb) { + struct hci_ev_pin_code_req *ev = (void *) skb->data; + struct hci_conn *conn; + BT_DBG("%s", hdev->name); + + hci_dev_lock(hdev); + + conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); + if (conn) { + hci_conn_hold(conn); + conn->disc_timeout = HCI_PAIRING_TIMEOUT; + hci_conn_put(conn); + } + + hci_dev_unlock(hdev); } static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb) @@ -1489,7 +1509,21 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb) { + struct hci_ev_link_key_notify *ev = (void *) skb->data; + struct hci_conn *conn; + BT_DBG("%s", hdev->name); + + hci_dev_lock(hdev); + + conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); + if (conn) { + hci_conn_hold(conn); + conn->disc_timeout = HCI_DISCONN_TIMEOUT; + hci_conn_put(conn); + } + + hci_dev_unlock(hdev); } static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb) diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index ed82796..b7c5108 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -9,8 +9,7 @@ struct class *bt_class = NULL; EXPORT_SYMBOL_GPL(bt_class); -static struct workqueue_struct *btaddconn; -static struct workqueue_struct *btdelconn; +static struct workqueue_struct *bluetooth; static inline char *link_typetostr(int type) { @@ -88,9 +87,10 @@ static struct device_type bt_link = { static void add_conn(struct work_struct *work) { - struct hci_conn *conn = container_of(work, struct hci_conn, work); + struct hci_conn *conn = container_of(work, struct hci_conn, work_add); - flush_workqueue(btdelconn); + /* ensure previous add/del is complete */ + flush_workqueue(bluetooth); if (device_add(&conn->dev) < 0) { BT_ERR("Failed to register connection device"); @@ -114,9 +114,9 @@ void hci_conn_add_sysfs(struct hci_conn *conn) device_initialize(&conn->dev); - INIT_WORK(&conn->work, add_conn); + INIT_WORK(&conn->work_add, add_conn); - queue_work(btaddconn, &conn->work); + queue_work(bluetooth, &conn->work_add); } /* @@ -131,9 +131,12 @@ static int __match_tty(struct device *dev, void *data) static void del_conn(struct work_struct *work) { - struct hci_conn *conn = container_of(work, struct hci_conn, work); + struct hci_conn *conn = container_of(work, struct hci_conn, work_del); struct hci_dev *hdev = conn->hdev; + /* ensure previous add/del is complete */ + flush_workqueue(bluetooth); + while (1) { struct device *dev; @@ -156,9 +159,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn) if (!device_is_registered(&conn->dev)) return; - INIT_WORK(&conn->work, del_conn); + INIT_WORK(&conn->work_del, del_conn); - queue_work(btdelconn, &conn->work); + queue_work(bluetooth, &conn->work_del); } static inline char *host_typetostr(int type) @@ -435,20 +438,13 @@ void hci_unregister_sysfs(struct hci_dev *hdev) int __init bt_sysfs_init(void) { - btaddconn = create_singlethread_workqueue("btaddconn"); - if (!btaddconn) - return -ENOMEM; - - btdelconn = create_singlethread_workqueue("btdelconn"); - if (!btdelconn) { - destroy_workqueue(btaddconn); + bluetooth = create_singlethread_workqueue("bluetooth"); + if (!bluetooth) return -ENOMEM; - } bt_class = class_create(THIS_MODULE, "bluetooth"); if (IS_ERR(bt_class)) { - destroy_workqueue(btdelconn); - destroy_workqueue(btaddconn); + destroy_workqueue(bluetooth); return PTR_ERR(bt_class); } @@ -457,8 +453,7 @@ int __init bt_sysfs_init(void) void bt_sysfs_cleanup(void) { - destroy_workqueue(btaddconn); - destroy_workqueue(btdelconn); + destroy_workqueue(bluetooth); class_destroy(bt_class); } linux-2.6-v4l-dvb-fixes.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -p -N -r 1.14 -r 1.15 linux-2.6-v4l-dvb-fixes.patch Index: linux-2.6-v4l-dvb-fixes.patch =================================================================== RCS file: linux-2.6-v4l-dvb-fixes.patch diff -N linux-2.6-v4l-dvb-fixes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-v4l-dvb-fixes.patch 1 May 2009 20:40:05 -0000 1.15 @@ -0,0 +1,113100 @@ +Abylay Ospan (5): + V4L/DVB (10796): Add init code for NetUP Dual DVB-S2 CI card + V4L/DVB (10797): Add EEPROM code for NetUP Dual DVB-S2 CI card. + V4L/DVB (10798): Add CIMax(R) SP2 Common Interface code for NetUP Dual DVB-S2 CI card + V4L/DVB (11056): Bug fix in NetUP: restore high address lines in CI + V4L/DVB (11057): Fix CiMax stability in Netup Dual DVB-S2 CI + +Adam Baker (2): + V4L/DVB (10639): gspca - sq905: New subdriver. + V4L/DVB (10829): Support alternate resolutions for sq905 + +Alan Cox (2): + V4L/DVB (11243): cx88: Missing failure checks + V4L/DVB (11244): pluto2: silence spew of card hung up messages + +Alan McIvor (1): + V4L/DVB (11124): Add support for ProVideo PV-183 to bttv + +Alexey Klimov (18): + V4L/DVB (10316): v4l/dvb: use usb_make_path in usb-radio drivers + V4L/DVB (10324): em28xx: Correct mailing list + V4L/DVB (10335): gspca - all subdrivers: Fix CodingStyle in sd_mod_init function. + V4L/DVB (10336): gspca - all subdrivers: Return ret instead of -1 in sd_mod_init. + V4L/DVB (10455): radio-mr800: codingstyle cleanups + V4L/DVB (10456): radio-mr800: place dev_err instead of dev_warn + V4L/DVB (10457): radio-mr800: add more dev_err messages in probe + V4L/DVB (10458): radio-mr800: move radio start and stop in one function + V4L/DVB (10459): radio-mr800: fix amradio_set_freq + V4L/DVB (10460): radio-mr800: add stereo support + V4L/DVB (10461): radio-mr800: add few lost mutex locks + V4L/DVB (10462): radio-mr800: increase version and add comments + V4L/DVB (10463): radio-mr800: fix checking of retval after usb_bulk_msg + V4L/DVB (10464): radio-si470x: use usb_make_path in usb-radio drivers + V4L/DVB (10465): dsbr100: Add few lost mutex locks. + V4L/DVB (10522): em28xx-audio: replace printk with em28xx_errdev + V4L/DVB (10946): radio-rtrack2: fix double mutex_unlock + V4L/DVB (10961): radio-terratec: remove linux/delay.h which hadn't been used. + +Andy Walls (44): + V4L/DVB (10274): cx18: Fix a PLL divisor update for the I2S master clock + V4L/DVB (10275): cx18: Additional debug to display outgoing mailbox parameters + V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18 + V4L/DVB (10277): cx18, cx2341x: Fix bugs in cx18 AC3 control and comply with V4L2 spec + V4L/DVB (10278): cx18: Fix bad audio in first analog capture. + V4L/DVB (10279): cx18: Print driver version number when logging status + V4L/DVB (10280): cx18: Rename structure members: dev to pci_dev and v4l2dev to video_dev + V4L/DVB (10281): cx18: Conversion to new V4L2 framework: use v4l2_device object + V4L/DVB (10283): cx18: Call request_module() with proper argument types. + V4L/DVB (10284): cx18: Add initial entry for a Leadtek DVR3100 H hybrid card + V4L/DVB (10433): cx18: Defer A/V core initialization until a valid cx18_av_cmd arrives + V4L/DVB (10434): cx18: Smarter verification of CX18_AUDIO_ENABLE register writes + V4L/DVB (10435): cx18: Normalize APU after second APU firmware load + V4L/DVB (10436): cx18: Fix coding style of a switch statement per checkpatch.pl + V4L/DVB (10437): cx18: Remove an unused spinlock + V4L/DVB (10439): cx18: Clean-up and enable sliced VBI handling + V4L/DVB (10440): cx18: Fix presentation timestamp (PTS) for VBI buffers + V4L/DVB (10441): cx18: Fix VBI ioctl() handling and Raw/Sliced VBI state management + V4L/DVB (10442): cx18: Fixes for enforcing when Encoder Raw VBI params can be set + V4L/DVB (10443): cx18: Use correct line counts per field in firmware API call + V4L/DVB (10444): cx18: Fix sliced VBI PTS and fix artifacts in last raw line of field + V4L/DVB (10445): cx18: Process Raw VBI on a whole frame basis; fix VBI buffer size + V4L/DVB (10446): cx18: Finally get sliced VBI working - for 525 line 60 Hz systems at least + V4L/DVB (10755): cx18: Convert the integrated A/V decoder core interface to a v4l2_subdev + V4L/DVB (10756): cx18: Slim down instance handling, build names from v4l2_device.name + V4L/DVB (10757): cx18, v4l2-chip-ident: Finish conversion of AV decoder core to v4l2_subdev + V4L/DVB (10758): cx18: Convert I2C devices to v4l2_subdevices + V4L/DVB (10759): cx18: Convert GPIO connected functions to act as v4l2_subdevices + V4L/DVB (10760): cx18: Fix a memory leak of buffers used for sliced VBI insertion + V4L/DVB (10761): cx18: Change log lines for internal subdevs and fix tveeprom reads + V4L/DVB (10762): cx18: Get rid of unused variables related to video output + V4L/DVB (10763): cx18: Increment version number due to significant changes for v4l2_subdevs + V4L/DVB (10764): cx18: Disable AC3 controls as the firmware doesn't support AC3 + V4L/DVB (10850): cx18: Use strlcpy() instead of strncpy() for temp eeprom i2c_client setup + V4L/DVB (10851): cx18: Fix a video scaling check problem introduced by sliced VBI changes + V4L/DVB (10852): cx18: Include cx18-audio.h in cx18-audio.c to eliminate s-parse warning + V4L/DVB (10853): cx18: Fix s-parse warnings and a logic error about extracting the VBI PTS + V4L/DVB (10854): cx18: Correct comments about vertical and horizontal blanking timings + V4L/DVB (10855): cx18: Fix VPS service register codes + V4L/DVB (10856): cx18: Add interlock so sliced VBI insertion only happens for an MPEG PS + V4L/DVB (11042): v4l2-api: Add definitions for V4L2_MPEG_STREAM_VBI_FMT_IVTV payloads + V4L/DVB (11091): cx18, ivtv: Ensure endianess for linemasks in VBI embedded in MPEG stream + V4L/DVB (11092): cx18: Optimize processing of VBI buffers from the capture unit + V4L/DVB (11233): mxl5005s: Switch in mxl5005s_set_params should operate on correct values + +Antoine Jacquet (1): + V4L/DVB (10263): zr364xx: add support for Aiptek DV T300 + +Antonio Ospite (2): + V4L/DVB (10344): gspca - ov534: Disable the Hercules webcams. + V4L/DVB (10676): mt9m111: Call icl->reset() on mt9m111_reset(). + +Antti Palosaari (4): + V4L/DVB (10286): af9015: add new USB ID for KWorld DVB-T 395U + V4L/DVB (10329): af9015: remove dual_mode module param + V4L/DVB (11215): zl10353: add support for Intel CE6230 and Intel CE6231 + V4L/DVB (11216): Add driver for Intel CE6230 DVB-T USB2.0 + +Arne Luehrs (1): + V4L/DVB (10319): dib0700: enable IR receiver in Nova TD usb stick (52009) + +Artem Makhutov (1): + V4L/DVB (11248): Remove debug output from stb6100_cfg.h + +Bruno Christo (1): + V4L/DVB (10827): Add support for GeoVision GV-800(S) + +Daniel Gl??ckner (1): + V4L/DVB (11242): allow v4l2 drivers to provide a get_unmapped_area handler + +Devin Heitmueller (36): + V4L/DVB (10320): dib0700: fix i2c error message to make data type clear + V4L/DVB (10321): dib0700: Report dib0700_i2c_enumeration failures + V4L/DVB (11059): xc5000: fix bug for hybrid xc5000 devices with IF other than 5380 + V4L/DVB (11060): au8522: rename the au8522.c source file + V4L/DVB (11061): au8522: move shared state and common functions into a separate header files + V4L/DVB (11062): au8522: fix register read/write high bits + V4L/DVB (11063): au8522: power down the digital demod when not in use + V4L/DVB (11064): au8522: make use of hybrid framework so analog/digital demod can share state + V4L/DVB (11065): au8522: add support for analog side of demodulator + V4L/DVB (11066): au0828: add support for analog functionality in bridge + V4L/DVB (11067): au0828: workaround a bug in the au0828 i2c handling + V4L/DVB (11068): au0828: add analog profile for the HVR-850 + V4L/DVB (11069): au8522: add mutex protecting use of hybrid state + V4L/DVB (11070): au0828: Rework the way the analog video binding occurs + V4L/DVB (11071): tveeprom: add the xc5000 tuner to the tveeprom definition + V4L/DVB (11072): au0828: advertise only NTSC-M (as opposed to all NTSC standards) + V4L/DVB (11073): au0828: disable VBI code since it doesn't yet work + V4L/DVB (11074): au0828: fix i2c enumeration bug + V4L/DVB (11075): au0828: make register debug lines easier to read + V4L/DVB (11076): au0828: make g_chip_ident call work properly + V4L/DVB (11077): au0828: properly handle missing analog USB endpoint + V4L/DVB (11078): au0828: properly handle non-existent analog inputs + V4L/DVB (11079): au0828: fix panic on disconnect if analog initialization failed + V4L/DVB (11080): au0828: Convert to use v4l2_device/subdev framework + V4L/DVB (11081): au0828: make sure v4l2_device name is unique + V4L/DVB (11082): au0828: remove memset calls in v4l2 routines. + V4L/DVB (11083): au0828: remove some unneeded braces + V4L/DVB (11084): au0828: add entry for undefined input type + V4L/DVB (11085): au0828/au8522: Codingstyle fixes + V4L/DVB (11086): au0828: rename macro for currently non-function VBI support + V4L/DVB (11088): au0828: finish videodev/subdev conversion + V4L/DVB (11089): au8522: finish conversion to v4l2_device/subdev + V4L/DVB (11139): em28xx: add remote control definition for HVR-900 (both versions) + V4L/DVB (11140): usbvision: fix oops on ARM platform when allocating transfer buffers + V4L/DVB (11141): em28xx: fix oops on ARM platform when allocating transfer buffers + V4L/DVB (11142): au0828: fix oops on ARM platform when allocating transfer buffers + +Douglas Kosovic (1): + V4L/DVB (10299): bttv: Add support for IVCE-8784 support for V4L2 bttv driver + +Douglas Schilling Landgraf (13): + V4L/DVB (10323): em28xx: Add entry for GADMEI TVR200 + V4L/DVB (10326): em28xx: Cleanup: fix bad whitespacing + V4L/DVB (10327): em28xx: Add check before call em28xx_isoc_audio_deinit() + V4L/DVB (10517): em28xx: remove bad check (changeset a31c595188af) + V4L/DVB (10520): em28xx-audio: Add spinlock for trigger + V4L/DVB (10521): em28xx-audio: Add lock for users + V4L/DVB (10523): em28xx-audio: Add macros EM28XX_START_AUDIO / EM28XX_STOP_AUDIO + V4L/DVB (10524): em28xx: Add DVC 101 model to Pinnacle Dazzle description + V4L/DVB (10556): em28xx-cards: Add Pinnacle Dazzle Video Creator Plus DVC107 description + V4L/DVB (10739): em28xx-cards: remove incorrect entry + V4L/DVB (10740): em28xx-cards: Add SIIG AVTuner-PVR board + V4L/DVB (10741): em28xx: Add Kaiser Baas Video to DVD maker support + V4L/DVB (11222): gspca - zc3xx: The webcam DLink DSB - C320 has the sensor pas106. + +Erik Andren (3): + V4L/DVB (10334): gspca - stv06xx: Rework control description. + V4L/DVB (10341): gspca - stv06xx: Plug a memory leak in the pb0100 sensor driver. + V4L/DVB (10342): gspca - stv06xx: Add ctrl caching to the vv6410. + +Erik S. Beiser (1): + V4L/DVB (10826): cx88: Add IR support to pcHDTV HD3000 & HD5500 + +Guennadi Liakhovetski (9): + V4L/DVB (10665): soc-camera: add data signal polarity flags to drivers + V4L/DVB (10672): sh_mobile_ceu_camera: include NV* formats into the format list only once. + V4L/DVB (10673): mt9t031: fix gain and hflip controls, register update, and scaling + V4L/DVB (10674): soc-camera: camera host driver for i.MX3x SoCs + V4L/DVB (10675): soc-camera: extend soc_camera_bus_param_compatible with more tests + V4L/DVB (11024): soc-camera: separate S_FMT and S_CROP operations + V4L/DVB (11025): soc-camera: configure drivers with a default format on open + V4L/DVB (11026): sh-mobile-ceu-camera: set field to the value, configured at open() + V4L/DVB (11027): soc-camera: configure drivers with a default format at probe time + +Hans Verkuil (171): + V4L/DVB (10231): v4l2-subdev: add v4l2_ext_controls support + V4L/DVB (10244): v4l2: replace a few snprintfs with strlcpy + V4L/DVB (10246): saa6752hs: convert to v4l2_subdev. + V4L/DVB (10247): saa7134: convert to the new v4l2 framework. + V4L/DVB (10249): v4l2-common: added v4l2_i2c_tuner_addrs() + V4L/DVB (10251): cx25840: add comments explaining what the init() does. + V4L/DVB (10252): v4l2 doc: explain why v4l2_device_unregister_subdev() has to be called. + V4L/DVB (10271): saa7146: convert to video_ioctl2. [...112707 lines suppressed...] +- return 0; +- case VIDIOCSFREQ: +- if(copy_from_user(&tea->freq, arg, sizeof(tea->freq))) +- return -EFAULT; +- snd_tea575x_set_freq(tea); +- return 0; +- case VIDIOCGAUDIO: +- { +- struct video_audio v; +- memset(&v, 0, sizeof(v)); +- strcpy(v.name, "Radio"); +- if(copy_to_user(arg,&v, sizeof(v))) +- return -EFAULT; ++ } ++ return -EINVAL; ++} ++ ++static int vidioc_g_ctrl(struct file *file, void *priv, ++ struct v4l2_control *ctrl) ++{ ++ struct snd_tea575x *tea = video_drvdata(file); ++ ++ switch (ctrl->id) { ++ case V4L2_CID_AUDIO_MUTE: ++ if (tea->ops->mute) { ++ ctrl->value = tea->mute; + return 0; + } +- case VIDIOCSAUDIO: +- { +- struct video_audio v; +- if(copy_from_user(&v, arg, sizeof(v))) +- return -EFAULT; +- if (tea->ops->mute) +- tea->ops->mute(tea, +- (v.flags & +- VIDEO_AUDIO_MUTE) ? 1 : 0); +- if(v.audio) +- return -EINVAL; ++ } ++ return -EINVAL; ++} ++ ++static int vidioc_s_ctrl(struct file *file, void *priv, ++ struct v4l2_control *ctrl) ++{ ++ struct snd_tea575x *tea = video_drvdata(file); ++ ++ switch (ctrl->id) { ++ case V4L2_CID_AUDIO_MUTE: ++ if (tea->ops->mute) { ++ tea->ops->mute(tea, ctrl->value); ++ tea->mute = 1; + return 0; + } +- default: +- return -ENOIOCTLCMD; + } ++ return -EINVAL; ++} ++ ++static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i) ++{ ++ *i = 0; ++ return 0; + } + +-static void snd_tea575x_release(struct video_device *vfd) ++static int vidioc_s_input(struct file *filp, void *priv, unsigned int i) + { ++ if (i != 0) ++ return -EINVAL; ++ return 0; + } + + static int snd_tea575x_exclusive_open(struct file *file) +@@ -189,50 +260,91 @@ static int snd_tea575x_exclusive_release(struct file *file) + return 0; + } + ++static const struct v4l2_file_operations tea575x_fops = { ++ .owner = THIS_MODULE, ++ .open = snd_tea575x_exclusive_open, ++ .release = snd_tea575x_exclusive_release, ++ .ioctl = video_ioctl2, ++}; ++ ++static const struct v4l2_ioctl_ops tea575x_ioctl_ops = { ++ .vidioc_querycap = vidioc_querycap, ++ .vidioc_g_tuner = vidioc_g_tuner, ++ .vidioc_s_tuner = vidioc_s_tuner, ++ .vidioc_g_audio = vidioc_g_audio, ++ .vidioc_s_audio = vidioc_s_audio, ++ .vidioc_g_input = vidioc_g_input, ++ .vidioc_s_input = vidioc_s_input, ++ .vidioc_g_frequency = vidioc_g_frequency, ++ .vidioc_s_frequency = vidioc_s_frequency, ++ .vidioc_queryctrl = vidioc_queryctrl, ++ .vidioc_g_ctrl = vidioc_g_ctrl, ++ .vidioc_s_ctrl = vidioc_s_ctrl, ++}; ++ ++static struct video_device tea575x_radio = { ++ .name = "tea575x-tuner", ++ .fops = &tea575x_fops, ++ .ioctl_ops = &tea575x_ioctl_ops, ++ .release = video_device_release, ++}; ++ + /* + * initialize all the tea575x chips + */ + void snd_tea575x_init(struct snd_tea575x *tea) + { ++ int retval; + unsigned int val; ++ struct video_device *tea575x_radio_inst; + + val = tea->ops->read(tea); + if (val == 0x1ffffff || val == 0) { +- snd_printk(KERN_ERR "Cannot find TEA575x chip\n"); ++ snd_printk(KERN_ERR ++ "tea575x-tuner: Cannot find TEA575x chip\n"); + return; + } + +- memset(&tea->vd, 0, sizeof(tea->vd)); +- strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio"); +- tea->vd.release = snd_tea575x_release; +- video_set_drvdata(&tea->vd, tea); +- tea->vd.fops = &tea->fops; + tea->in_use = 0; +- tea->fops.owner = tea->card->module; +- tea->fops.open = snd_tea575x_exclusive_open; +- tea->fops.release = snd_tea575x_exclusive_release; +- tea->fops.ioctl = snd_tea575x_ioctl; +- if (video_register_device(&tea->vd, VFL_TYPE_RADIO, tea->dev_nr - 1) < 0) { +- snd_printk(KERN_ERR "unable to register tea575x tuner\n"); ++ tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40; ++ tea->freq = 90500 * 16; /* 90.5Mhz default */ ++ ++ tea575x_radio_inst = video_device_alloc(); ++ if (tea575x_radio_inst == NULL) { ++ printk(KERN_ERR "tea575x-tuner: not enough memory\n"); + return; + } +- tea->vd_registered = 1; + +- tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40; +- tea->freq = 90500 * 16; /* 90.5Mhz default */ ++ memcpy(tea575x_radio_inst, &tea575x_radio, sizeof(tea575x_radio)); ++ ++ strcpy(tea575x_radio.name, tea->tea5759 ? ++ "TEA5759 radio" : "TEA5757 radio"); ++ ++ video_set_drvdata(tea575x_radio_inst, tea); ++ ++ retval = video_register_device(tea575x_radio_inst, ++ VFL_TYPE_RADIO, radio_nr); ++ if (retval) { ++ printk(KERN_ERR "tea575x-tuner: can't register video device!\n"); ++ kfree(tea575x_radio_inst); ++ return; ++ } + + snd_tea575x_set_freq(tea); + + /* mute on init */ +- if (tea->ops->mute) ++ if (tea->ops->mute) { + tea->ops->mute(tea, 1); ++ tea->mute = 1; ++ } ++ tea->vd = tea575x_radio_inst; + } + + void snd_tea575x_exit(struct snd_tea575x *tea) + { +- if (tea->vd_registered) { +- video_unregister_device(&tea->vd); +- tea->vd_registered = 0; ++ if (tea->vd) { ++ video_unregister_device(tea->vd); ++ tea->vd = NULL; + } + } + +diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig +index 82b9bdd..6cc18bf 100644 +--- a/sound/pci/Kconfig ++++ b/sound/pci/Kconfig +@@ -487,7 +487,7 @@ config SND_FM801 + config SND_FM801_TEA575X_BOOL + bool "ForteMedia FM801 + TEA5757 tuner" + depends on SND_FM801 +- depends on VIDEO_V4L1=y || VIDEO_V4L1=SND_FM801 ++ depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 + help + Say Y here to include support for soundcards based on the ForteMedia + FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v retrieving revision 1.278 retrieving revision 1.279 diff -u -p -r1.278 -r1.279 --- config-generic 1 May 2009 18:41:25 -0000 1.278 +++ config-generic 1 May 2009 20:40:05 -0000 1.279 @@ -2276,7 +2276,7 @@ CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAESTRO=m CONFIG_MEDIA_ATTACH=y -# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set # # Digital Video Broadcasting Devices Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1582 retrieving revision 1.1583 diff -u -p -r1.1582 -r1.1583 --- kernel.spec 1 May 2009 18:59:33 -0000 1.1582 +++ kernel.spec 1 May 2009 20:40:05 -0000 1.1583 @@ -587,6 +587,7 @@ Patch09: linux-2.6-upstream-reverts.patc Patch10: git-cpufreq.patch Patch11: git-bluetooth.patch Patch12: git-bluetooth2.patch +Patch13: git-bluetooth3.patch # Standalone patches Patch20: linux-2.6-hotfixes.patch @@ -704,6 +705,7 @@ Patch2201: linux-2.6-firewire-git-pendin # silence the ACPI blacklist code Patch2802: linux-2.6-silence-acpi-blacklist.patch +Patch2900: linux-2.6-v4l-dvb-fixes.patch Patch2901: linux-2.6-v4l-dvb-experimental.patch Patch2902: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch @@ -1134,6 +1136,7 @@ fi #ApplyPatch git-cpufreq.patch ApplyPatch git-bluetooth.patch ApplyPatch git-bluetooth2.patch +ApplyPatch git-bluetooth3.patch ApplyPatch linux-2.6-hotfixes.patch @@ -1354,6 +1357,7 @@ C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-fire ApplyPatch linux-2.6-silence-acpi-blacklist.patch # V4L/DVB updates/fixes/experimental drivers +ApplyPatch linux-2.6-v4l-dvb-fixes.patch ApplyPatch linux-2.6-v4l-dvb-experimental.patch ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch @@ -1962,6 +1966,12 @@ fi # and build. %changelog +* Fri May 01 2009 Kyle McMartin 2.6.29.2-121 +- More bluetooth fixes from 2.6.30-rc. +- linux-2.6-v4l-dvb-fixes.patch: restore, accidently nuked. +- linux-2.6-v4l-dvb-experimental.patch: restore to previous version + to fix rejects against restored -fixes. + * Fri May 01 2009 Eric Sandeen - Fix ext4 corruption on partial write into prealloc block linux-2.6-v4l-dvb-experimental.patch: Index: linux-2.6-v4l-dvb-experimental.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-v4l-dvb-experimental.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- linux-2.6-v4l-dvb-experimental.patch 1 May 2009 18:41:26 -0000 1.9 +++ linux-2.6-v4l-dvb-experimental.patch 1 May 2009 20:40:05 -0000 1.10 @@ -392,10 +392,10 @@ index 0000000..31ba8c5 +MODULE_AUTHOR("Pierre Ossman"); +MODULE_LICENSE("GPL"); diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig -index 19cf3b8..2409065 100644 +index 76bad58..58abbe3 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig -@@ -819,6 +819,8 @@ source "drivers/media/video/pvrusb2/Kconfig" +@@ -795,6 +795,8 @@ source "drivers/media/video/hdpvr/Kconfig" source "drivers/media/video/em28xx/Kconfig" @@ -405,10 +405,10 @@ index 19cf3b8..2409065 100644 source "drivers/media/video/usbvideo/Kconfig" diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile -index 72f6d03..13cd579 100644 +index b904674..08765d8 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile -@@ -70,6 +70,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o +@@ -67,6 +67,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ obj-$(CONFIG_VIDEO_CX88) += cx88/ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ @@ -14281,7 +14281,7 @@ index 0000000..aa4a23e +} +#endif diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c -index d199d80..95e3f95 100644 +index 93d74be..2f846f5 100644 --- a/drivers/media/video/cx25840/cx25840-audio.c +++ b/drivers/media/video/cx25840/cx25840-audio.c @@ -32,7 +32,7 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq) @@ -14420,10 +14420,10 @@ index d199d80..95e3f95 100644 static int get_volume(struct i2c_client *client) diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c -index 25eb3be..7d6b0bb 100644 +index 737ee4e..f8ed3c0 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c -@@ -348,6 +348,77 @@ static void cx23885_initialize(struct i2c_client *client) +@@ -345,6 +345,77 @@ static void cx23885_initialize(struct i2c_client *client) /* ----------------------------------------------------------------------- */ @@ -14501,7 +14501,7 @@ index 25eb3be..7d6b0bb 100644 void cx25840_std_setup(struct i2c_client *client) { struct cx25840_state *state = to_state(i2c_get_clientdata(client)); -@@ -417,39 +488,41 @@ void cx25840_std_setup(struct i2c_client *client) +@@ -414,39 +485,41 @@ void cx25840_std_setup(struct i2c_client *client) } /* DEBUG: Displays configured PLL frequency */ @@ -14575,7 +14575,7 @@ index 25eb3be..7d6b0bb 100644 } /* Sets horizontal blanking delay and active lines */ -@@ -599,7 +672,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp +@@ -596,7 +669,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp * configuration in reg (for the cx23885) so we have no * need to attempt to flip bits for earlier av decoders. */ @@ -14584,7 +14584,7 @@ index 25eb3be..7d6b0bb 100644 switch (aud_input) { case CX25840_AUDIO_SERIAL: /* do nothing, use serial audio input */ -@@ -622,7 +695,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp +@@ -619,7 +692,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp /* Set INPUT_MODE to Composite (0) or S-Video (1) */ cx25840_and_or(client, 0x401, ~0x6, is_composite ? 0 : 0x02); @@ -14593,7 +14593,7 @@ index 25eb3be..7d6b0bb 100644 /* Set CH_SEL_ADC2 to 1 if input comes from CH3 */ cx25840_and_or(client, 0x102, ~0x2, (reg & 0x80) == 0 ? 2 : 0); /* Set DUAL_MODE_ADC2 to 1 if input comes from both CH2&CH3 */ -@@ -662,6 +735,19 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp +@@ -659,6 +732,19 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp */ cx25840_write(client, 0x918, 0xa0); cx25840_write(client, 0x919, 0x01); @@ -14613,7 +14613,7 @@ index 25eb3be..7d6b0bb 100644 } return 0; -@@ -1113,6 +1199,8 @@ static int cx25840_init(struct v4l2_subdev *sd, u32 val) +@@ -1118,6 +1204,8 @@ static int cx25840_init(struct v4l2_subdev *sd, u32 val) cx25836_initialize(client); else if (state->is_cx23885) cx23885_initialize(client); @@ -14622,7 +14622,7 @@ index 25eb3be..7d6b0bb 100644 else cx25840_initialize(client); } -@@ -1168,7 +1256,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable) +@@ -1159,7 +1247,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable) v4l_dbg(1, cx25840_debug, client, "%s output\n", enable ? "enable" : "disable"); if (enable) { @@ -14631,7 +14631,7 @@ index 25eb3be..7d6b0bb 100644 u8 v = (cx25840_read(client, 0x421) | 0x0b); cx25840_write(client, 0x421, v); } else { -@@ -1178,7 +1266,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable) +@@ -1169,7 +1257,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable) state->is_cx25836 ? 0x04 : 0x07); } } else { @@ -14640,7 +14640,7 @@ index 25eb3be..7d6b0bb 100644 u8 v = cx25840_read(client, 0x421) & ~(0x0b); cx25840_write(client, 0x421, v); } else { -@@ -1356,6 +1444,8 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val) +@@ -1350,6 +1438,8 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val) cx25836_initialize(client); else if (state->is_cx23885) cx23885_initialize(client); @@ -14649,7 +14649,7 @@ index 25eb3be..7d6b0bb 100644 else cx25840_initialize(client); return 0; -@@ -1468,6 +1558,8 @@ static int cx25840_probe(struct i2c_client *client, +@@ -1449,6 +1539,8 @@ static int cx25840_probe(struct i2c_client *client, id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6; } else if (device_id == 0x1313) { id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6; @@ -14658,7 +14658,7 @@ index 25eb3be..7d6b0bb 100644 } else { v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n"); -@@ -1490,6 +1582,7 @@ static int cx25840_probe(struct i2c_client *client, +@@ -1471,6 +1563,7 @@ static int cx25840_probe(struct i2c_client *client, state->c = client; state->is_cx25836 = ((device_id & 0xff00) == 0x8300); state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313); @@ -14667,7 +14667,7 @@ index 25eb3be..7d6b0bb 100644 state->aud_input = CX25840_AUDIO8; state->audclk_freq = 48000; diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h -index be05582..93941be 100644 +index 9ad0eb8..814b565 100644 --- a/drivers/media/video/cx25840/cx25840-core.h +++ b/drivers/media/video/cx25840/cx25840-core.h @@ -50,6 +50,7 @@ struct cx25840_state { @@ -14718,17 +14718,17 @@ index 0b2dceb..0df53b0 100644 memcpy(buffer + 2, ptr, len); diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h -index 1ffc23b..d252c9b 100644 +index f27604a..f9d48c9 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h -@@ -87,6 +87,7 @@ +@@ -88,6 +88,7 @@ #define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */ #define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */ #define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ +#define I2C_HW_B_CX231XX 0x010024 /* Conexant CX231XX USB based cards */ + #define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */ /* --- SGI adapters */ - #define I2C_HW_SGI_VINO 0x160000 diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index ea1bf5b..3d7533d 100644 --- a/include/linux/mmc/sdio_ids.h From sailer at fedoraproject.org Fri May 1 20:42:28 2009 From: sailer at fedoraproject.org (Thomas M. Sailer) Date: Fri, 1 May 2009 20:42:28 +0000 (UTC) Subject: rpms/mingw32-zlib/F-11 minizip-1.2.3-malloc.patch, NONE, 1.1 zlib-1.2.3-autotools.patch, NONE, 1.1 mingw32-zlib.spec, 1.5, 1.6 Message-ID: <20090501204228.62CC17012F@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/mingw32-zlib/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10081 Modified Files: mingw32-zlib.spec Added Files: minizip-1.2.3-malloc.patch zlib-1.2.3-autotools.patch Log Message: build minizip library minizip-1.2.3-malloc.patch: --- NEW FILE minizip-1.2.3-malloc.patch --- diff -up zlib-1.2.3/contrib/minizip/miniunz.c.pom zlib-1.2.3/contrib/minizip/miniunz.c --- zlib-1.2.3/contrib/minizip/miniunz.c.pom 2005-07-12 20:08:40.000000000 +0200 +++ zlib-1.2.3/contrib/minizip/miniunz.c 2008-12-01 11:12:23.000000000 +0100 @@ -112,6 +112,11 @@ int makedir (newdir) return 0; buffer = (char*)malloc(len+1); + if (buffer==NULL) + { + printf("Error allocating memory\n"); + return UNZ_INTERNALERROR; + } strcpy(buffer,newdir); if (buffer[len-1] == '/') { zlib-1.2.3-autotools.patch: --- NEW FILE zlib-1.2.3-autotools.patch --- diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am --- zlib-1.2.3.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ zlib-1.2.3.kasal/Makefile.am 2009-03-17 17:58:36.000000000 +0100 @@ -0,0 +1,67 @@ +ACLOCAL_AMFLAGS = -I m4 --install + +lib_LTLIBRARIES = libz.la + +libz_la_SOURCES = \ + adler32.c \ + compress.c \ + crc32.c \ + crc32.h \ + gzio.c \ + uncompr.c \ + deflate.c \ + deflate.h \ + trees.c \ + trees.h \ + zutil.c \ + zutil.h \ + inflate.c \ + inflate.h \ + infback.c \ + inftrees.c \ + inftrees.h \ + inffast.c \ + inffast.h \ + infflate.h + +# Use -version-number to match the file name used before autoconfiscation. +libz_la_LDFLAGS = -version-number 1:2:3 -no-undefined + +include_HEADERS = zlib.h +nodist_include_HEADERS = zconf.h + +dist_man_MANS = zlib.3 + +## libminizip: + +lib_LTLIBRARIES += libminizip.la + +libminizip_la_SOURCES = \ + contrib/minizip/ioapi.c \ + contrib/minizip/mztools.c \ + contrib/minizip/unzip.c \ + contrib/minizip/zip.c + +# do not build the static version of libminizip +libminizip_la_CFLAGS = -shared +libminizip_la_LDFLAGS = -version-info 1:0:0 -no-undefined +libminizip_la_LIBADD = libz.la + +minizip_includedir = $(includedir)/minizip +minizip_include_HEADERS = \ + contrib/minizip/crypt.h \ + contrib/minizip/ioapi.h \ + contrib/minizip/mztools.h \ + contrib/minizip/unzip.h \ + contrib/minizip/zip.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = minizip.pc + +EXTRA_PROGRAMS = miniunzip minizip + +miniunzip_SOURCES = contrib/minizip/miniunz.c +miniunzip_LDADD = libminizip.la + +minizip_SOURCES = contrib/minizip/minizip.c +minizip_LDADD = libminizip.la diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac --- zlib-1.2.3.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ zlib-1.2.3.kasal/configure.ac 2009-03-17 17:28:41.000000000 +0100 @@ -0,0 +1,13 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_INIT([zlib], [1.2.3], [bugzilla.redhat.com]) +AC_CONFIG_SRCDIR([minigzip.c]) +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([foreign]) +LT_INIT + +AC_SUBST([HAVE_UNISTD_H], [0]) +AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) +AC_CONFIG_FILES([Makefile minizip.pc zconf.h:zconf.in.h]) +AC_OUTPUT diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in --- zlib-1.2.3.orig/minizip.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ zlib-1.2.3.kasal/minizip.pc.in 2009-01-07 15:49:34.000000000 +0100 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@/minizip + +Name: minizip +Description: Minizip zip file manipulation library +Requires: +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lminizip -lz +Cflags: -I${includedir} diff -urN zlib-1.2.3.orig/zconf.in.h zlib-1.2.3.kasal/zconf.in.h --- zlib-1.2.3.orig/zconf.in.h 2005-05-28 08:40:35.000000000 +0200 +++ zlib-1.2.3.kasal/zconf.in.h 2009-03-17 17:17:11.000000000 +0100 @@ -284,7 +284,7 @@ typedef Byte *voidp; #endif -#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ +#if @HAVE_UNISTD_H@ /* HAVE_UNISTD_H -- this line is updated by ./configure */ # include /* for off_t */ # include /* for SEEK_* and off_t */ # ifdef VMS Index: mingw32-zlib.spec =================================================================== RCS file: /cvs/extras/rpms/mingw32-zlib/F-11/mingw32-zlib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- mingw32-zlib.spec 10 Mar 2009 12:43:42 -0000 1.5 +++ mingw32-zlib.spec 1 May 2009 20:41:58 -0000 1.6 @@ -6,27 +6,28 @@ Name: mingw32-zlib Version: 1.2.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: MinGW Windows zlib compression library License: zlib Group: Development/Libraries URL: http://www.zlib.net/ Source0: http://www.zlib.net/zlib-%{version}.tar.gz +Patch3: zlib-1.2.3-autotools.patch +Patch6: minizip-1.2.3-malloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# From Fedora native package, none is applicable to us. -#Patch3: zlib-1.2.3-autotools.patch -#Patch4: minizip-1.2.3-autotools.patch -#Patch5: zlib-1.2.3-minizip.patch - # MinGW-specific patches. Patch100: zlib-win32.patch BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils +BuildRequires: perl +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool %description @@ -40,14 +41,29 @@ Requires: mingw32-zlib = %{version}-%{re %description static The mingw32-zlib-static package contains static library for mingw32-zlib development. +%package -n mingw32-minizip +Summary: Minizip manipulates files from a .zip archive +Group: Development/Libraries +Requires: mingw32-zlib = %{version}-%{release} + +%description -n mingw32-minizip +MinGW Minizip manipulates files from a .zip archive. + %prep %setup -q -n zlib-1.2.3 - %patch100 -p1 - +cp -r . x || : +%patch3 -p1 -b .atools +# patch cannot create an empty dir +mkdir m4 +%patch6 -p1 -b .mal +iconv -f windows-1252 -t utf-8 ChangeLog.tmp +mv ChangeLog.tmp ChangeLog +cp Makefile Makefile.old %build +pushd x CC=%{_mingw32_cc} \ CFLAGS="%{_mingw32_cflags}" \ RANLIB=%{_mingw32_ranlib} \ @@ -61,28 +77,30 @@ make -f win32/Makefile.gcc \ DLLWRAP=i686-pc-mingw32-dllwrap \ STRIP=%{_mingw32_strip} \ all +popd + +autoreconf --install; +%{_mingw32_configure} +make %{?_smp_mflags} libz.la +perl -i -pe 's,libz-1.dll,zlib1.dll,' libz.la +rm -f libz.dll.a +cp x/libzdll.a libz.dll.a +cp x/zlib1.dll . +rm -f .libs/libz.dll.a +cp x/libzdll.a .libs/libz.dll.a +cp x/zlib1.dll .libs/ +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir} -mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir} -mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir} - -make -f win32/Makefile.gcc \ - INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw32_includedir} \ - LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw32_libdir} \ - BINARY_PATH=$RPM_BUILD_ROOT%{_mingw32_bindir} \ - install - -# .dll.a file is misnamed for some reason - fix that. -mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libzdll.a \ - $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.dll.a +make install DESTDIR=$RPM_BUILD_ROOT -# Do NOT remove static library. -# rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a +rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir} +rm -f $RPM_BUILD_ROOT/%{_mingw32_bindir}/libz-1.dll +install x/zlib1.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/ %clean rm -rf $RPM_BUILD_ROOT @@ -94,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_includedir}/zlib.h %{_mingw32_libdir}/libz.dll.a %{_mingw32_bindir}/zlib1.dll +%{_mingw32_libdir}/libz.la %files static @@ -101,7 +120,21 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libz.a +%files -n mingw32-minizip +%defattr(-,root,root,-) +%doc contrib/minizip/ChangeLogUnzip +%{_mingw32_libdir}/libminizip.dll.a +%{_mingw32_libdir}/libminizip.la +%{_mingw32_bindir}/libminizip-1.dll +%dir %{_mingw32_includedir}/minizip +%{_mingw32_includedir}/minizip/*.h +%{_mingw32_libdir}/pkgconfig/minizip.pc + + %changelog +* Thu Apr 30 2009 Thomas Sailer - 1.2.3-16 +- use autotools build system from native package + * Mon Mar 3 2009 W. Pilorz - 1.2.3-15 - Add static subpackage. From pkgdb at fedoraproject.org Fri May 1 20:42:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:42:52 +0000 Subject: [pkgdb] ykclient was added for ausil Message-ID: <20090501204252.DF91710F894@bastion2.fedora.phx.redhat.com> ausil has added Package ykclient with summary Yubikey management library and client ausil has approved Package ykclient ausil has added a Fedora devel branch for ykclient with an owner of ausil ausil has approved ykclient in Fedora devel ausil has approved Package ykclient ausil has set commit to Approved for provenpackager on ykclient (Fedora devel) ausil has set build to Approved for provenpackager on ykclient (Fedora devel) ausil has set checkout to Approved for provenpackager on ykclient (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ykclient From pkgdb at fedoraproject.org Fri May 1 20:42:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:42:53 +0000 Subject: [pkgdb] ykclient (Fedora EPEL, 5) updated by ausil Message-ID: <20090501204254.313A710F897@bastion2.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for ykclient ausil has set commit to Approved for provenpackager on ykclient (Fedora EPEL 5) ausil has set build to Approved for provenpackager on ykclient (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on ykclient (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ykclient From pkgdb at fedoraproject.org Fri May 1 20:42:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:42:53 +0000 Subject: [pkgdb] ykclient (Fedora, 10) updated by ausil Message-ID: <20090501204254.790F910F899@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for ykclient ausil has set commit to Approved for provenpackager on ykclient (Fedora 10) ausil has set build to Approved for provenpackager on ykclient (Fedora 10) ausil has set checkout to Approved for provenpackager on ykclient (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ykclient From pkgdb at fedoraproject.org Fri May 1 20:42:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:42:53 +0000 Subject: [pkgdb] ykclient (Fedora, 11) updated by ausil Message-ID: <20090501204255.5FCFF10F89D@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for ykclient ausil has set commit to Approved for provenpackager on ykclient (Fedora 11) ausil has set build to Approved for provenpackager on ykclient (Fedora 11) ausil has set checkout to Approved for provenpackager on ykclient (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ykclient From ausil at fedoraproject.org Fri May 1 20:43:01 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:43:01 +0000 (UTC) Subject: rpms/ykclient - New directory Message-ID: <20090501204301.6630B7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/ykclient In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj10419/rpms/ykclient Log Message: Directory /cvs/pkgs/rpms/ykclient added to the repository From ausil at fedoraproject.org Fri May 1 20:43:01 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:43:01 +0000 (UTC) Subject: rpms/ykclient/devel - New directory Message-ID: <20090501204301.E5B5F70135@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/ykclient/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj10419/rpms/ykclient/devel Log Message: Directory /cvs/pkgs/rpms/ykclient/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:43:22 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:43:22 +0000 (UTC) Subject: rpms/ykclient Makefile,NONE,1.1 Message-ID: <20090501204322.768107012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/ykclient In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj10419/rpms/ykclient Added Files: Makefile Log Message: Setup of module ykclient --- NEW FILE Makefile --- # Top level Makefile for module ykclient 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 ausil at fedoraproject.org Fri May 1 20:43:22 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:43:22 +0000 (UTC) Subject: rpms/ykclient/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501204322.B3D487012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/ykclient/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj10419/rpms/ykclient/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ykclient --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ykclient # $Id: Makefile,v 1.1 2009/05/01 20:43:22 ausil Exp $ NAME := ykclient 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 pkgdb at fedoraproject.org Fri May 1 20:45:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:45:50 +0000 Subject: [pkgdb] pam_yubico was added for ausil Message-ID: <20090501204550.6B02F10F888@bastion2.fedora.phx.redhat.com> ausil has added Package pam_yubico with summary A Pluggable Authentication Module for yubikeys ausil has approved Package pam_yubico ausil has added a Fedora devel branch for pam_yubico with an owner of ausil ausil has approved pam_yubico in Fedora devel ausil has approved Package pam_yubico ausil has set commit to Approved for provenpackager on pam_yubico (Fedora devel) ausil has set build to Approved for provenpackager on pam_yubico (Fedora devel) ausil has set checkout to Approved for provenpackager on pam_yubico (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pam_yubico From pkgdb at fedoraproject.org Fri May 1 20:45:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:45:51 +0000 Subject: [pkgdb] pam_yubico (Fedora, 10) updated by ausil Message-ID: <20090501204551.CF01610F894@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for pam_yubico ausil has set commit to Approved for provenpackager on pam_yubico (Fedora 10) ausil has set build to Approved for provenpackager on pam_yubico (Fedora 10) ausil has set checkout to Approved for provenpackager on pam_yubico (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pam_yubico From ausil at fedoraproject.org Fri May 1 20:46:01 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:46:01 +0000 (UTC) Subject: rpms/pam_yubico - New directory Message-ID: <20090501204601.360067012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pam_yubico In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11207/rpms/pam_yubico Log Message: Directory /cvs/pkgs/rpms/pam_yubico added to the repository From ausil at fedoraproject.org Fri May 1 20:46:01 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:46:01 +0000 (UTC) Subject: rpms/pam_yubico/devel - New directory Message-ID: <20090501204601.7A0457012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pam_yubico/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11207/rpms/pam_yubico/devel Log Message: Directory /cvs/pkgs/rpms/pam_yubico/devel added to the repository From pkgdb at fedoraproject.org Fri May 1 20:45:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:45:51 +0000 Subject: [pkgdb] pam_yubico (Fedora, 11) updated by ausil Message-ID: <20090501204551.D5F9B10F898@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for pam_yubico ausil has set commit to Approved for provenpackager on pam_yubico (Fedora 11) ausil has set build to Approved for provenpackager on pam_yubico (Fedora 11) ausil has set checkout to Approved for provenpackager on pam_yubico (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pam_yubico From ausil at fedoraproject.org Fri May 1 20:46:11 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:46:11 +0000 (UTC) Subject: rpms/pam_yubico Makefile,NONE,1.1 Message-ID: <20090501204611.C59807012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pam_yubico In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11207/rpms/pam_yubico Added Files: Makefile Log Message: Setup of module pam_yubico --- NEW FILE Makefile --- # Top level Makefile for module pam_yubico 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 pkgdb at fedoraproject.org Fri May 1 20:45:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:45:51 +0000 Subject: [pkgdb] pam_yubico (Fedora EPEL, 5) updated by ausil Message-ID: <20090501204551.DD73C10F89A@bastion2.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for pam_yubico ausil has set commit to Approved for provenpackager on pam_yubico (Fedora EPEL 5) ausil has set build to Approved for provenpackager on pam_yubico (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on pam_yubico (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pam_yubico From ausil at fedoraproject.org Fri May 1 20:46:12 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:46:12 +0000 (UTC) Subject: rpms/pam_yubico/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501204612.136CA7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pam_yubico/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11207/rpms/pam_yubico/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pam_yubico --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pam_yubico # $Id: Makefile,v 1.1 2009/05/01 20:46:11 ausil Exp $ NAME := pam_yubico 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 pkgdb at fedoraproject.org Fri May 1 20:47:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:47:45 +0000 Subject: [pkgdb] php-ezc-Archive was added for llaumgui Message-ID: <20090501204745.BC0AA10F893@bastion2.fedora.phx.redhat.com> ausil has added Package php-ezc-Archive with summary rate, modify, and extract archive files of various formats ausil has approved Package php-ezc-Archive ausil has added a Fedora devel branch for php-ezc-Archive with an owner of llaumgui ausil has approved php-ezc-Archive in Fedora devel ausil has approved Package php-ezc-Archive ausil has set commit to Approved for provenpackager on php-ezc-Archive (Fedora devel) ausil has set build to Approved for provenpackager on php-ezc-Archive (Fedora devel) ausil has set checkout to Approved for provenpackager on php-ezc-Archive (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Archive From ausil at fedoraproject.org Fri May 1 20:47:56 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:47:56 +0000 (UTC) Subject: rpms/php-ezc-Archive - New directory Message-ID: <20090501204756.2E2BB7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/php-ezc-Archive In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsP11709/rpms/php-ezc-Archive Log Message: Directory /cvs/pkgs/rpms/php-ezc-Archive added to the repository From pkgdb at fedoraproject.org Fri May 1 20:47:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:47:46 +0000 Subject: [pkgdb] php-ezc-Archive (Fedora, 10) updated by ausil Message-ID: <20090501204746.A4B5310F896@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for php-ezc-Archive ausil has set commit to Approved for provenpackager on php-ezc-Archive (Fedora 10) ausil has set build to Approved for provenpackager on php-ezc-Archive (Fedora 10) ausil has set checkout to Approved for provenpackager on php-ezc-Archive (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Archive From ausil at fedoraproject.org Fri May 1 20:47:56 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:47:56 +0000 (UTC) Subject: rpms/php-ezc-Archive/devel - New directory Message-ID: <20090501204756.7F39B7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/php-ezc-Archive/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsP11709/rpms/php-ezc-Archive/devel Log Message: Directory /cvs/pkgs/rpms/php-ezc-Archive/devel added to the repository From pkgdb at fedoraproject.org Fri May 1 20:47:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:47:46 +0000 Subject: [pkgdb] php-ezc-Archive (Fedora, 9) updated by ausil Message-ID: <20090501204746.AD5C710F899@bastion2.fedora.phx.redhat.com> ausil added a Fedora 9 branch for php-ezc-Archive ausil has set commit to Approved for provenpackager on php-ezc-Archive (Fedora 9) ausil has set build to Approved for provenpackager on php-ezc-Archive (Fedora 9) ausil has set checkout to Approved for provenpackager on php-ezc-Archive (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Archive From ausil at fedoraproject.org Fri May 1 20:48:09 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:48:09 +0000 (UTC) Subject: rpms/php-ezc-Archive Makefile,NONE,1.1 Message-ID: <20090501204809.2BF307012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/php-ezc-Archive In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsP11709/rpms/php-ezc-Archive Added Files: Makefile Log Message: Setup of module php-ezc-Archive --- NEW FILE Makefile --- # Top level Makefile for module php-ezc-Archive 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 ausil at fedoraproject.org Fri May 1 20:48:09 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:48:09 +0000 (UTC) Subject: rpms/php-ezc-Archive/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501204809.9268E7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/php-ezc-Archive/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsP11709/rpms/php-ezc-Archive/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-ezc-Archive --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: php-ezc-Archive # $Id: Makefile,v 1.1 2009/05/01 20:48:09 ausil Exp $ NAME := php-ezc-Archive 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 pkgdb at fedoraproject.org Fri May 1 20:48:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:48:56 +0000 Subject: [pkgdb] php-ezc-Archive summary updated by ausil Message-ID: <20090501204856.CC20010F895@bastion2.fedora.phx.redhat.com> ausil set package php-ezc-Archive summary to rate, modify, and extract archive files of various formats To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Archive From pkgdb at fedoraproject.org Fri May 1 20:48:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:48:56 +0000 Subject: [pkgdb] php-ezc-Archive (Fedora, 10) updated by ausil Message-ID: <20090501204856.D578310F896@bastion2.fedora.phx.redhat.com> ausil changed owner of php-ezc-Archive in Fedora 10 to llaumgui To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Archive From pkgdb at fedoraproject.org Fri May 1 20:48:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:48:56 +0000 Subject: [pkgdb] php-ezc-Archive (Fedora, devel) updated by ausil Message-ID: <20090501204856.E733B10F899@bastion2.fedora.phx.redhat.com> ausil changed owner of php-ezc-Archive in Fedora devel to llaumgui To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Archive From pkgdb at fedoraproject.org Fri May 1 20:48:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:48:56 +0000 Subject: [pkgdb] php-ezc-Archive (Fedora, 9) updated by ausil Message-ID: <20090501204856.EDB8F10F89D@bastion2.fedora.phx.redhat.com> ausil changed owner of php-ezc-Archive in Fedora 9 to llaumgui To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Archive From pkgdb at fedoraproject.org Fri May 1 20:48:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:48:56 +0000 Subject: [pkgdb] php-ezc-Archive (Fedora, 11) updated by ausil Message-ID: <20090501204857.042F610F89F@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for php-ezc-Archive ausil has set commit to Approved for provenpackager on php-ezc-Archive (Fedora 11) ausil has set build to Approved for provenpackager on php-ezc-Archive (Fedora 11) ausil has set checkout to Approved for provenpackager on php-ezc-Archive (Fedora 11) ausil changed owner of php-ezc-Archive in Fedora 11 to llaumgui To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Archive From pkgdb at fedoraproject.org Fri May 1 20:49:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:49:58 +0000 Subject: [pkgdb] rubygem-RedCloth was added for mcpierce Message-ID: <20090501204958.9AF3E10F896@bastion2.fedora.phx.redhat.com> ausil has added Package rubygem-RedCloth with summary Textile parser for Ruby ausil has approved Package rubygem-RedCloth ausil has added a Fedora devel branch for rubygem-RedCloth with an owner of mcpierce ausil has approved rubygem-RedCloth in Fedora devel ausil has approved Package rubygem-RedCloth ausil has set commit to Approved for provenpackager on rubygem-RedCloth (Fedora devel) ausil has set build to Approved for provenpackager on rubygem-RedCloth (Fedora devel) ausil has set checkout to Approved for provenpackager on rubygem-RedCloth (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-RedCloth From pkgdb at fedoraproject.org Fri May 1 20:49:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:49:59 +0000 Subject: [pkgdb] rubygem-RedCloth (Fedora, 11) updated by ausil Message-ID: <20090501204959.655E510F899@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for rubygem-RedCloth ausil has set commit to Approved for provenpackager on rubygem-RedCloth (Fedora 11) ausil has set build to Approved for provenpackager on rubygem-RedCloth (Fedora 11) ausil has set checkout to Approved for provenpackager on rubygem-RedCloth (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-RedCloth From pkgdb at fedoraproject.org Fri May 1 20:49:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:49:59 +0000 Subject: [pkgdb] rubygem-RedCloth (Fedora, 10) updated by ausil Message-ID: <20090501204959.6C54A10F89C@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for rubygem-RedCloth ausil has set commit to Approved for provenpackager on rubygem-RedCloth (Fedora 10) ausil has set build to Approved for provenpackager on rubygem-RedCloth (Fedora 10) ausil has set checkout to Approved for provenpackager on rubygem-RedCloth (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-RedCloth From pkgdb at fedoraproject.org Fri May 1 20:49:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:49:59 +0000 Subject: [pkgdb] rubygem-RedCloth (Fedora EPEL, 5) updated by ausil Message-ID: <20090501204959.774F410F89F@bastion2.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for rubygem-RedCloth ausil has set commit to Approved for provenpackager on rubygem-RedCloth (Fedora EPEL 5) ausil has set build to Approved for provenpackager on rubygem-RedCloth (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on rubygem-RedCloth (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-RedCloth From ausil at fedoraproject.org Fri May 1 20:50:21 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:50:21 +0000 (UTC) Subject: rpms/rubygem-RedCloth - New directory Message-ID: <20090501205021.9F5447012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/rubygem-RedCloth In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ12364/rpms/rubygem-RedCloth Log Message: Directory /cvs/pkgs/rpms/rubygem-RedCloth added to the repository From ausil at fedoraproject.org Fri May 1 20:50:22 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:50:22 +0000 (UTC) Subject: rpms/rubygem-RedCloth/devel - New directory Message-ID: <20090501205022.A06C37012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/rubygem-RedCloth/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ12364/rpms/rubygem-RedCloth/devel Log Message: Directory /cvs/pkgs/rpms/rubygem-RedCloth/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:50:38 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:50:38 +0000 (UTC) Subject: rpms/rubygem-RedCloth Makefile,NONE,1.1 Message-ID: <20090501205038.C51A37012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/rubygem-RedCloth In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ12364/rpms/rubygem-RedCloth Added Files: Makefile Log Message: Setup of module rubygem-RedCloth --- NEW FILE Makefile --- # Top level Makefile for module rubygem-RedCloth 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 ausil at fedoraproject.org Fri May 1 20:50:39 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:50:39 +0000 (UTC) Subject: rpms/rubygem-RedCloth/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205039.224197012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/rubygem-RedCloth/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ12364/rpms/rubygem-RedCloth/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rubygem-RedCloth --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: rubygem-RedCloth # $Id: Makefile,v 1.1 2009/05/01 20:50:38 ausil Exp $ NAME := rubygem-RedCloth 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 pkgdb at fedoraproject.org Fri May 1 20:51:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:51:23 +0000 Subject: [pkgdb] libica was added for sharkcz Message-ID: <20090501205123.48F8810F893@bastion2.fedora.phx.redhat.com> ausil has added Package libica with summary Library for accessing ICA hardware crypto on IBM zSeries ausil has approved Package libica ausil has added a Fedora devel branch for libica with an owner of sharkcz ausil has approved libica in Fedora devel ausil has approved Package libica ausil has set commit to Approved for provenpackager on libica (Fedora devel) ausil has set build to Approved for provenpackager on libica (Fedora devel) ausil has set checkout to Approved for provenpackager on libica (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libica From ausil at fedoraproject.org Fri May 1 20:51:31 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:51:31 +0000 (UTC) Subject: rpms/libica/devel - New directory Message-ID: <20090501205131.6D8A37012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/libica/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl12835/rpms/libica/devel Log Message: Directory /cvs/pkgs/rpms/libica/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:51:31 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:51:31 +0000 (UTC) Subject: rpms/libica - New directory Message-ID: <20090501205131.368BA7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/libica In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl12835/rpms/libica Log Message: Directory /cvs/pkgs/rpms/libica added to the repository From pkgdb at fedoraproject.org Fri May 1 20:51:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:51:23 +0000 Subject: [pkgdb] libica (Fedora, 11) updated by ausil Message-ID: <20090501205123.A3DD810F896@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for libica ausil has set commit to Approved for provenpackager on libica (Fedora 11) ausil has set build to Approved for provenpackager on libica (Fedora 11) ausil has set checkout to Approved for provenpackager on libica (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libica From ausil at fedoraproject.org Fri May 1 20:51:42 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:51:42 +0000 (UTC) Subject: rpms/libica Makefile,NONE,1.1 Message-ID: <20090501205142.1DAA17012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/libica In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl12835/rpms/libica Added Files: Makefile Log Message: Setup of module libica --- NEW FILE Makefile --- # Top level Makefile for module libica 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 ausil at fedoraproject.org Fri May 1 20:51:42 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:51:42 +0000 (UTC) Subject: rpms/libica/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205142.626487012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/libica/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl12835/rpms/libica/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libica --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libica # $Id: Makefile,v 1.1 2009/05/01 20:51:42 ausil Exp $ NAME := libica 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 pkgdb at fedoraproject.org Fri May 1 20:52:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:52:13 +0000 Subject: [pkgdb] podofo was added for sharkcz Message-ID: <20090501205213.3B22010F899@bastion2.fedora.phx.redhat.com> ausil has added Package podofo with summary Tools and libraries to work with the PDF file format ausil has approved Package podofo ausil has added a Fedora devel branch for podofo with an owner of sharkcz ausil has approved podofo in Fedora devel ausil has approved Package podofo ausil has set commit to Approved for provenpackager on podofo (Fedora devel) ausil has set build to Approved for provenpackager on podofo (Fedora devel) ausil has set checkout to Approved for provenpackager on podofo (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/podofo From pkgdb at fedoraproject.org Fri May 1 20:52:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:52:14 +0000 Subject: [pkgdb] podofo (Fedora, 11) updated by ausil Message-ID: <20090501205214.5180F10F89C@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for podofo ausil has set commit to Approved for provenpackager on podofo (Fedora 11) ausil has set build to Approved for provenpackager on podofo (Fedora 11) ausil has set checkout to Approved for provenpackager on podofo (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/podofo From pkgdb at fedoraproject.org Fri May 1 20:52:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:52:14 +0000 Subject: [pkgdb] podofo (Fedora EPEL, 5) updated by ausil Message-ID: <20090501205214.593E510F89F@bastion2.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for podofo ausil has set commit to Approved for provenpackager on podofo (Fedora EPEL 5) ausil has set build to Approved for provenpackager on podofo (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on podofo (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/podofo From pkgdb at fedoraproject.org Fri May 1 20:52:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:52:14 +0000 Subject: [pkgdb] podofo (Fedora, 10) updated by ausil Message-ID: <20090501205214.6863E10F8A2@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for podofo ausil has set commit to Approved for provenpackager on podofo (Fedora 10) ausil has set build to Approved for provenpackager on podofo (Fedora 10) ausil has set checkout to Approved for provenpackager on podofo (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/podofo From ausil at fedoraproject.org Fri May 1 20:52:22 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:52:22 +0000 (UTC) Subject: rpms/podofo - New directory Message-ID: <20090501205222.24E567012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/podofo In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY13141/rpms/podofo Log Message: Directory /cvs/pkgs/rpms/podofo added to the repository From ausil at fedoraproject.org Fri May 1 20:52:22 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:52:22 +0000 (UTC) Subject: rpms/podofo/devel - New directory Message-ID: <20090501205222.5CA5D7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/podofo/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY13141/rpms/podofo/devel Log Message: Directory /cvs/pkgs/rpms/podofo/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:52:31 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:52:31 +0000 (UTC) Subject: rpms/podofo Makefile,NONE,1.1 Message-ID: <20090501205231.9EB3F7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/podofo In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY13141/rpms/podofo Added Files: Makefile Log Message: Setup of module podofo --- NEW FILE Makefile --- # Top level Makefile for module podofo 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 ausil at fedoraproject.org Fri May 1 20:52:31 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:52:31 +0000 (UTC) Subject: rpms/podofo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205231.ED2837012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/podofo/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY13141/rpms/podofo/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module podofo --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: podofo # $Id: Makefile,v 1.1 2009/05/01 20:52:31 ausil Exp $ NAME := podofo 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 pkgdb at fedoraproject.org Fri May 1 20:52:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:52:48 +0000 Subject: [pkgdb] lxshortcut was added for cwickert Message-ID: <20090501205248.58CCC10F89B@bastion2.fedora.phx.redhat.com> ausil has added Package lxshortcut with summary Small utility to edit application shortcuts ausil has approved Package lxshortcut ausil has added a Fedora devel branch for lxshortcut with an owner of cwickert ausil has approved lxshortcut in Fedora devel ausil has approved Package lxshortcut ausil has set commit to Approved for provenpackager on lxshortcut (Fedora devel) ausil has set build to Approved for provenpackager on lxshortcut (Fedora devel) ausil has set checkout to Approved for provenpackager on lxshortcut (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxshortcut From pkgdb at fedoraproject.org Fri May 1 20:52:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:52:49 +0000 Subject: [pkgdb] lxshortcut (Fedora, 11) updated by ausil Message-ID: <20090501205249.CF1DF10F89F@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for lxshortcut ausil has set commit to Approved for provenpackager on lxshortcut (Fedora 11) ausil has set build to Approved for provenpackager on lxshortcut (Fedora 11) ausil has set checkout to Approved for provenpackager on lxshortcut (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxshortcut From ausil at fedoraproject.org Fri May 1 20:52:57 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:52:57 +0000 (UTC) Subject: rpms/lxshortcut - New directory Message-ID: <20090501205257.22ADD7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/lxshortcut In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZ13447/rpms/lxshortcut Log Message: Directory /cvs/pkgs/rpms/lxshortcut added to the repository From pkgdb at fedoraproject.org Fri May 1 20:52:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:52:49 +0000 Subject: [pkgdb] lxshortcut (Fedora, 10) updated by ausil Message-ID: <20090501205249.E40F310F8A8@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for lxshortcut ausil has set commit to Approved for provenpackager on lxshortcut (Fedora 10) ausil has set build to Approved for provenpackager on lxshortcut (Fedora 10) ausil has set checkout to Approved for provenpackager on lxshortcut (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxshortcut From ausil at fedoraproject.org Fri May 1 20:52:57 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:52:57 +0000 (UTC) Subject: rpms/lxshortcut/devel - New directory Message-ID: <20090501205257.58ABE7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/lxshortcut/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZ13447/rpms/lxshortcut/devel Log Message: Directory /cvs/pkgs/rpms/lxshortcut/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:53:06 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:53:06 +0000 (UTC) Subject: rpms/lxshortcut Makefile,NONE,1.1 Message-ID: <20090501205306.5D5DD7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/lxshortcut In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZ13447/rpms/lxshortcut Added Files: Makefile Log Message: Setup of module lxshortcut --- NEW FILE Makefile --- # Top level Makefile for module lxshortcut 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 ausil at fedoraproject.org Fri May 1 20:53:06 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:53:06 +0000 (UTC) Subject: rpms/lxshortcut/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205306.A20147012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/lxshortcut/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZ13447/rpms/lxshortcut/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lxshortcut --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: lxshortcut # $Id: Makefile,v 1.1 2009/05/01 20:53:06 ausil Exp $ NAME := lxshortcut 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 pkgdb at fedoraproject.org Fri May 1 20:53:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:53:36 +0000 Subject: [pkgdb] jVorbisEnc was added for oget Message-ID: <20090501205336.A05B610F89E@bastion2.fedora.phx.redhat.com> ausil has added Package jVorbisEnc with summary Pure Java Ogg Vorbis Encoder ausil has approved Package jVorbisEnc ausil has added a Fedora devel branch for jVorbisEnc with an owner of oget ausil has approved jVorbisEnc in Fedora devel ausil has approved Package jVorbisEnc ausil has set commit to Approved for provenpackager on jVorbisEnc (Fedora devel) ausil has set build to Approved for provenpackager on jVorbisEnc (Fedora devel) ausil has set checkout to Approved for provenpackager on jVorbisEnc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jVorbisEnc From pkgdb at fedoraproject.org Fri May 1 20:53:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:53:37 +0000 Subject: [pkgdb] jVorbisEnc (Fedora, 10) updated by ausil Message-ID: <20090501205337.6579210F89F@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for jVorbisEnc ausil has set commit to Approved for provenpackager on jVorbisEnc (Fedora 10) ausil has set build to Approved for provenpackager on jVorbisEnc (Fedora 10) ausil has set checkout to Approved for provenpackager on jVorbisEnc (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jVorbisEnc From pkgdb at fedoraproject.org Fri May 1 20:53:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:53:37 +0000 Subject: [pkgdb] jVorbisEnc (Fedora, 9) updated by ausil Message-ID: <20090501205337.752B110F8A2@bastion2.fedora.phx.redhat.com> ausil added a Fedora 9 branch for jVorbisEnc ausil has set commit to Approved for provenpackager on jVorbisEnc (Fedora 9) ausil has set build to Approved for provenpackager on jVorbisEnc (Fedora 9) ausil has set checkout to Approved for provenpackager on jVorbisEnc (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jVorbisEnc From pkgdb at fedoraproject.org Fri May 1 20:53:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:53:37 +0000 Subject: [pkgdb] jVorbisEnc (Fedora, 11) updated by ausil Message-ID: <20090501205337.9467710F8A3@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for jVorbisEnc ausil has set commit to Approved for provenpackager on jVorbisEnc (Fedora 11) ausil has set build to Approved for provenpackager on jVorbisEnc (Fedora 11) ausil has set checkout to Approved for provenpackager on jVorbisEnc (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jVorbisEnc From ausil at fedoraproject.org Fri May 1 20:53:46 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:53:46 +0000 (UTC) Subject: rpms/jVorbisEnc - New directory Message-ID: <20090501205346.29E9B7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/jVorbisEnc In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE13790/rpms/jVorbisEnc Log Message: Directory /cvs/pkgs/rpms/jVorbisEnc added to the repository From ausil at fedoraproject.org Fri May 1 20:53:46 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:53:46 +0000 (UTC) Subject: rpms/jVorbisEnc/devel - New directory Message-ID: <20090501205346.686347012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/jVorbisEnc/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE13790/rpms/jVorbisEnc/devel Log Message: Directory /cvs/pkgs/rpms/jVorbisEnc/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:53:55 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:53:55 +0000 (UTC) Subject: rpms/jVorbisEnc Makefile,NONE,1.1 Message-ID: <20090501205355.811B77012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/jVorbisEnc In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE13790/rpms/jVorbisEnc Added Files: Makefile Log Message: Setup of module jVorbisEnc --- NEW FILE Makefile --- # Top level Makefile for module jVorbisEnc 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 ausil at fedoraproject.org Fri May 1 20:53:55 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:53:55 +0000 (UTC) Subject: rpms/jVorbisEnc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205355.C4A337012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/jVorbisEnc/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE13790/rpms/jVorbisEnc/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jVorbisEnc --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: jVorbisEnc # $Id: Makefile,v 1.1 2009/05/01 20:53:55 ausil Exp $ NAME := jVorbisEnc 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 pkgdb at fedoraproject.org Fri May 1 20:54:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:54:40 +0000 Subject: [pkgdb] zfstream was added for sailer Message-ID: <20090501205440.75E7710F896@bastion2.fedora.phx.redhat.com> ausil has added Package zfstream with summary C++ iostream like access to compressed files ausil has approved Package zfstream ausil has added a Fedora devel branch for zfstream with an owner of sailer ausil has approved zfstream in Fedora devel ausil has approved Package zfstream ausil has set commit to Approved for provenpackager on zfstream (Fedora devel) ausil has set build to Approved for provenpackager on zfstream (Fedora devel) ausil has set checkout to Approved for provenpackager on zfstream (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/zfstream From pkgdb at fedoraproject.org Fri May 1 20:54:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:54:41 +0000 Subject: [pkgdb] zfstream (Fedora, 11) updated by ausil Message-ID: <20090501205441.6446910F899@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for zfstream ausil has set commit to Approved for provenpackager on zfstream (Fedora 11) ausil has set build to Approved for provenpackager on zfstream (Fedora 11) ausil has set checkout to Approved for provenpackager on zfstream (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/zfstream From pkgdb at fedoraproject.org Fri May 1 20:54:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:54:41 +0000 Subject: [pkgdb] zfstream (Fedora, 10) updated by ausil Message-ID: <20090501205441.6F37C10F89C@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for zfstream ausil has set commit to Approved for provenpackager on zfstream (Fedora 10) ausil has set build to Approved for provenpackager on zfstream (Fedora 10) ausil has set checkout to Approved for provenpackager on zfstream (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/zfstream From ausil at fedoraproject.org Fri May 1 20:54:49 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:54:49 +0000 (UTC) Subject: rpms/zfstream - New directory Message-ID: <20090501205449.30CB57012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/zfstream In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsq14222/rpms/zfstream Log Message: Directory /cvs/pkgs/rpms/zfstream added to the repository From ausil at fedoraproject.org Fri May 1 20:54:49 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:54:49 +0000 (UTC) Subject: rpms/zfstream/devel - New directory Message-ID: <20090501205449.6C75C7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/zfstream/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsq14222/rpms/zfstream/devel Log Message: Directory /cvs/pkgs/rpms/zfstream/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:54:58 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:54:58 +0000 (UTC) Subject: rpms/zfstream Makefile,NONE,1.1 Message-ID: <20090501205458.B4C217012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/zfstream In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsq14222/rpms/zfstream Added Files: Makefile Log Message: Setup of module zfstream --- NEW FILE Makefile --- # Top level Makefile for module zfstream 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 ausil at fedoraproject.org Fri May 1 20:54:58 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:54:58 +0000 (UTC) Subject: rpms/zfstream/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205458.F10237012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/zfstream/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsq14222/rpms/zfstream/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module zfstream --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: zfstream # $Id: Makefile,v 1.1 2009/05/01 20:54:58 ausil Exp $ NAME := zfstream 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 pkgdb at fedoraproject.org Fri May 1 20:55:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:55:21 +0000 Subject: [pkgdb] perl-JSON-RPC-Common was added for chkr Message-ID: <20090501205521.1C44010F89A@bastion2.fedora.phx.redhat.com> ausil has added Package perl-JSON-RPC-Common with summary Perl module for handling JSON-RPC objects ausil has approved Package perl-JSON-RPC-Common ausil has added a Fedora devel branch for perl-JSON-RPC-Common with an owner of chkr ausil has approved perl-JSON-RPC-Common in Fedora devel ausil has approved Package perl-JSON-RPC-Common ausil has set commit to Approved for provenpackager on perl-JSON-RPC-Common (Fedora devel) ausil has set build to Approved for provenpackager on perl-JSON-RPC-Common (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-JSON-RPC-Common (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC-Common From pkgdb at fedoraproject.org Fri May 1 20:55:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:55:22 +0000 Subject: [pkgdb] perl-JSON-RPC-Common (Fedora, 11) updated by ausil Message-ID: <20090501205522.966B310F8A0@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-JSON-RPC-Common ausil has set commit to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 11) ausil has set build to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC-Common From ausil at fedoraproject.org Fri May 1 20:55:30 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:55:30 +0000 (UTC) Subject: rpms/perl-JSON-RPC-Common - New directory Message-ID: <20090501205530.42D3D7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JSON-RPC-Common In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsG14513/rpms/perl-JSON-RPC-Common Log Message: Directory /cvs/pkgs/rpms/perl-JSON-RPC-Common added to the repository From pkgdb at fedoraproject.org Fri May 1 20:55:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:55:22 +0000 Subject: [pkgdb] perl-JSON-RPC-Common (Fedora, 10) updated by ausil Message-ID: <20090501205522.CB6C910F85F@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for perl-JSON-RPC-Common ausil has set commit to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 10) ausil has set build to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 10) ausil has set checkout to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC-Common From ausil at fedoraproject.org Fri May 1 20:55:30 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:55:30 +0000 (UTC) Subject: rpms/perl-JSON-RPC-Common/devel - New directory Message-ID: <20090501205530.807C07012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JSON-RPC-Common/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsG14513/rpms/perl-JSON-RPC-Common/devel Log Message: Directory /cvs/pkgs/rpms/perl-JSON-RPC-Common/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:55:40 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:55:40 +0000 (UTC) Subject: rpms/perl-JSON-RPC-Common Makefile,NONE,1.1 Message-ID: <20090501205540.9DB8D7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JSON-RPC-Common In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsG14513/rpms/perl-JSON-RPC-Common Added Files: Makefile Log Message: Setup of module perl-JSON-RPC-Common --- NEW FILE Makefile --- # Top level Makefile for module perl-JSON-RPC-Common 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 ausil at fedoraproject.org Fri May 1 20:55:40 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:55:40 +0000 (UTC) Subject: rpms/perl-JSON-RPC-Common/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205540.DBCEA7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JSON-RPC-Common/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsG14513/rpms/perl-JSON-RPC-Common/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-JSON-RPC-Common --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-JSON-RPC-Common # $Id: Makefile,v 1.1 2009/05/01 20:55:40 ausil Exp $ NAME := perl-JSON-RPC-Common 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 pkgdb at fedoraproject.org Fri May 1 20:55:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:55:53 +0000 Subject: [pkgdb] polkit-qt was added for rdieter Message-ID: <20090501205553.DAC4F10F89A@bastion2.fedora.phx.redhat.com> ausil has added Package polkit-qt with summary Qt bindings for PolicyKit ausil has approved Package polkit-qt ausil has added a Fedora devel branch for polkit-qt with an owner of rdieter ausil has approved polkit-qt in Fedora devel ausil has approved Package polkit-qt ausil has set commit to Approved for provenpackager on polkit-qt (Fedora devel) ausil has set build to Approved for provenpackager on polkit-qt (Fedora devel) ausil has set checkout to Approved for provenpackager on polkit-qt (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/polkit-qt From ausil at fedoraproject.org Fri May 1 20:56:03 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:56:03 +0000 (UTC) Subject: rpms/polkit-qt - New directory Message-ID: <20090501205603.24D297012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/polkit-qt In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM14766/rpms/polkit-qt Log Message: Directory /cvs/pkgs/rpms/polkit-qt added to the repository From pkgdb at fedoraproject.org Fri May 1 20:55:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:55:55 +0000 Subject: [pkgdb] polkit-qt (Fedora, 11) updated by ausil Message-ID: <20090501205555.4044D10F8AC@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for polkit-qt ausil has set commit to Approved for provenpackager on polkit-qt (Fedora 11) ausil has set build to Approved for provenpackager on polkit-qt (Fedora 11) ausil has set checkout to Approved for provenpackager on polkit-qt (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/polkit-qt From pkgdb at fedoraproject.org Fri May 1 20:55:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:55:55 +0000 Subject: [pkgdb] polkit-qt (Fedora, 10) updated by ausil Message-ID: <20090501205555.C398410F8AF@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for polkit-qt ausil has set commit to Approved for provenpackager on polkit-qt (Fedora 10) ausil has set build to Approved for provenpackager on polkit-qt (Fedora 10) ausil has set checkout to Approved for provenpackager on polkit-qt (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/polkit-qt From ausil at fedoraproject.org Fri May 1 20:56:03 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:56:03 +0000 (UTC) Subject: rpms/polkit-qt/devel - New directory Message-ID: <20090501205603.6A7B17012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/polkit-qt/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM14766/rpms/polkit-qt/devel Log Message: Directory /cvs/pkgs/rpms/polkit-qt/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:56:13 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:56:13 +0000 (UTC) Subject: rpms/polkit-qt Makefile,NONE,1.1 Message-ID: <20090501205613.0DB967012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/polkit-qt In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM14766/rpms/polkit-qt Added Files: Makefile Log Message: Setup of module polkit-qt --- NEW FILE Makefile --- # Top level Makefile for module polkit-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 ausil at fedoraproject.org Fri May 1 20:56:13 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:56:13 +0000 (UTC) Subject: rpms/polkit-qt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205613.5DF867012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/polkit-qt/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM14766/rpms/polkit-qt/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module polkit-qt --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: polkit-qt # $Id: Makefile,v 1.1 2009/05/01 20:56:13 ausil Exp $ NAME := polkit-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 mcpierce at fedoraproject.org Fri May 1 20:56:34 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Fri, 1 May 2009 20:56:34 +0000 (UTC) Subject: rpms/rubygem-RedCloth/devel rubygem-RedCloth.spec,NONE,1.1 Message-ID: <20090501205634.512C87012F@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-RedCloth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14782 Added Files: rubygem-RedCloth.spec Log Message: First official build for Fedora. Release 4.1.9 of RedCloth. --- NEW FILE rubygem-RedCloth.spec --- # Generated from RedCloth-4.1.9.gem by gem2rpm -*- rpm-spec -*- %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %define gemname RedCloth %define gemlibname redcloth_scan.so %define geminstdir %{gemdir}/gems/%{gemname}-%{version} %define installroot %{buildroot}%{geminstdir} %define extensionddir %{installroot}/ext/redcloth_scan/ Summary: Textile parser for Ruby Name: rubygem-%{gemname} Version: 4.1.9 Release: 4%{?dist} Group: Development/Languages License: MIT URL: http://redcloth.org 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 BuildRequires: rubygems BuildRequires: ruby-devel >= 1.8 Provides: rubygem(%{gemname}) = %{version} %description Textile parser for Ruby. %prep %setup -q -c -T %build %install rm -rf %{buildroot} install -d -m0755 %{buildroot}%{gemdir} install -d -m0755 %{buildroot}%{ruby_sitelib} install -d -m0755 %{buildroot}%{ruby_sitearch} gem install --local --install-dir %{buildroot}%{gemdir} \ --force -V --rdoc %{SOURCE0} mkdir -p %{buildroot}/%{_bindir} cp -a %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} mv %{extensionddir}%{gemlibname} %{buildroot}%{ruby_sitearch}/%{gemlibname} rm -rf %{extensionddir} strip %{buildroot}%{ruby_sitearch}/%{gemlibname} rm %{installroot}/lib/%{gemlibname} cp %{installroot}/lib/redcloth.rb %{buildroot}%{ruby_sitelib}/redcloth.rb rm -rf %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir} -name "*.rb" | xargs chmod a+x find %{buildroot}%{geminstdir} -type f -name \*.rb | xargs chmod 0644 find %{buildroot}%{geminstdir} -type f -name \*.rb | \ xargs grep -l "^#!%{_bindir}/env" $file | xargs chmod 0755 rm %{installroot}/.require_paths %clean rm -rf %{buildroot} %files %defattr(-, root, root, -) %{_bindir}/redcloth %{gemdir}/gems/%{gemname}-%{version}/ %{ruby_sitelib}/redcloth.rb %{ruby_sitearch}/%{gemlibname} %doc %{gemdir}/doc/%{gemname}-%{version} %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog * Fri May 1 2009 Darryl Pierce - 4.1.9-4 - First official build for Fedora. * Thu Apr 30 2009 Darryl Pierce - 4.1.9-3 - Changed mv to cp for binaries. - Removed redundant %doc entries. * Thu Apr 30 2009 Darryl Pierce - 4.1.9-2 - Added BuildRequires: ruby-devel to fix koji issues. * Thu Apr 23 2009 Darryl Pierce - 4.1.9-1 - Initial package From pkgdb at fedoraproject.org Fri May 1 20:56:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:56:34 +0000 Subject: [pkgdb] perl-HTML-StripScripts-Parser was added for xavierb Message-ID: <20090501205634.D7C3C10F8A2@bastion2.fedora.phx.redhat.com> ausil has added Package perl-HTML-StripScripts-Parser with summary XSS filter using HTML::Parser ausil has approved Package perl-HTML-StripScripts-Parser ausil has added a Fedora devel branch for perl-HTML-StripScripts-Parser with an owner of xavierb ausil has approved perl-HTML-StripScripts-Parser in Fedora devel ausil has approved Package perl-HTML-StripScripts-Parser ausil has set commit to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora devel) ausil has set build to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts-Parser From pkgdb at fedoraproject.org Fri May 1 20:56:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:56:36 +0000 Subject: [pkgdb] perl-HTML-StripScripts-Parser (Fedora EPEL, 5) updated by ausil Message-ID: <20090501205636.1C27510F8A8@bastion2.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for perl-HTML-StripScripts-Parser ausil has set commit to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora EPEL 5) ausil has set build to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora EPEL 5) ausil approved watchbugzilla on perl-HTML-StripScripts-Parser (Fedora EPEL 5) for perl-sig ausil approved watchcommits on perl-HTML-StripScripts-Parser (Fedora EPEL 5) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts-Parser From pkgdb at fedoraproject.org Fri May 1 20:56:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:56:36 +0000 Subject: [pkgdb] perl-HTML-StripScripts-Parser (Fedora, 10) updated by ausil Message-ID: <20090501205636.1F9EE10F8AA@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for perl-HTML-StripScripts-Parser ausil has set commit to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 10) ausil has set build to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 10) ausil has set checkout to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 10) ausil approved watchbugzilla on perl-HTML-StripScripts-Parser (Fedora 10) for perl-sig ausil approved watchcommits on perl-HTML-StripScripts-Parser (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts-Parser From pkgdb at fedoraproject.org Fri May 1 20:56:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:56:36 +0000 Subject: [pkgdb] perl-HTML-StripScripts-Parser (Fedora, devel) updated by ausil Message-ID: <20090501205636.2593C10F8B1@bastion2.fedora.phx.redhat.com> ausil approved watchbugzilla on perl-HTML-StripScripts-Parser (Fedora devel) for perl-sig ausil approved watchcommits on perl-HTML-StripScripts-Parser (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts-Parser From pkgdb at fedoraproject.org Fri May 1 20:56:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:56:36 +0000 Subject: [pkgdb] perl-HTML-StripScripts-Parser (Fedora, 9) updated by ausil Message-ID: <20090501205636.3195710F8B4@bastion2.fedora.phx.redhat.com> ausil added a Fedora 9 branch for perl-HTML-StripScripts-Parser ausil has set commit to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 9) ausil has set build to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 9) ausil has set checkout to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 9) ausil approved watchbugzilla on perl-HTML-StripScripts-Parser (Fedora 9) for perl-sig ausil approved watchcommits on perl-HTML-StripScripts-Parser (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts-Parser From pkgdb at fedoraproject.org Fri May 1 20:56:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:56:36 +0000 Subject: [pkgdb] perl-HTML-StripScripts-Parser (Fedora, 11) updated by ausil Message-ID: <20090501205636.3AAC210F8B7@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-HTML-StripScripts-Parser ausil has set commit to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 11) ausil has set build to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-HTML-StripScripts-Parser (Fedora 11) ausil approved watchbugzilla on perl-HTML-StripScripts-Parser (Fedora 11) for perl-sig ausil approved watchcommits on perl-HTML-StripScripts-Parser (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts-Parser From ausil at fedoraproject.org Fri May 1 20:56:44 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:56:44 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser - New directory Message-ID: <20090501205644.23A397012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsJ15070/rpms/perl-HTML-StripScripts-Parser Log Message: Directory /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser added to the repository From ausil at fedoraproject.org Fri May 1 20:56:44 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:56:44 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser/devel - New directory Message-ID: <20090501205644.5D1BE7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsJ15070/rpms/perl-HTML-StripScripts-Parser/devel Log Message: Directory /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:56:54 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:56:54 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser Makefile,NONE,1.1 Message-ID: <20090501205654.1CAC67012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsJ15070/rpms/perl-HTML-StripScripts-Parser Added Files: Makefile Log Message: Setup of module perl-HTML-StripScripts-Parser --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-StripScripts-Parser 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 ausil at fedoraproject.org Fri May 1 20:56:54 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:56:54 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205654.6A7117012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsJ15070/rpms/perl-HTML-StripScripts-Parser/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-StripScripts-Parser --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-StripScripts-Parser # $Id: Makefile,v 1.1 2009/05/01 20:56:54 ausil Exp $ NAME := perl-HTML-StripScripts-Parser 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 pkgdb at fedoraproject.org Fri May 1 20:57:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:57:18 +0000 Subject: [pkgdb] perl-JSON-RPC was added for eseyman Message-ID: <20090501205718.BAD5710F8A1@bastion2.fedora.phx.redhat.com> ausil has added Package perl-JSON-RPC with summary Perl implementation of JSON-RPC 1.1 protocol-RPC ausil has approved Package perl-JSON-RPC ausil has added a Fedora devel branch for perl-JSON-RPC with an owner of eseyman ausil has approved perl-JSON-RPC in Fedora devel ausil has approved Package perl-JSON-RPC ausil has set commit to Approved for provenpackager on perl-JSON-RPC (Fedora devel) ausil has set build to Approved for provenpackager on perl-JSON-RPC (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-JSON-RPC (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC From pkgdb at fedoraproject.org Fri May 1 20:57:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:57:20 +0000 Subject: [pkgdb] perl-JSON-RPC (Fedora, 10) updated by ausil Message-ID: <20090501205720.6FDA210F8A4@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for perl-JSON-RPC ausil has set commit to Approved for provenpackager on perl-JSON-RPC (Fedora 10) ausil has set build to Approved for provenpackager on perl-JSON-RPC (Fedora 10) ausil has set checkout to Approved for provenpackager on perl-JSON-RPC (Fedora 10) ausil approved watchbugzilla on perl-JSON-RPC (Fedora 10) for perl-sig ausil approved watchcommits on perl-JSON-RPC (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC From pkgdb at fedoraproject.org Fri May 1 20:57:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:57:20 +0000 Subject: [pkgdb] perl-JSON-RPC (Fedora, devel) updated by ausil Message-ID: <20090501205720.76BCA10F8AE@bastion2.fedora.phx.redhat.com> ausil approved watchbugzilla on perl-JSON-RPC (Fedora devel) for perl-sig ausil approved watchcommits on perl-JSON-RPC (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC From pkgdb at fedoraproject.org Fri May 1 20:57:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:57:20 +0000 Subject: [pkgdb] perl-JSON-RPC (Fedora, 9) updated by ausil Message-ID: <20090501205720.7D77510F8C3@bastion2.fedora.phx.redhat.com> ausil added a Fedora 9 branch for perl-JSON-RPC ausil has set commit to Approved for provenpackager on perl-JSON-RPC (Fedora 9) ausil has set build to Approved for provenpackager on perl-JSON-RPC (Fedora 9) ausil has set checkout to Approved for provenpackager on perl-JSON-RPC (Fedora 9) ausil approved watchbugzilla on perl-JSON-RPC (Fedora 9) for perl-sig ausil approved watchcommits on perl-JSON-RPC (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC From ausil at fedoraproject.org Fri May 1 20:57:28 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:57:28 +0000 (UTC) Subject: rpms/perl-JSON-RPC - New directory Message-ID: <20090501205728.2294A7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JSON-RPC In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsg15528/rpms/perl-JSON-RPC Log Message: Directory /cvs/pkgs/rpms/perl-JSON-RPC added to the repository From ausil at fedoraproject.org Fri May 1 20:57:28 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:57:28 +0000 (UTC) Subject: rpms/perl-JSON-RPC/devel - New directory Message-ID: <20090501205728.57FCE7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JSON-RPC/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsg15528/rpms/perl-JSON-RPC/devel Log Message: Directory /cvs/pkgs/rpms/perl-JSON-RPC/devel added to the repository From pkgdb at fedoraproject.org Fri May 1 20:57:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:57:20 +0000 Subject: [pkgdb] perl-JSON-RPC (Fedora, 11) updated by ausil Message-ID: <20090501205720.8849E10F8C7@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-JSON-RPC ausil has set commit to Approved for provenpackager on perl-JSON-RPC (Fedora 11) ausil has set build to Approved for provenpackager on perl-JSON-RPC (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-JSON-RPC (Fedora 11) ausil approved watchbugzilla on perl-JSON-RPC (Fedora 11) for perl-sig ausil approved watchcommits on perl-JSON-RPC (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC From mcpierce at fedoraproject.org Fri May 1 20:57:37 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Fri, 1 May 2009 20:57:37 +0000 (UTC) Subject: rpms/rubygem-RedCloth/devel .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <20090501205737.564077012F@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-RedCloth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15300 Modified Files: .cvsignore sources Log Message: Uploading sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-RedCloth/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:50:38 -0000 1.1 +++ .cvsignore 1 May 2009 20:57:07 -0000 1.2 @@ -0,0 +1 @@ +RedCloth-4.1.9.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-RedCloth/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:50:38 -0000 1.1 +++ sources 1 May 2009 20:57:07 -0000 1.2 @@ -0,0 +1 @@ +9d93ac98348c6dc6d743bdc61085ef0c RedCloth-4.1.9.gem From ausil at fedoraproject.org Fri May 1 20:57:37 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:57:37 +0000 (UTC) Subject: rpms/perl-JSON-RPC Makefile,NONE,1.1 Message-ID: <20090501205737.C22177012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JSON-RPC In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsg15528/rpms/perl-JSON-RPC Added Files: Makefile Log Message: Setup of module perl-JSON-RPC --- NEW FILE Makefile --- # Top level Makefile for module perl-JSON-RPC 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 ausil at fedoraproject.org Fri May 1 20:57:38 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:57:38 +0000 (UTC) Subject: rpms/perl-JSON-RPC/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205738.14A957012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JSON-RPC/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsg15528/rpms/perl-JSON-RPC/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-JSON-RPC --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-JSON-RPC # $Id: Makefile,v 1.1 2009/05/01 20:57:37 ausil Exp $ NAME := perl-JSON-RPC 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 pkgdb at fedoraproject.org Fri May 1 20:58:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:01 +0000 Subject: [pkgdb] libmemcached was added for remi Message-ID: <20090501205801.6E4BD10F8BB@bastion2.fedora.phx.redhat.com> ausil has added Package libmemcached with summary Client library and command line tools for memcached server ausil has approved Package libmemcached ausil has added a Fedora devel branch for libmemcached with an owner of remi ausil has approved libmemcached in Fedora devel ausil has approved Package libmemcached ausil has set commit to Approved for provenpackager on libmemcached (Fedora devel) ausil has set build to Approved for provenpackager on libmemcached (Fedora devel) ausil has set checkout to Approved for provenpackager on libmemcached (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libmemcached From pkgdb at fedoraproject.org Fri May 1 20:58:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:02 +0000 Subject: [pkgdb] libmemcached (Fedora, 11) updated by ausil Message-ID: <20090501205802.3792110F8D3@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for libmemcached ausil has set commit to Approved for provenpackager on libmemcached (Fedora 11) ausil has set build to Approved for provenpackager on libmemcached (Fedora 11) ausil has set checkout to Approved for provenpackager on libmemcached (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libmemcached From pkgdb at fedoraproject.org Fri May 1 20:58:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:02 +0000 Subject: [pkgdb] libmemcached (Fedora, 10) updated by ausil Message-ID: <20090501205802.4567910F8D6@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for libmemcached ausil has set commit to Approved for provenpackager on libmemcached (Fedora 10) ausil has set build to Approved for provenpackager on libmemcached (Fedora 10) ausil has set checkout to Approved for provenpackager on libmemcached (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libmemcached From ausil at fedoraproject.org Fri May 1 20:58:10 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:58:10 +0000 (UTC) Subject: rpms/libmemcached - New directory Message-ID: <20090501205810.23A1C7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/libmemcached In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl15905/rpms/libmemcached Log Message: Directory /cvs/pkgs/rpms/libmemcached added to the repository From ausil at fedoraproject.org Fri May 1 20:58:20 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:58:20 +0000 (UTC) Subject: rpms/libmemcached Makefile,NONE,1.1 Message-ID: <20090501205820.B49497012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/libmemcached In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl15905/rpms/libmemcached Added Files: Makefile Log Message: Setup of module libmemcached --- NEW FILE Makefile --- # Top level Makefile for module libmemcached 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 ausil at fedoraproject.org Fri May 1 20:58:10 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:58:10 +0000 (UTC) Subject: rpms/libmemcached/devel - New directory Message-ID: <20090501205810.64FA67012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/libmemcached/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl15905/rpms/libmemcached/devel Log Message: Directory /cvs/pkgs/rpms/libmemcached/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:58:20 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:58:20 +0000 (UTC) Subject: rpms/libmemcached/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205820.EA5B07012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/libmemcached/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl15905/rpms/libmemcached/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libmemcached --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libmemcached # $Id: Makefile,v 1.1 2009/05/01 20:58:20 ausil Exp $ NAME := libmemcached 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 pkgdb at fedoraproject.org Fri May 1 20:58:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:43 +0000 Subject: [pkgdb] globus-gsi-callback was added for ellert Message-ID: <20090501205843.9172810F89E@bastion2.fedora.phx.redhat.com> ausil has added Package globus-gsi-callback with summary Globus Toolkit - Globus GSI Callback Library ausil has approved Package globus-gsi-callback ausil has added a Fedora devel branch for globus-gsi-callback with an owner of ellert ausil has approved globus-gsi-callback in Fedora devel ausil has approved Package globus-gsi-callback ausil has set commit to Approved for provenpackager on globus-gsi-callback (Fedora devel) ausil has set build to Approved for provenpackager on globus-gsi-callback (Fedora devel) ausil has set checkout to Approved for provenpackager on globus-gsi-callback (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-callback From pkgdb at fedoraproject.org Fri May 1 20:58:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:44 +0000 Subject: [pkgdb] globus-gsi-callback (Fedora EPEL, 5) updated by ausil Message-ID: <20090501205845.1223710F8A2@bastion2.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for globus-gsi-callback ausil has set commit to Approved for provenpackager on globus-gsi-callback (Fedora EPEL 5) ausil has set build to Approved for provenpackager on globus-gsi-callback (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on globus-gsi-callback (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-callback From pkgdb at fedoraproject.org Fri May 1 20:58:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:44 +0000 Subject: [pkgdb] globus-gsi-callback (Fedora, 10) updated by ausil Message-ID: <20090501205845.17EA610F8A6@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for globus-gsi-callback ausil has set commit to Approved for provenpackager on globus-gsi-callback (Fedora 10) ausil has set build to Approved for provenpackager on globus-gsi-callback (Fedora 10) ausil has set checkout to Approved for provenpackager on globus-gsi-callback (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-callback From pkgdb at fedoraproject.org Fri May 1 20:58:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:45 +0000 Subject: [pkgdb] globus-gsi-callback (Fedora EPEL, 4) updated by ausil Message-ID: <20090501205845.225D110F8C1@bastion2.fedora.phx.redhat.com> ausil added a Fedora EPEL 4 branch for globus-gsi-callback ausil has set commit to Approved for provenpackager on globus-gsi-callback (Fedora EPEL 4) ausil has set build to Approved for provenpackager on globus-gsi-callback (Fedora EPEL 4) ausil has set checkout to Approved for provenpackager on globus-gsi-callback (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-callback From pkgdb at fedoraproject.org Fri May 1 20:58:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:45 +0000 Subject: [pkgdb] globus-gsi-callback (Fedora, 9) updated by ausil Message-ID: <20090501205845.2845F10F8D8@bastion2.fedora.phx.redhat.com> ausil added a Fedora 9 branch for globus-gsi-callback ausil has set commit to Approved for provenpackager on globus-gsi-callback (Fedora 9) ausil has set build to Approved for provenpackager on globus-gsi-callback (Fedora 9) ausil has set checkout to Approved for provenpackager on globus-gsi-callback (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-callback From ausil at fedoraproject.org Fri May 1 20:58:54 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:58:54 +0000 (UTC) Subject: rpms/globus-gsi-callback - New directory Message-ID: <20090501205854.2FE3F7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/globus-gsi-callback In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY16213/rpms/globus-gsi-callback Log Message: Directory /cvs/pkgs/rpms/globus-gsi-callback added to the repository From pkgdb at fedoraproject.org Fri May 1 20:58:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:58:45 +0000 Subject: [pkgdb] globus-gsi-callback (Fedora, 11) updated by ausil Message-ID: <20090501205845.32ECF10F8DB@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for globus-gsi-callback ausil has set commit to Approved for provenpackager on globus-gsi-callback (Fedora 11) ausil has set build to Approved for provenpackager on globus-gsi-callback (Fedora 11) ausil has set checkout to Approved for provenpackager on globus-gsi-callback (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-callback From ausil at fedoraproject.org Fri May 1 20:58:54 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:58:54 +0000 (UTC) Subject: rpms/globus-gsi-callback/devel - New directory Message-ID: <20090501205854.778607012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/globus-gsi-callback/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY16213/rpms/globus-gsi-callback/devel Log Message: Directory /cvs/pkgs/rpms/globus-gsi-callback/devel added to the repository From ausil at fedoraproject.org Fri May 1 20:59:10 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:59:10 +0000 (UTC) Subject: rpms/globus-gsi-callback Makefile,NONE,1.1 Message-ID: <20090501205910.DF0A57012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/globus-gsi-callback In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY16213/rpms/globus-gsi-callback Added Files: Makefile Log Message: Setup of module globus-gsi-callback --- NEW FILE Makefile --- # Top level Makefile for module globus-gsi-callback 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 ausil at fedoraproject.org Fri May 1 20:59:12 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:59:12 +0000 (UTC) Subject: rpms/globus-gsi-callback/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205912.4E73970139@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/globus-gsi-callback/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY16213/rpms/globus-gsi-callback/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module globus-gsi-callback --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: globus-gsi-callback # $Id: Makefile,v 1.1 2009/05/01 20:59:11 ausil Exp $ NAME := globus-gsi-callback 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 pkgdb at fedoraproject.org Fri May 1 20:59:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:59:32 +0000 Subject: [pkgdb] perl-JavaScript-Beautifier was added for mmaslano Message-ID: <20090501205932.1BFFE10F8BA@bastion2.fedora.phx.redhat.com> ausil has added Package perl-JavaScript-Beautifier with summary beautifier for javascript ausil has approved Package perl-JavaScript-Beautifier ausil has added a Fedora devel branch for perl-JavaScript-Beautifier with an owner of mmaslano ausil has approved perl-JavaScript-Beautifier in Fedora devel ausil has approved Package perl-JavaScript-Beautifier ausil has set commit to Approved for provenpackager on perl-JavaScript-Beautifier (Fedora devel) ausil has set build to Approved for provenpackager on perl-JavaScript-Beautifier (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-JavaScript-Beautifier (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JavaScript-Beautifier From pkgdb at fedoraproject.org Fri May 1 20:59:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:59:32 +0000 Subject: [pkgdb] perl-JavaScript-Beautifier (Fedora, devel) updated by ausil Message-ID: <20090501205932.DB8D210F8CF@bastion2.fedora.phx.redhat.com> ausil approved watchbugzilla on perl-JavaScript-Beautifier (Fedora devel) for perl-sig ausil approved watchcommits on perl-JavaScript-Beautifier (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JavaScript-Beautifier From ausil at fedoraproject.org Fri May 1 20:59:40 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:59:40 +0000 (UTC) Subject: rpms/perl-JavaScript-Beautifier - New directory Message-ID: <20090501205940.2E3E77012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JavaScript-Beautifier In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvss16735/rpms/perl-JavaScript-Beautifier Log Message: Directory /cvs/pkgs/rpms/perl-JavaScript-Beautifier added to the repository From ausil at fedoraproject.org Fri May 1 20:59:40 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:59:40 +0000 (UTC) Subject: rpms/perl-JavaScript-Beautifier/devel - New directory Message-ID: <20090501205940.74B357012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvss16735/rpms/perl-JavaScript-Beautifier/devel Log Message: Directory /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel added to the repository From pkgdb at fedoraproject.org Fri May 1 20:59:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 20:59:32 +0000 Subject: [pkgdb] perl-JavaScript-Beautifier (Fedora, 11) updated by ausil Message-ID: <20090501205932.E5C7B10F8D2@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-JavaScript-Beautifier ausil has set commit to Approved for provenpackager on perl-JavaScript-Beautifier (Fedora 11) ausil has set build to Approved for provenpackager on perl-JavaScript-Beautifier (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-JavaScript-Beautifier (Fedora 11) ausil approved watchbugzilla on perl-JavaScript-Beautifier (Fedora 11) for perl-sig ausil approved watchcommits on perl-JavaScript-Beautifier (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JavaScript-Beautifier From ausil at fedoraproject.org Fri May 1 20:59:50 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:59:50 +0000 (UTC) Subject: rpms/perl-JavaScript-Beautifier Makefile,NONE,1.1 Message-ID: <20090501205950.392577012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JavaScript-Beautifier In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvss16735/rpms/perl-JavaScript-Beautifier Added Files: Makefile Log Message: Setup of module perl-JavaScript-Beautifier --- NEW FILE Makefile --- # Top level Makefile for module perl-JavaScript-Beautifier 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 ausil at fedoraproject.org Fri May 1 20:59:50 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 20:59:50 +0000 (UTC) Subject: rpms/perl-JavaScript-Beautifier/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501205950.7A8937012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvss16735/rpms/perl-JavaScript-Beautifier/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-JavaScript-Beautifier --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-JavaScript-Beautifier # $Id: Makefile,v 1.1 2009/05/01 20:59:50 ausil Exp $ NAME := perl-JavaScript-Beautifier 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 pkgdb at fedoraproject.org Fri May 1 21:00:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:00:12 +0000 Subject: [pkgdb] perl-JavaScript-Minifier was added for mmaslano Message-ID: <20090501210012.89F5610F8C0@bastion2.fedora.phx.redhat.com> ausil has added Package perl-JavaScript-Minifier with summary Perl extension for minifying JavaScript code ausil has approved Package perl-JavaScript-Minifier ausil has added a Fedora devel branch for perl-JavaScript-Minifier with an owner of mmaslano ausil has approved perl-JavaScript-Minifier in Fedora devel ausil has approved Package perl-JavaScript-Minifier ausil has set commit to Approved for provenpackager on perl-JavaScript-Minifier (Fedora devel) ausil has set build to Approved for provenpackager on perl-JavaScript-Minifier (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-JavaScript-Minifier (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JavaScript-Minifier From pkgdb at fedoraproject.org Fri May 1 21:00:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:00:16 +0000 Subject: [pkgdb] perl-JavaScript-Minifier (Fedora, devel) updated by ausil Message-ID: <20090501210017.224E610F8E7@bastion2.fedora.phx.redhat.com> ausil approved watchbugzilla on perl-JavaScript-Minifier (Fedora devel) for perl-sig ausil approved watchcommits on perl-JavaScript-Minifier (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JavaScript-Minifier From ausil at fedoraproject.org Fri May 1 21:00:26 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:00:26 +0000 (UTC) Subject: rpms/perl-JavaScript-Minifier - New directory Message-ID: <20090501210026.315AA7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JavaScript-Minifier In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsu16994/rpms/perl-JavaScript-Minifier Log Message: Directory /cvs/pkgs/rpms/perl-JavaScript-Minifier added to the repository From ausil at fedoraproject.org Fri May 1 21:00:26 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:00:26 +0000 (UTC) Subject: rpms/perl-JavaScript-Minifier/devel - New directory Message-ID: <20090501210026.828587012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JavaScript-Minifier/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsu16994/rpms/perl-JavaScript-Minifier/devel Log Message: Directory /cvs/pkgs/rpms/perl-JavaScript-Minifier/devel added to the repository From pkgdb at fedoraproject.org Fri May 1 21:00:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:00:16 +0000 Subject: [pkgdb] perl-JavaScript-Minifier (Fedora, 11) updated by ausil Message-ID: <20090501210017.58DF910F8EB@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-JavaScript-Minifier ausil has set commit to Approved for provenpackager on perl-JavaScript-Minifier (Fedora 11) ausil has set build to Approved for provenpackager on perl-JavaScript-Minifier (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-JavaScript-Minifier (Fedora 11) ausil approved watchbugzilla on perl-JavaScript-Minifier (Fedora 11) for perl-sig ausil approved watchcommits on perl-JavaScript-Minifier (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JavaScript-Minifier From ausil at fedoraproject.org Fri May 1 21:00:38 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:00:38 +0000 (UTC) Subject: rpms/perl-JavaScript-Minifier Makefile,NONE,1.1 Message-ID: <20090501210038.65BE17012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JavaScript-Minifier In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsu16994/rpms/perl-JavaScript-Minifier Added Files: Makefile Log Message: Setup of module perl-JavaScript-Minifier --- NEW FILE Makefile --- # Top level Makefile for module perl-JavaScript-Minifier 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 ausil at fedoraproject.org Fri May 1 21:00:38 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:00:38 +0000 (UTC) Subject: rpms/perl-JavaScript-Minifier/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501210038.E9CF67012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-JavaScript-Minifier/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsu16994/rpms/perl-JavaScript-Minifier/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-JavaScript-Minifier --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-JavaScript-Minifier # $Id: Makefile,v 1.1 2009/05/01 21:00:38 ausil Exp $ NAME := perl-JavaScript-Minifier 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 pkgdb at fedoraproject.org Fri May 1 21:00:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:00:47 +0000 Subject: [pkgdb] perl-ExtUtils-InstallPAR was added for mmaslano Message-ID: <20090501210048.408DC10F8D7@bastion2.fedora.phx.redhat.com> ausil has added Package perl-ExtUtils-InstallPAR with summary Install .par's into any installed perl ausil has approved Package perl-ExtUtils-InstallPAR ausil has added a Fedora devel branch for perl-ExtUtils-InstallPAR with an owner of mmaslano ausil has approved perl-ExtUtils-InstallPAR in Fedora devel ausil has approved Package perl-ExtUtils-InstallPAR ausil has set commit to Approved for provenpackager on perl-ExtUtils-InstallPAR (Fedora devel) ausil has set build to Approved for provenpackager on perl-ExtUtils-InstallPAR (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-ExtUtils-InstallPAR (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-InstallPAR From pkgdb at fedoraproject.org Fri May 1 21:00:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:00:48 +0000 Subject: [pkgdb] perl-ExtUtils-InstallPAR (Fedora, devel) updated by ausil Message-ID: <20090501210048.CFAAC10F8D9@bastion2.fedora.phx.redhat.com> ausil approved watchbugzilla on perl-ExtUtils-InstallPAR (Fedora devel) for perl-sig ausil approved watchcommits on perl-ExtUtils-InstallPAR (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-InstallPAR From pkgdb at fedoraproject.org Fri May 1 21:00:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:00:48 +0000 Subject: [pkgdb] perl-ExtUtils-InstallPAR (Fedora, 11) updated by ausil Message-ID: <20090501210048.DF3AB10F8F2@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-ExtUtils-InstallPAR ausil has set commit to Approved for provenpackager on perl-ExtUtils-InstallPAR (Fedora 11) ausil has set build to Approved for provenpackager on perl-ExtUtils-InstallPAR (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-ExtUtils-InstallPAR (Fedora 11) ausil approved watchbugzilla on perl-ExtUtils-InstallPAR (Fedora 11) for perl-sig ausil approved watchcommits on perl-ExtUtils-InstallPAR (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-InstallPAR From ausil at fedoraproject.org Fri May 1 21:00:59 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:00:59 +0000 (UTC) Subject: rpms/perl-ExtUtils-InstallPAR - New directory Message-ID: <20090501210059.2A7957012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsf17216/rpms/perl-ExtUtils-InstallPAR Log Message: Directory /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR added to the repository From ausil at fedoraproject.org Fri May 1 21:00:59 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:00:59 +0000 (UTC) Subject: rpms/perl-ExtUtils-InstallPAR/devel - New directory Message-ID: <20090501210059.6C0747012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsf17216/rpms/perl-ExtUtils-InstallPAR/devel Log Message: Directory /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR/devel added to the repository From ausil at fedoraproject.org Fri May 1 21:01:12 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:01:12 +0000 (UTC) Subject: rpms/perl-ExtUtils-InstallPAR Makefile,NONE,1.1 Message-ID: <20090501210112.EE74270133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsf17216/rpms/perl-ExtUtils-InstallPAR Added Files: Makefile Log Message: Setup of module perl-ExtUtils-InstallPAR --- NEW FILE Makefile --- # Top level Makefile for module perl-ExtUtils-InstallPAR 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 ausil at fedoraproject.org Fri May 1 21:01:13 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:01:13 +0000 (UTC) Subject: rpms/perl-ExtUtils-InstallPAR/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501210113.6351F70133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsf17216/rpms/perl-ExtUtils-InstallPAR/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-ExtUtils-InstallPAR --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-ExtUtils-InstallPAR # $Id: Makefile,v 1.1 2009/05/01 21:01:13 ausil Exp $ NAME := perl-ExtUtils-InstallPAR 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 pkgdb at fedoraproject.org Fri May 1 21:01:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:01:27 +0000 Subject: [pkgdb] perl-ExtUtils-InferConfig was added for mmaslano Message-ID: <20090501210127.7376B10F8C7@bastion2.fedora.phx.redhat.com> ausil has added Package perl-ExtUtils-InferConfig with summary Infer Perl Configuration for non-running interpreter ausil has approved Package perl-ExtUtils-InferConfig ausil has added a Fedora devel branch for perl-ExtUtils-InferConfig with an owner of mmaslano ausil has approved perl-ExtUtils-InferConfig in Fedora devel ausil has approved Package perl-ExtUtils-InferConfig ausil has set commit to Approved for provenpackager on perl-ExtUtils-InferConfig (Fedora devel) ausil has set build to Approved for provenpackager on perl-ExtUtils-InferConfig (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-ExtUtils-InferConfig (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-InferConfig From pkgdb at fedoraproject.org Fri May 1 21:01:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:01:28 +0000 Subject: [pkgdb] perl-ExtUtils-InferConfig (Fedora, devel) updated by ausil Message-ID: <20090501210128.C95D110F8C9@bastion2.fedora.phx.redhat.com> ausil approved watchbugzilla on perl-ExtUtils-InferConfig (Fedora devel) for perl-sig ausil approved watchcommits on perl-ExtUtils-InferConfig (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-InferConfig From pkgdb at fedoraproject.org Fri May 1 21:01:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:01:28 +0000 Subject: [pkgdb] perl-ExtUtils-InferConfig (Fedora, 11) updated by ausil Message-ID: <20090501210128.DA5E610F8CD@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-ExtUtils-InferConfig ausil has set commit to Approved for provenpackager on perl-ExtUtils-InferConfig (Fedora 11) ausil has set build to Approved for provenpackager on perl-ExtUtils-InferConfig (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-ExtUtils-InferConfig (Fedora 11) ausil approved watchbugzilla on perl-ExtUtils-InferConfig (Fedora 11) for perl-sig ausil approved watchcommits on perl-ExtUtils-InferConfig (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-InferConfig From ausil at fedoraproject.org Fri May 1 21:01:40 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:01:40 +0000 (UTC) Subject: rpms/perl-ExtUtils-InferConfig - New directory Message-ID: <20090501210140.3B47F70133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-ExtUtils-InferConfig In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY17702/rpms/perl-ExtUtils-InferConfig Log Message: Directory /cvs/pkgs/rpms/perl-ExtUtils-InferConfig added to the repository From ausil at fedoraproject.org Fri May 1 21:01:40 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:01:40 +0000 (UTC) Subject: rpms/perl-ExtUtils-InferConfig/devel - New directory Message-ID: <20090501210140.9520370133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY17702/rpms/perl-ExtUtils-InferConfig/devel Log Message: Directory /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/devel added to the repository From ausil at fedoraproject.org Fri May 1 21:01:54 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:01:54 +0000 (UTC) Subject: rpms/perl-ExtUtils-InferConfig Makefile,NONE,1.1 Message-ID: <20090501210154.253FE70133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-ExtUtils-InferConfig In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY17702/rpms/perl-ExtUtils-InferConfig Added Files: Makefile Log Message: Setup of module perl-ExtUtils-InferConfig --- NEW FILE Makefile --- # Top level Makefile for module perl-ExtUtils-InferConfig 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 ausil at fedoraproject.org Fri May 1 21:01:54 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:01:54 +0000 (UTC) Subject: rpms/perl-ExtUtils-InferConfig/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501210154.6EBEF70133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY17702/rpms/perl-ExtUtils-InferConfig/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-ExtUtils-InferConfig --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-ExtUtils-InferConfig # $Id: Makefile,v 1.1 2009/05/01 21:01:54 ausil Exp $ NAME := perl-ExtUtils-InferConfig 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 pkgdb at fedoraproject.org Fri May 1 21:02:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:02:04 +0000 Subject: [pkgdb] perl-YAML-LibYAML was added for mmaslano Message-ID: <20090501210204.4569E10F8AC@bastion2.fedora.phx.redhat.com> ausil has added Package perl-YAML-LibYAML with summary YAML Serialization using XS and libyaml ausil has approved Package perl-YAML-LibYAML ausil has added a Fedora devel branch for perl-YAML-LibYAML with an owner of mmaslano ausil has approved perl-YAML-LibYAML in Fedora devel ausil has approved Package perl-YAML-LibYAML ausil has set commit to Approved for provenpackager on perl-YAML-LibYAML (Fedora devel) ausil has set build to Approved for provenpackager on perl-YAML-LibYAML (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-YAML-LibYAML (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-YAML-LibYAML From pkgdb at fedoraproject.org Fri May 1 21:02:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:02:04 +0000 Subject: [pkgdb] perl-YAML-LibYAML (Fedora, devel) updated by ausil Message-ID: <20090501210204.D314010F8D4@bastion2.fedora.phx.redhat.com> ausil approved watchbugzilla on perl-YAML-LibYAML (Fedora devel) for perl-sig ausil approved watchcommits on perl-YAML-LibYAML (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-YAML-LibYAML From pkgdb at fedoraproject.org Fri May 1 21:02:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:02:04 +0000 Subject: [pkgdb] perl-YAML-LibYAML (Fedora, 11) updated by ausil Message-ID: <20090501210204.DCD7810F8DF@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-YAML-LibYAML ausil has set commit to Approved for provenpackager on perl-YAML-LibYAML (Fedora 11) ausil has set build to Approved for provenpackager on perl-YAML-LibYAML (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-YAML-LibYAML (Fedora 11) ausil approved watchbugzilla on perl-YAML-LibYAML (Fedora 11) for perl-sig ausil approved watchcommits on perl-YAML-LibYAML (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-YAML-LibYAML From ausil at fedoraproject.org Fri May 1 21:02:12 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:02:12 +0000 (UTC) Subject: rpms/perl-YAML-LibYAML - New directory Message-ID: <20090501210212.26FFF7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-YAML-LibYAML In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsb18346/rpms/perl-YAML-LibYAML Log Message: Directory /cvs/pkgs/rpms/perl-YAML-LibYAML added to the repository From ausil at fedoraproject.org Fri May 1 21:02:12 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:02:12 +0000 (UTC) Subject: rpms/perl-YAML-LibYAML/devel - New directory Message-ID: <20090501210212.75D8A7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-YAML-LibYAML/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsb18346/rpms/perl-YAML-LibYAML/devel Log Message: Directory /cvs/pkgs/rpms/perl-YAML-LibYAML/devel added to the repository From ausil at fedoraproject.org Fri May 1 21:02:23 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:02:23 +0000 (UTC) Subject: rpms/perl-YAML-LibYAML Makefile,NONE,1.1 Message-ID: <20090501210223.2DAE37012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-YAML-LibYAML In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsb18346/rpms/perl-YAML-LibYAML Added Files: Makefile Log Message: Setup of module perl-YAML-LibYAML --- NEW FILE Makefile --- # Top level Makefile for module perl-YAML-LibYAML 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 ausil at fedoraproject.org Fri May 1 21:02:23 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:02:23 +0000 (UTC) Subject: rpms/perl-YAML-LibYAML/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501210223.79DF07012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-YAML-LibYAML/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsb18346/rpms/perl-YAML-LibYAML/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-YAML-LibYAML --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-YAML-LibYAML # $Id: Makefile,v 1.1 2009/05/01 21:02:23 ausil Exp $ NAME := perl-YAML-LibYAML 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 pkgdb at fedoraproject.org Fri May 1 21:02:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:02:40 +0000 Subject: [pkgdb] perl-Devel-REPL was added for iarnell Message-ID: <20090501210240.E042B10F8A1@bastion2.fedora.phx.redhat.com> ausil has added Package perl-Devel-REPL with summary Modern perl interactive shell ausil has approved Package perl-Devel-REPL ausil has added a Fedora devel branch for perl-Devel-REPL with an owner of iarnell ausil has approved perl-Devel-REPL in Fedora devel ausil has approved Package perl-Devel-REPL ausil has set commit to Approved for provenpackager on perl-Devel-REPL (Fedora devel) ausil has set build to Approved for provenpackager on perl-Devel-REPL (Fedora devel) ausil has set checkout to Approved for provenpackager on perl-Devel-REPL (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-REPL From pkgdb at fedoraproject.org Fri May 1 21:02:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:02:41 +0000 Subject: [pkgdb] perl-Devel-REPL (Fedora, 11) updated by ausil Message-ID: <20090501210241.DCB9410F8E7@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for perl-Devel-REPL ausil has set commit to Approved for provenpackager on perl-Devel-REPL (Fedora 11) ausil has set build to Approved for provenpackager on perl-Devel-REPL (Fedora 11) ausil has set checkout to Approved for provenpackager on perl-Devel-REPL (Fedora 11) ausil approved watchbugzilla on perl-Devel-REPL (Fedora 11) for perl-sig ausil approved watchcommits on perl-Devel-REPL (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-REPL From pkgdb at fedoraproject.org Fri May 1 21:02:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:02:41 +0000 Subject: [pkgdb] perl-Devel-REPL (Fedora, 10) updated by ausil Message-ID: <20090501210241.F122710F8F9@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for perl-Devel-REPL ausil has set commit to Approved for provenpackager on perl-Devel-REPL (Fedora 10) ausil has set build to Approved for provenpackager on perl-Devel-REPL (Fedora 10) ausil has set checkout to Approved for provenpackager on perl-Devel-REPL (Fedora 10) ausil approved watchbugzilla on perl-Devel-REPL (Fedora 10) for perl-sig ausil approved watchcommits on perl-Devel-REPL (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-REPL From ausil at fedoraproject.org Fri May 1 21:02:51 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:02:51 +0000 (UTC) Subject: rpms/perl-Devel-REPL - New directory Message-ID: <20090501210251.2BA697012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-Devel-REPL In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsG18662/rpms/perl-Devel-REPL Log Message: Directory /cvs/pkgs/rpms/perl-Devel-REPL added to the repository From ausil at fedoraproject.org Fri May 1 21:02:51 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:02:51 +0000 (UTC) Subject: rpms/perl-Devel-REPL/devel - New directory Message-ID: <20090501210251.6712E7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-Devel-REPL/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsG18662/rpms/perl-Devel-REPL/devel Log Message: Directory /cvs/pkgs/rpms/perl-Devel-REPL/devel added to the repository From ausil at fedoraproject.org Fri May 1 21:03:00 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:03:00 +0000 (UTC) Subject: rpms/perl-Devel-REPL Makefile,NONE,1.1 Message-ID: <20090501210300.F2E3A7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-Devel-REPL In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsG18662/rpms/perl-Devel-REPL Added Files: Makefile Log Message: Setup of module perl-Devel-REPL --- NEW FILE Makefile --- # Top level Makefile for module perl-Devel-REPL 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 ausil at fedoraproject.org Fri May 1 21:03:01 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:03:01 +0000 (UTC) Subject: rpms/perl-Devel-REPL/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501210301.38E557012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/perl-Devel-REPL/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsG18662/rpms/perl-Devel-REPL/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Devel-REPL --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Devel-REPL # $Id: Makefile,v 1.1 2009/05/01 21:03:01 ausil Exp $ NAME := perl-Devel-REPL 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 pkgdb at fedoraproject.org Fri May 1 21:02:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:02:41 +0000 Subject: [pkgdb] perl-Devel-REPL (Fedora, devel) updated by ausil Message-ID: <20090501210242.0674910F8FC@bastion2.fedora.phx.redhat.com> ausil approved watchbugzilla on perl-Devel-REPL (Fedora devel) for perl-sig ausil approved watchcommits on perl-Devel-REPL (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-REPL From pkgdb at fedoraproject.org Fri May 1 21:03:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:03:46 +0000 Subject: [pkgdb] jorbis was added for oget Message-ID: <20090501210346.E53C510F8A9@bastion2.fedora.phx.redhat.com> ausil has added Package jorbis with summary Pure Java Ogg Vorbis Decoder ausil has approved Package jorbis ausil has added a Fedora devel branch for jorbis with an owner of oget ausil has approved jorbis in Fedora devel ausil has approved Package jorbis ausil has set commit to Approved for provenpackager on jorbis (Fedora devel) ausil has set build to Approved for provenpackager on jorbis (Fedora devel) ausil has set checkout to Approved for provenpackager on jorbis (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jorbis From pkgdb at fedoraproject.org Fri May 1 21:03:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:03:47 +0000 Subject: [pkgdb] jorbis (Fedora, 10) updated by ausil Message-ID: <20090501210347.7907210F8B0@bastion2.fedora.phx.redhat.com> ausil added a Fedora 10 branch for jorbis ausil has set commit to Approved for provenpackager on jorbis (Fedora 10) ausil has set build to Approved for provenpackager on jorbis (Fedora 10) ausil has set checkout to Approved for provenpackager on jorbis (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jorbis From pkgdb at fedoraproject.org Fri May 1 21:03:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:03:47 +0000 Subject: [pkgdb] jorbis (Fedora, 11) updated by ausil Message-ID: <20090501210347.8918510F8B3@bastion2.fedora.phx.redhat.com> ausil added a Fedora 11 branch for jorbis ausil has set commit to Approved for provenpackager on jorbis (Fedora 11) ausil has set build to Approved for provenpackager on jorbis (Fedora 11) ausil has set checkout to Approved for provenpackager on jorbis (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jorbis From pkgdb at fedoraproject.org Fri May 1 21:03:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 01 May 2009 21:03:47 +0000 Subject: [pkgdb] jorbis (Fedora, 9) updated by ausil Message-ID: <20090501210347.906F110F8C2@bastion2.fedora.phx.redhat.com> ausil added a Fedora 9 branch for jorbis ausil has set commit to Approved for provenpackager on jorbis (Fedora 9) ausil has set build to Approved for provenpackager on jorbis (Fedora 9) ausil has set checkout to Approved for provenpackager on jorbis (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jorbis From ausil at fedoraproject.org Fri May 1 21:03:57 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:03:57 +0000 (UTC) Subject: rpms/jorbis - New directory Message-ID: <20090501210357.247C27012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/jorbis In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT19047/rpms/jorbis Log Message: Directory /cvs/pkgs/rpms/jorbis added to the repository From mcpierce at fedoraproject.org Fri May 1 21:03:48 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Fri, 1 May 2009 21:03:48 +0000 (UTC) Subject: rpms/rubygem-RedCloth/F-10 rubygem-RedCloth.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501210348.251457012F@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-RedCloth/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18779 Modified Files: .cvsignore sources Added Files: rubygem-RedCloth.spec Log Message: First official build for Fedora. --- NEW FILE rubygem-RedCloth.spec --- # Generated from RedCloth-4.1.9.gem by gem2rpm -*- rpm-spec -*- %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %define gemname RedCloth %define gemlibname redcloth_scan.so %define geminstdir %{gemdir}/gems/%{gemname}-%{version} %define installroot %{buildroot}%{geminstdir} %define extensionddir %{installroot}/ext/redcloth_scan/ Summary: Textile parser for Ruby Name: rubygem-%{gemname} Version: 4.1.9 Release: 4%{?dist} Group: Development/Languages License: MIT URL: http://redcloth.org 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 BuildRequires: rubygems BuildRequires: ruby-devel >= 1.8 Provides: rubygem(%{gemname}) = %{version} %description Textile parser for Ruby. %prep %setup -q -c -T %build %install rm -rf %{buildroot} install -d -m0755 %{buildroot}%{gemdir} install -d -m0755 %{buildroot}%{ruby_sitelib} install -d -m0755 %{buildroot}%{ruby_sitearch} gem install --local --install-dir %{buildroot}%{gemdir} \ --force -V --rdoc %{SOURCE0} mkdir -p %{buildroot}/%{_bindir} cp -a %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} mv %{extensionddir}%{gemlibname} %{buildroot}%{ruby_sitearch}/%{gemlibname} rm -rf %{extensionddir} strip %{buildroot}%{ruby_sitearch}/%{gemlibname} rm %{installroot}/lib/%{gemlibname} cp %{installroot}/lib/redcloth.rb %{buildroot}%{ruby_sitelib}/redcloth.rb rm -rf %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir} -name "*.rb" | xargs chmod a+x find %{buildroot}%{geminstdir} -type f -name \*.rb | xargs chmod 0644 find %{buildroot}%{geminstdir} -type f -name \*.rb | \ xargs grep -l "^#!%{_bindir}/env" $file | xargs chmod 0755 rm %{installroot}/.require_paths %clean rm -rf %{buildroot} %files %defattr(-, root, root, -) %{_bindir}/redcloth %{gemdir}/gems/%{gemname}-%{version}/ %{ruby_sitelib}/redcloth.rb %{ruby_sitearch}/%{gemlibname} %doc %{gemdir}/doc/%{gemname}-%{version} %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog * Fri May 1 2009 Darryl Pierce - 4.1.9-4 - First official build for Fedora. * Thu Apr 30 2009 Darryl Pierce - 4.1.9-3 - Changed mv to cp for binaries. - Removed redundant %doc entries. * Thu Apr 30 2009 Darryl Pierce - 4.1.9-2 - Added BuildRequires: ruby-devel to fix koji issues. * Thu Apr 23 2009 Darryl Pierce - 4.1.9-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-RedCloth/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:50:38 -0000 1.1 +++ .cvsignore 1 May 2009 21:03:17 -0000 1.2 @@ -0,0 +1 @@ +RedCloth-4.1.9.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-RedCloth/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:50:38 -0000 1.1 +++ sources 1 May 2009 21:03:17 -0000 1.2 @@ -0,0 +1 @@ +9d93ac98348c6dc6d743bdc61085ef0c RedCloth-4.1.9.gem From ausil at fedoraproject.org Fri May 1 21:03:57 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:03:57 +0000 (UTC) Subject: rpms/jorbis/devel - New directory Message-ID: <20090501210357.62E807012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/jorbis/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT19047/rpms/jorbis/devel Log Message: Directory /cvs/pkgs/rpms/jorbis/devel added to the repository From ausil at fedoraproject.org Fri May 1 21:04:06 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:04:06 +0000 (UTC) Subject: rpms/jorbis Makefile,NONE,1.1 Message-ID: <20090501210406.06A1F7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/jorbis In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT19047/rpms/jorbis Added Files: Makefile Log Message: Setup of module jorbis --- NEW FILE Makefile --- # Top level Makefile for module jorbis 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 ausil at fedoraproject.org Fri May 1 21:04:06 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:04:06 +0000 (UTC) Subject: rpms/jorbis/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090501210406.41B3B7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/jorbis/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT19047/rpms/jorbis/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jorbis --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: jorbis # $Id: Makefile,v 1.1 2009/05/01 21:04:06 ausil Exp $ NAME := jorbis 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 caillon at fedoraproject.org Fri May 1 21:07:01 2009 From: caillon at fedoraproject.org (Christopher Aillon) Date: Fri, 1 May 2009 21:07:01 +0000 (UTC) Subject: rpms/fedora-bookmarks/F-11 default-bookmarks.html, 1.4, 1.5 fedora-bookmarks.spec, 1.5, 1.6 Message-ID: <20090501210701.9F0037012F@cvs1.fedora.phx.redhat.com> Author: caillon Update of /cvs/extras/rpms/fedora-bookmarks/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19922 Modified Files: default-bookmarks.html fedora-bookmarks.spec Log Message: * Fri May 1 2009 Christopher Aillon - 11-1 - Refresh Fedora Project link set - Add new Free Content link - Remove obsolete links Index: default-bookmarks.html =================================================================== RCS file: /cvs/extras/rpms/fedora-bookmarks/F-11/default-bookmarks.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- default-bookmarks.html 2 Sep 2008 15:11:59 -0000 1.4 +++ default-bookmarks.html 1 May 2009 21:06:31 -0000 1.5 @@ -4,14 +4,14 @@ DO NOT EDIT! --> Bookmarks -

Bookmarks

+

Bookmarks

-

Personal Toolbar Folder

+

Personal Toolbar Folder

Release Notes
Fedora Release Notes -

Fedora Project

+

Fedora Project

Fedora Project
Starting point for the Fedora Project @@ -20,23 +20,26 @@
Fedora Weekly News
Fedora Weekly News
Fedora Unity Project -
Fedora People +
Planet Fedora
Blogs by Fedora Contributors
More Support & Discussion +
Join Fedora! +
Help make Fedora better!

-

Red Hat

+

Red Hat

Red Hat Magazine -
Mugshot
Red Hat
JBoss

-

Free Content

+

Free Content

Wikipedia
Online Encyclopedia
Jamendo
Magnatune +
LibriVox +
Free Audiobooks
The Freesound Project
Creative Commons
Free Content Licenses Index: fedora-bookmarks.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-bookmarks/F-11/fedora-bookmarks.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- fedora-bookmarks.spec 24 Feb 2009 16:21:11 -0000 1.5 +++ fedora-bookmarks.spec 1 May 2009 21:06:31 -0000 1.6 @@ -1,6 +1,6 @@ Name: fedora-bookmarks -Version: 10 -Release: 2 +Version: 11 +Release: 1 Summary: Fedora bookmarks Group: Applications/Internet License: GFDL @@ -38,6 +38,11 @@ install -p -m 644 %{SOURCE0} $RPM_BUILD_ %{_datadir}/bookmarks/default-bookmarks.html %changelog +* Fri May 1 2009 Christopher Aillon - 11-1 +- Refresh Fedora Project link set +- Add new Free Content link +- Remove obsolete links + * Tue Feb 24 2009 Fedora Release Engineering - 10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sailer at fedoraproject.org Fri May 1 21:08:11 2009 From: sailer at fedoraproject.org (Thomas M. Sailer) Date: Fri, 1 May 2009 21:08:11 +0000 (UTC) Subject: rpms/zfstream/devel zfstream-zip.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501210811.084977012F@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/zfstream/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20222 Modified Files: .cvsignore sources Added Files: zfstream-zip.patch Log Message: import from review zfstream-zip.patch: --- NEW FILE zfstream-zip.patch --- --- src/zfstream.hpp.orig 2007-12-28 17:04:40.000000000 +0100 +++ src/zfstream.hpp 2007-12-28 17:06:16.000000000 +0100 @@ -45,7 +45,9 @@ */ GZipCompression = ZLibCompression, /** BZipCompression means to use the zfstream::obzstream class for output streams. */ - BZipCompression = 2 + BZipCompression = 2, + /** ZipCompression means to use the zfstream::ozipstream class for output streams. */ + ZipCompression = 3 }; /** @@ -81,6 +83,7 @@ - std::ifstream - zfstream::gzstream - zfstream::bzstream + - zfstream::zipstream It will return NULL if it cannot open filename, or a std::ifstream if it cannot figure out a decompression @@ -110,6 +113,7 @@ - zfstream::ogzstream - zfstream::obzstream + - zfstream::ozipstream - std::ofstream Note that this function only uses filename to pass to the --- src/zfstream.cpp.orig 2007-12-28 17:04:49.000000000 +0100 +++ src/zfstream.cpp 2007-12-28 17:11:39.000000000 +0100 @@ -17,6 +17,7 @@ #if HAVE_ZLIB # include "gzstream.hpp" +# include "zipstream.hpp" #endif #if HAVE_BZLIB # include "bzstream.hpp" @@ -33,6 +34,7 @@ case( NoCompression ): return "NoCompression"; break; case( ZLibCompression ): return "ZLibCompression"; break; case( BZipCompression ): return "BZipCompression"; break; + case( ZipCompression ): return "ZipCompression"; break; default: return ""; break; } } @@ -46,6 +48,7 @@ #endif #if HAVE_ZLIB if( ZLibCompression == p ) return true; + if( ZipCompression == p ) return true; #endif return false; } @@ -107,6 +110,12 @@ //COUT << "gzip!"< Author: caillon Update of /cvs/extras/rpms/fedora-bookmarks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20307 Modified Files: default-bookmarks.html fedora-bookmarks.spec Log Message: * Fri May 1 2009 Christopher Aillon - 11-1 - Refresh Fedora Project link set - Add new Free Content link - Remove obsolete links Index: default-bookmarks.html =================================================================== RCS file: /cvs/extras/rpms/fedora-bookmarks/devel/default-bookmarks.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- default-bookmarks.html 2 Sep 2008 15:11:59 -0000 1.4 +++ default-bookmarks.html 1 May 2009 21:07:58 -0000 1.5 @@ -4,14 +4,14 @@ DO NOT EDIT! --> Bookmarks -

Bookmarks

+

Bookmarks

-

Personal Toolbar Folder

+

Personal Toolbar Folder

Release Notes
Fedora Release Notes -

Fedora Project

+

Fedora Project

Fedora Project
Starting point for the Fedora Project @@ -20,23 +20,26 @@
Fedora Weekly News
Fedora Weekly News
Fedora Unity Project -
Fedora People +
Planet Fedora
Blogs by Fedora Contributors
More Support & Discussion +
Join Fedora! +
Help make Fedora better!

-

Red Hat

+

Red Hat

Red Hat Magazine -
Mugshot
Red Hat
JBoss

-

Free Content

+

Free Content

Wikipedia
Online Encyclopedia
Jamendo
Magnatune +
LibriVox +
Free Audiobooks
The Freesound Project
Creative Commons
Free Content Licenses Index: fedora-bookmarks.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-bookmarks/devel/fedora-bookmarks.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- fedora-bookmarks.spec 24 Feb 2009 16:21:11 -0000 1.5 +++ fedora-bookmarks.spec 1 May 2009 21:07:58 -0000 1.6 @@ -1,6 +1,6 @@ Name: fedora-bookmarks -Version: 10 -Release: 2 +Version: 11 +Release: 1 Summary: Fedora bookmarks Group: Applications/Internet License: GFDL @@ -38,6 +38,11 @@ install -p -m 644 %{SOURCE0} $RPM_BUILD_ %{_datadir}/bookmarks/default-bookmarks.html %changelog +* Fri May 1 2009 Christopher Aillon - 11-1 +- Refresh Fedora Project link set +- Add new Free Content link +- Remove obsolete links + * Tue Feb 24 2009 Fedora Release Engineering - 10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sailer at fedoraproject.org Fri May 1 21:09:17 2009 From: sailer at fedoraproject.org (Thomas M. Sailer) Date: Fri, 1 May 2009 21:09:17 +0000 (UTC) Subject: rpms/zfstream/devel zfstream.spec,NONE,1.1 Message-ID: <20090501210917.523807012F@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/zfstream/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20554 Added Files: zfstream.spec Log Message: commit forgotten file --- NEW FILE zfstream.spec --- %global vday 02 %global vmonth 12 %global vyear 2004 Name: zfstream Version: %{vyear}%{vmonth}%{vday} Release: 4%{?dist} Summary: Library for reading and writing compressed and non-compressed files Group: System Environment/Libraries License: LGPLv2+ URL: http://www.wanderinghorse.net/computing/%{name}/ Source0: http://www.wanderinghorse.net/computing/%{name}/libs11n_%{name}-%{vyear}.%{vmonth}.%{vday}.tar.gz # I tried half a day to get the rather peculiar original build system working, # but I failed, so I decided to simply replace it by autotools. # This has the further advantage that it knows how to cross-compile, # as evidenced by the mingw32-zfstream package also under review. Source1: %{name}-autotools.tar.gz # The patch has been sent via private mail to the author. The author responded # that the patch had been integrated into his personal tree, but apparently # he has not gotten around to release a new version. Patch1: %{name}-zip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel BuildRequires: libtool BuildRequires: minizip-devel %description zfstream is a small C++ library which provides an abstraction API for reading and writing compressed and non-compressed files using the same API. It supports libz and libbz2 compression schemes. The library is trivial to use and provides client applications with a unified interface for reading and writing files without having to know whether they are compressed or not. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q -n libs11n_%{name}-%{vyear}.%{vmonth}.%{vday} -a 1 %patch1 -p0 -b .zip aclocal autoconf autoheader libtoolize -f touch NEWS README AUTHORS automake -a -c %build %configure --disable-static 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 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,-) %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc ChangeLog %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc %changelog * Fri May 1 2009 Thomas Sailer - 20041202-4 - reformat description * Thu Apr 30 2009 Thomas Sailer - 20041202-3 - use %%{name} macro (more) - remove minizip from Source1 - shortened summary - fix BR/R * Tue Nov 4 2008 Thomas Sailer - 20041202-2 - changed description - added unused-direct-shlib-dependency trick - add library dependences * Thu Dec 27 2007 Thomas Sailer - 20041202-1 - initial packaging From sailer at fedoraproject.org Fri May 1 21:10:51 2009 From: sailer at fedoraproject.org (Thomas M. Sailer) Date: Fri, 1 May 2009 21:10:51 +0000 (UTC) Subject: rpms/zfstream/devel zfstream.spec,1.1,1.2 Message-ID: <20090501211051.28E5B7012F@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/zfstream/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20756 Modified Files: zfstream.spec Log Message: bump and retag Index: zfstream.spec =================================================================== RCS file: /cvs/extras/rpms/zfstream/devel/zfstream.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- zfstream.spec 1 May 2009 21:09:17 -0000 1.1 +++ zfstream.spec 1 May 2009 21:10:20 -0000 1.2 @@ -4,7 +4,7 @@ Name: zfstream Version: %{vyear}%{vmonth}%{vday} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for reading and writing compressed and non-compressed files Group: System Environment/Libraries @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri May 1 2009 Thomas Sailer - 20041202-5 +- rebuild + * Fri May 1 2009 Thomas Sailer - 20041202-4 - reformat description From mcpierce at fedoraproject.org Fri May 1 21:12:24 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Fri, 1 May 2009 21:12:24 +0000 (UTC) Subject: rpms/rubygem-RedCloth/F-11 rubygem-RedCloth.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501211224.7CA3D7012F@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-RedCloth/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21165 Modified Files: .cvsignore sources Added Files: rubygem-RedCloth.spec Log Message: First official build for Fedora. --- NEW FILE rubygem-RedCloth.spec --- # Generated from RedCloth-4.1.9.gem by gem2rpm -*- rpm-spec -*- %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %define gemname RedCloth %define gemlibname redcloth_scan.so %define geminstdir %{gemdir}/gems/%{gemname}-%{version} %define installroot %{buildroot}%{geminstdir} %define extensionddir %{installroot}/ext/redcloth_scan/ Summary: Textile parser for Ruby Name: rubygem-%{gemname} Version: 4.1.9 Release: 4%{?dist} Group: Development/Languages License: MIT URL: http://redcloth.org 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 BuildRequires: rubygems BuildRequires: ruby-devel >= 1.8 Provides: rubygem(%{gemname}) = %{version} %description Textile parser for Ruby. %prep %setup -q -c -T %build %install rm -rf %{buildroot} install -d -m0755 %{buildroot}%{gemdir} install -d -m0755 %{buildroot}%{ruby_sitelib} install -d -m0755 %{buildroot}%{ruby_sitearch} gem install --local --install-dir %{buildroot}%{gemdir} \ --force -V --rdoc %{SOURCE0} mkdir -p %{buildroot}/%{_bindir} cp -a %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} mv %{extensionddir}%{gemlibname} %{buildroot}%{ruby_sitearch}/%{gemlibname} rm -rf %{extensionddir} strip %{buildroot}%{ruby_sitearch}/%{gemlibname} rm %{installroot}/lib/%{gemlibname} cp %{installroot}/lib/redcloth.rb %{buildroot}%{ruby_sitelib}/redcloth.rb rm -rf %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir} -name "*.rb" | xargs chmod a+x find %{buildroot}%{geminstdir} -type f -name \*.rb | xargs chmod 0644 find %{buildroot}%{geminstdir} -type f -name \*.rb | \ xargs grep -l "^#!%{_bindir}/env" $file | xargs chmod 0755 rm %{installroot}/.require_paths %clean rm -rf %{buildroot} %files %defattr(-, root, root, -) %{_bindir}/redcloth %{gemdir}/gems/%{gemname}-%{version}/ %{ruby_sitelib}/redcloth.rb %{ruby_sitearch}/%{gemlibname} %doc %{gemdir}/doc/%{gemname}-%{version} %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog * Fri May 1 2009 Darryl Pierce - 4.1.9-4 - First official build for Fedora. * Thu Apr 30 2009 Darryl Pierce - 4.1.9-3 - Changed mv to cp for binaries. - Removed redundant %doc entries. * Thu Apr 30 2009 Darryl Pierce - 4.1.9-2 - Added BuildRequires: ruby-devel to fix koji issues. * Thu Apr 23 2009 Darryl Pierce - 4.1.9-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-RedCloth/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:50:38 -0000 1.1 +++ .cvsignore 1 May 2009 21:11:54 -0000 1.2 @@ -0,0 +1 @@ +RedCloth-4.1.9.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-RedCloth/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:50:38 -0000 1.1 +++ sources 1 May 2009 21:11:54 -0000 1.2 @@ -0,0 +1 @@ +9d93ac98348c6dc6d743bdc61085ef0c RedCloth-4.1.9.gem From sailer at fedoraproject.org Fri May 1 21:14:28 2009 From: sailer at fedoraproject.org (Thomas M. Sailer) Date: Fri, 1 May 2009 21:14:28 +0000 (UTC) Subject: rpms/zfstream/F-11 zfstream-zip.patch, NONE, 1.1 zfstream.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501211428.208B97012F@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/zfstream/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21523 Modified Files: .cvsignore sources Added Files: zfstream-zip.patch zfstream.spec Log Message: copy from devel zfstream-zip.patch: --- NEW FILE zfstream-zip.patch --- --- src/zfstream.hpp.orig 2007-12-28 17:04:40.000000000 +0100 +++ src/zfstream.hpp 2007-12-28 17:06:16.000000000 +0100 @@ -45,7 +45,9 @@ */ GZipCompression = ZLibCompression, /** BZipCompression means to use the zfstream::obzstream class for output streams. */ - BZipCompression = 2 + BZipCompression = 2, + /** ZipCompression means to use the zfstream::ozipstream class for output streams. */ + ZipCompression = 3 }; /** @@ -81,6 +83,7 @@ - std::ifstream - zfstream::gzstream - zfstream::bzstream + - zfstream::zipstream It will return NULL if it cannot open filename, or a std::ifstream if it cannot figure out a decompression @@ -110,6 +113,7 @@ - zfstream::ogzstream - zfstream::obzstream + - zfstream::ozipstream - std::ofstream Note that this function only uses filename to pass to the --- src/zfstream.cpp.orig 2007-12-28 17:04:49.000000000 +0100 +++ src/zfstream.cpp 2007-12-28 17:11:39.000000000 +0100 @@ -17,6 +17,7 @@ #if HAVE_ZLIB # include "gzstream.hpp" +# include "zipstream.hpp" #endif #if HAVE_BZLIB # include "bzstream.hpp" @@ -33,6 +34,7 @@ case( NoCompression ): return "NoCompression"; break; case( ZLibCompression ): return "ZLibCompression"; break; case( BZipCompression ): return "BZipCompression"; break; + case( ZipCompression ): return "ZipCompression"; break; default: return ""; break; } } @@ -46,6 +48,7 @@ #endif #if HAVE_ZLIB if( ZLibCompression == p ) return true; + if( ZipCompression == p ) return true; #endif return false; } @@ -107,6 +110,12 @@ //COUT << "gzip!"< - 20041202-5 - rebuild * Fri May 1 2009 Thomas Sailer - 20041202-4 - reformat description * Thu Apr 30 2009 Thomas Sailer - 20041202-3 - use %%{name} macro (more) - remove minizip from Source1 - shortened summary - fix BR/R * Tue Nov 4 2008 Thomas Sailer - 20041202-2 - changed description - added unused-direct-shlib-dependency trick - add library dependences * Thu Dec 27 2007 Thomas Sailer - 20041202-1 - initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zfstream/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:54:58 -0000 1.1 +++ .cvsignore 1 May 2009 21:13:57 -0000 1.2 @@ -0,0 +1,2 @@ +libs11n_zfstream-2004.12.02.tar.gz +zfstream-autotools.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zfstream/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:54:58 -0000 1.1 +++ sources 1 May 2009 21:13:57 -0000 1.2 @@ -0,0 +1,2 @@ +906e46120012978a6715b425dd6db0a7 libs11n_zfstream-2004.12.02.tar.gz +fb26ab3f2a3e0c3f41adf3d0068fa589 zfstream-autotools.tar.gz From sailer at fedoraproject.org Fri May 1 21:15:04 2009 From: sailer at fedoraproject.org (Thomas M. Sailer) Date: Fri, 1 May 2009 21:15:04 +0000 (UTC) Subject: rpms/zfstream/F-10 zfstream-zip.patch, NONE, 1.1 zfstream.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501211504.DC3057012F@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/zfstream/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21657 Modified Files: .cvsignore sources Added Files: zfstream-zip.patch zfstream.spec Log Message: copy from devel zfstream-zip.patch: --- NEW FILE zfstream-zip.patch --- --- src/zfstream.hpp.orig 2007-12-28 17:04:40.000000000 +0100 +++ src/zfstream.hpp 2007-12-28 17:06:16.000000000 +0100 @@ -45,7 +45,9 @@ */ GZipCompression = ZLibCompression, /** BZipCompression means to use the zfstream::obzstream class for output streams. */ - BZipCompression = 2 + BZipCompression = 2, + /** ZipCompression means to use the zfstream::ozipstream class for output streams. */ + ZipCompression = 3 }; /** @@ -81,6 +83,7 @@ - std::ifstream - zfstream::gzstream - zfstream::bzstream + - zfstream::zipstream It will return NULL if it cannot open filename, or a std::ifstream if it cannot figure out a decompression @@ -110,6 +113,7 @@ - zfstream::ogzstream - zfstream::obzstream + - zfstream::ozipstream - std::ofstream Note that this function only uses filename to pass to the --- src/zfstream.cpp.orig 2007-12-28 17:04:49.000000000 +0100 +++ src/zfstream.cpp 2007-12-28 17:11:39.000000000 +0100 @@ -17,6 +17,7 @@ #if HAVE_ZLIB # include "gzstream.hpp" +# include "zipstream.hpp" #endif #if HAVE_BZLIB # include "bzstream.hpp" @@ -33,6 +34,7 @@ case( NoCompression ): return "NoCompression"; break; case( ZLibCompression ): return "ZLibCompression"; break; case( BZipCompression ): return "BZipCompression"; break; + case( ZipCompression ): return "ZipCompression"; break; default: return ""; break; } } @@ -46,6 +48,7 @@ #endif #if HAVE_ZLIB if( ZLibCompression == p ) return true; + if( ZipCompression == p ) return true; #endif return false; } @@ -107,6 +110,12 @@ //COUT << "gzip!"< - 20041202-5 - rebuild * Fri May 1 2009 Thomas Sailer - 20041202-4 - reformat description * Thu Apr 30 2009 Thomas Sailer - 20041202-3 - use %%{name} macro (more) - remove minizip from Source1 - shortened summary - fix BR/R * Tue Nov 4 2008 Thomas Sailer - 20041202-2 - changed description - added unused-direct-shlib-dependency trick - add library dependences * Thu Dec 27 2007 Thomas Sailer - 20041202-1 - initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zfstream/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:54:58 -0000 1.1 +++ .cvsignore 1 May 2009 21:14:34 -0000 1.2 @@ -0,0 +1,2 @@ +libs11n_zfstream-2004.12.02.tar.gz +zfstream-autotools.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zfstream/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:54:58 -0000 1.1 +++ sources 1 May 2009 21:14:34 -0000 1.2 @@ -0,0 +1,2 @@ +906e46120012978a6715b425dd6db0a7 libs11n_zfstream-2004.12.02.tar.gz +fb26ab3f2a3e0c3f41adf3d0068fa589 zfstream-autotools.tar.gz From ausil at fedoraproject.org Fri May 1 21:17:25 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:17:25 +0000 (UTC) Subject: rpms/ykclient/devel import.log, NONE, 1.1 ykclient.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501211725.528CA7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/ykclient/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22180/devel Modified Files: .cvsignore sources Added Files: import.log ykclient.spec Log Message: initial import --- NEW FILE import.log --- ykclient-2_2-1_fc11:HEAD:ykclient-2.2-1.fc11.src.rpm:1241211954 --- NEW FILE ykclient.spec --- Name: ykclient Version: 2.2 Release: 1%{?dist} Summary: Yubikey management library and client Group: Applications/System License: BSD URL: http://yubico-c-client.googlecode.com/ Source0: http://yubico-c-client.googlecode.com/files/ykclient-2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel, chrpath %description commandline for yubikeys %package devel Summary: Development headers and libraries for ykclient Group: Development/System Requires: %{name} = %{version}-%{release} %description devel development bits %prep %setup -q %build %configure --enable-static=no make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libykclient.la chrpath -d $RPM_BUILD_ROOT%{_bindir}/ykclient %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING AUTHORS NEWS README %{_bindir}/ykclient %{_libdir}/libykclient.so.3* %files devel %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS %{_includedir}/ykclient.h %{_libdir}/libykclient.so %changelog * Wed Apr 29 2009 Dennis Gilmore - 2.2-1 - initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ykclient/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:43:22 -0000 1.1 +++ .cvsignore 1 May 2009 21:16:54 -0000 1.2 @@ -0,0 +1 @@ +ykclient-2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ykclient/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:43:22 -0000 1.1 +++ sources 1 May 2009 21:16:54 -0000 1.2 @@ -0,0 +1 @@ +65ae386f79597429995a1ce980ab19a3 ykclient-2.2.tar.gz From ausil at fedoraproject.org Fri May 1 21:20:30 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:20:30 +0000 (UTC) Subject: rpms/pam_yubico/devel import.log, NONE, 1.1 pam_yubico.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501212030.DDD2A7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/pam_yubico/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22772/devel Modified Files: .cvsignore sources Added Files: import.log pam_yubico.spec Log Message: initial import --- NEW FILE import.log --- pam_yubico-2_1-1_fc11:HEAD:pam_yubico-2.1-1.fc11.src.rpm:1241212696 --- NEW FILE pam_yubico.spec --- Name: pam_yubico Version: 2.1 Release: 1%{?dist} Summary: A Pluggable Authentication Module for yubikeys Group: System Environment/Base License: BSD URL: http://yubico-pam.googlecode.com/ Source0: http://yubico-pam.googlecode.com/files/pam_yubico-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ykclient-devel pam-devel #Requires: %description This is pam_yubico, a pluggable authentication module that can be used with Linux-PAM and yubikeys. This module supports yubikey OTP checking. %prep %setup -q %build %configure --libdir=/%{_lib} \ --with-pam-dir=/%{_lib}/security/ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_lib}/security/pam_yubico.la %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc NEWS README COPYING ChangeLog /%{_lib}/security/pam_yubico.so %changelog * Wed Apr 29 2009 Dennis Gilmore - 2.1-1 - initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pam_yubico/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:46:11 -0000 1.1 +++ .cvsignore 1 May 2009 21:20:00 -0000 1.2 @@ -0,0 +1 @@ +pam_yubico-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pam_yubico/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:46:11 -0000 1.1 +++ sources 1 May 2009 21:20:00 -0000 1.2 @@ -0,0 +1 @@ +ea288fa829790892170887ab4bb779bc pam_yubico-2.1.tar.gz From ausil at fedoraproject.org Fri May 1 21:24:12 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:24:12 +0000 (UTC) Subject: rpms/ykclient/F-11 ykclient.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090501212412.4D8157012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/ykclient/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23438 Modified Files: sources Added Files: ykclient.spec Log Message: initial build --- NEW FILE ykclient.spec --- Name: ykclient Version: 2.2 Release: 1%{?dist} Summary: Yubikey management library and client Group: Applications/System License: BSD URL: http://yubico-c-client.googlecode.com/ Source0: http://yubico-c-client.googlecode.com/files/ykclient-2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel, chrpath %description commandline for yubikeys %package devel Summary: Development headers and libraries for ykclient Group: Development/System Requires: %{name} = %{version}-%{release} %description devel development bits %prep %setup -q %build %configure --enable-static=no make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libykclient.la chrpath -d $RPM_BUILD_ROOT%{_bindir}/ykclient %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING AUTHORS NEWS README %{_bindir}/ykclient %{_libdir}/libykclient.so.3* %files devel %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS %{_includedir}/ykclient.h %{_libdir}/libykclient.so %changelog * Wed Apr 29 2009 Dennis Gilmore - 2.2-1 - initial packaging Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ykclient/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:43:22 -0000 1.1 +++ sources 1 May 2009 21:23:41 -0000 1.2 @@ -0,0 +1 @@ +65ae386f79597429995a1ce980ab19a3 ykclient-2.2.tar.gz From ausil at fedoraproject.org Fri May 1 21:26:00 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:26:00 +0000 (UTC) Subject: rpms/ykclient/F-10 ykclient.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090501212600.5C8647012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/ykclient/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23738 Modified Files: sources Added Files: ykclient.spec Log Message: initial build --- NEW FILE ykclient.spec --- Name: ykclient Version: 2.2 Release: 1%{?dist} Summary: Yubikey management library and client Group: Applications/System License: BSD URL: http://yubico-c-client.googlecode.com/ Source0: http://yubico-c-client.googlecode.com/files/ykclient-2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel, chrpath %description commandline for yubikeys %package devel Summary: Development headers and libraries for ykclient Group: Development/System Requires: %{name} = %{version}-%{release} %description devel development bits %prep %setup -q %build %configure --enable-static=no make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libykclient.la chrpath -d $RPM_BUILD_ROOT%{_bindir}/ykclient %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING AUTHORS NEWS README %{_bindir}/ykclient %{_libdir}/libykclient.so.3* %files devel %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS %{_includedir}/ykclient.h %{_libdir}/libykclient.so %changelog * Wed Apr 29 2009 Dennis Gilmore - 2.2-1 - initial packaging Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ykclient/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:43:22 -0000 1.1 +++ sources 1 May 2009 21:25:30 -0000 1.2 @@ -0,0 +1 @@ +65ae386f79597429995a1ce980ab19a3 ykclient-2.2.tar.gz From ausil at fedoraproject.org Fri May 1 21:27:29 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:27:29 +0000 (UTC) Subject: rpms/ykclient/EL-5 ykclient.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090501212729.E36B87012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/ykclient/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24106 Modified Files: sources Added Files: ykclient.spec Log Message: initial import --- NEW FILE ykclient.spec --- Name: ykclient Version: 2.2 Release: 1%{?dist} Summary: Yubikey management library and client Group: Applications/System License: BSD URL: http://yubico-c-client.googlecode.com/ Source0: http://yubico-c-client.googlecode.com/files/ykclient-2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel, chrpath %description commandline for yubikeys %package devel Summary: Development headers and libraries for ykclient Group: Development/System Requires: %{name} = %{version}-%{release} %description devel development bits %prep %setup -q %build %configure --enable-static=no make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libykclient.la chrpath -d $RPM_BUILD_ROOT%{_bindir}/ykclient %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING AUTHORS NEWS README %{_bindir}/ykclient %{_libdir}/libykclient.so.3* %files devel %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS %{_includedir}/ykclient.h %{_libdir}/libykclient.so %changelog * Wed Apr 29 2009 Dennis Gilmore - 2.2-1 - initial packaging Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ykclient/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:43:22 -0000 1.1 +++ sources 1 May 2009 21:26:59 -0000 1.2 @@ -0,0 +1 @@ +65ae386f79597429995a1ce980ab19a3 ykclient-2.2.tar.gz From transif at fedoraproject.org Fri May 1 21:28:19 2009 From: transif at fedoraproject.org (Transifex System User) Date: Fri, 1 May 2009 21:28:19 +0000 (UTC) Subject: comps/po nl.po,1.24,1.25 Message-ID: <20090501212819.B7D1A7012F@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24385/po Modified Files: nl.po Log Message: Sending translation for Dutch Index: nl.po =================================================================== RCS file: /cvs/pkgs/comps/po/nl.po,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- nl.po 29 Apr 2009 20:00:21 -0000 1.24 +++ nl.po 1 May 2009 21:27:49 -0000 1.25 @@ -1,27 +1,30 @@ +# translation of comps.HEAD.nl.po to Dutch # Dutch translation of comps # Copyright (C) 2003-2009 The Free Software Foundation, Inc. # This file is distributed under the same license as the comps package. # +# # Huib Kleinhout , 2003. # Peter van Egdom , 2003-2009. -# +# R.E. van der Luit , 2009. msgid "" msgstr "" -"Project-Id-Version: comps\n" +"Project-Id-Version: comps.HEAD.nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-03-15 20:21+0100\n" -"Last-Translator: Peter van Egdom \n" -"Language-Team: Dutch \n" +"POT-Creation-Date: 2009-05-01 19:12+0000\n" +"PO-Revision-Date: 2009-05-01 23:25+0200\n" +"Last-Translator: R.E. van der Luit \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\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 ../comps-f11.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." -msgstr "" -"Een lichte werkomgeving die zeer geschikt is voor minder krachtige machines." +msgstr "Een lichte werkomgeving die zeer geschikt is voor minder krachtige machines." #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 #: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1 @@ -428,8 +431,7 @@ msgstr "" #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78 #: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93 -msgid "" -"Install these tools to enable the system to print or act as a print server." +msgid "Install these tools to enable the system to print or act as a print server." msgstr "" "Installeer deze hulpmiddelen om uw systeem te kunnen laten printen of als " "printerserver te laten fungeren." @@ -437,8 +439,7 @@ msgstr "" #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79 #: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94 ../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." +msgid "Install this group of packages to use the base graphical (X) user interface." msgstr "" "Installeer deze pakketgroep om de basis grafische (X) gebruikersinterface te " "kunnen gebruiken." @@ -688,8 +689,7 @@ msgstr "Servers" #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137 #: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:169 #: ../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." +msgid "Simple window managers that aren't part of a larger desktop environment." msgstr "" "Eenvoudige window managers die geen deel uitmaken van een grotere " "werkomgeving." @@ -825,8 +825,7 @@ msgstr "Deze toepassingen omvatten offic #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160 #: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:200 -msgid "" -"The packages in this group are core libraries needed to develop applications." +msgid "The packages in this group are core libraries needed to develop applications." msgstr "" "De pakketten in deze groep bestaan uit basisbibliotheken die nodig zijn voor " "ontwikkeling van toepassingen." @@ -839,26 +838,21 @@ msgstr "Met deze pakketten kunt u een IM #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162 #: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:202 -msgid "" -"These packages allow you to develop applications for the X Window System." -msgstr "" -"Met deze pakketten kunt u toepassingen voor het X Window systeem ontwikkelen." +msgid "These packages allow you to develop applications for the X Window System." +msgstr "Met deze pakketten kunt u toepassingen voor het X Window systeem ontwikkelen." #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163 #: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:203 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 -msgid "" -"These packages are helpful when developing web applications or web pages." +msgid "These packages are helpful when developing web applications or web pages." msgstr "" "Deze pakketten zijn handig bij het ontwikkelen van webapplicaties of " "webpagina's." #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164 #: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:204 -msgid "" -"These packages include network-based servers such as DHCP, Kerberos and NIS." -msgstr "" -"Deze pakketten bevatten netwerkgebaseerde servers als DHCP, Kerberos en NIS." +msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." +msgstr "Deze pakketten bevatten netwerkgebaseerde servers als DHCP, Kerberos en NIS." #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165 #: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:205 @@ -959,8 +953,7 @@ msgstr "" #: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:218 #: ../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 "" -"Deze groep bevat pakketten waarmee u afbeeldingen kunt inscannen en bewerken." +msgstr "Deze groep bevat pakketten waarmee u afbeeldingen kunt inscannen en bewerken." #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179 #: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:219 @@ -986,8 +979,7 @@ msgstr "" #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181 #: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:221 #: ../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." +msgid "This group is a collection of tools and resources of Armenian environments." msgstr "" "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Armeense " "omgevingen." @@ -995,8 +987,7 @@ msgstr "" #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182 #: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:222 #: ../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." +msgid "This group is a collection of tools for various hardware specific utilities." msgstr "" "Deze groep is een collectie van hulpmiddelen voor diverse hardware-" "specifieke gereedschappen." @@ -1014,10 +1005,8 @@ msgstr "" #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184 #: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:225 -msgid "" -"This package group allows you to run a DNS name server (BIND) on the system." -msgstr "" -"Met deze pakketgroep kunt u een DNS-naamserver (BIND) op het systeem draaien." +msgid "This package group allows you to run a DNS name server (BIND) on the system." +msgstr "Met deze pakketgroep kunt u een DNS-naamserver (BIND) op het systeem draaien." #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185 #: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:226 @@ -1031,14 +1020,12 @@ msgstr "" #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186 #: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:227 msgid "This package group contains packages useful for use with MySQL." -msgstr "" -"Deze pakketgroep bevat pakketten die nuttig zijn voor gebruik met MySQL." +msgstr "Deze pakketgroep bevat pakketten die nuttig zijn voor gebruik met MySQL." #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187 #: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:228 msgid "This package group includes packages useful for use with Postgresql." -msgstr "" -"Deze pakketgroep bevat pakketten die nuttig zijn voor gebruik met Postgresql." +msgstr "Deze pakketgroep bevat pakketten die nuttig zijn voor gebruik met Postgresql." #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188 #: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:229 @@ -1091,8 +1078,7 @@ msgstr "Verschillende kerndelen van het #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:241 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." -msgstr "" -"Verschillende mogelijkheden om te ontspannen en uw vrije tijd te besteden." +msgstr "Verschillende mogelijkheden om te ontspannen en uw vrije tijd te besteden." #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198 #: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:242 @@ -1312,19 +1298,16 @@ msgid "Amazigh Support" msgstr "Ondersteuning voor Amazigh" #: ../comps-f11.xml.in.h:13 -#, fuzzy msgid "Azerbaijani Support" -msgstr "Ondersteuning voor Servisch" +msgstr "Azerbaijani Support" #: ../comps-f11.xml.in.h:27 -#, fuzzy msgid "Chichewa Support" -msgstr "Ondersteuning voor Chinees" +msgstr "Chichewa Support" #: ../comps-f11.xml.in.h:31 -#, fuzzy msgid "Coptic Support" -msgstr "Ondersteuning voor Kroatisch" +msgstr "Coptic Support" #: ../comps-f11.xml.in.h:37 msgid "Design and Simulation tools for hardware engineers" @@ -1335,9 +1318,8 @@ msgid "Electronic Lab" msgstr "Elektronisch lab" #: ../comps-f11.xml.in.h:58 -#, fuzzy msgid "Fijian Support" -msgstr "Ondersteuning voor Fries" +msgstr "Fijian Support" #: ../comps-f11.xml.in.h:61 msgid "Font design and packaging" @@ -1352,47 +1334,40 @@ msgid "Friulian Support" msgstr "Ondersteuning voor Friulisch" #: ../comps-f11.xml.in.h:83 -#, fuzzy msgid "Hiligaynon Support" -msgstr "Ondersteuning voor Filipijns" +msgstr "Hiligaynon Support" #: ../comps-f11.xml.in.h:96 -#, fuzzy msgid "Interlingua Support" -msgstr "Ondersteuning voor Italiaans" +msgstr "Interlingua Support" #: ../comps-f11.xml.in.h:109 -#, fuzzy msgid "Kazakh Support" -msgstr "Ondersteuning voor Kannada" +msgstr "Ondersteuning voor Kazakh" #: ../comps-f11.xml.in.h:111 msgid "Kinyarwanda Support" msgstr "Ondersteuning voor Kinyarwanda" #: ../comps-f11.xml.in.h:118 -#, fuzzy msgid "Latin Support" -msgstr "Ondersteuning voor Lets" +msgstr "Ondersteuning voor Latijn" #: ../comps-f11.xml.in.h:126 -#, fuzzy msgid "Luxembourgish Support" -msgstr "Ondersteuning voor Turks" +msgstr "Ondersteuning voor Luxemburg" #: ../comps-f11.xml.in.h:130 msgid "Malagasy Support" msgstr "Ondersteuning voor Malagasi" #: ../comps-f11.xml.in.h:133 -#, fuzzy msgid "Maltese Support" -msgstr "Ondersteuning voor Maleis" +msgstr "Ondersteuning voor Maltees" #: ../comps-f11.xml.in.h:134 -#, fuzzy msgid "Manx Support" -msgstr "Ondersteuning voor Maleis" +msgstr "Ondersteuning voor Manx" #: ../comps-f11.xml.in.h:137 msgid "MinGW cross-compiler" @@ -1411,14 +1386,12 @@ msgid "Online Help and Documentation" msgstr "Online hulp en documentatie" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "Ondersteuning voor Spaans" +msgstr "Ondersteuning voor Sanskrit" #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "Ondersteuning voor Oekra??ens" +msgstr "Ondersteuning voor Sardini??" #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" @@ -1442,14 +1415,12 @@ msgstr "" "CAML programmeertaal en bibliotheken." #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "Ondersteuning voor Swati" +msgstr "Ondersteuning voor Swahili" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "Ondersteuning voor Telugu" +msgstr "Ondersteuning voor Tetum" #: ../comps-f11.xml.in.h:223 msgid "" @@ -1516,22 +1487,19 @@ msgid "This group is a collection of net msgstr "Deze groep is een collectie van netwerkservers voor specifieke doelen" #: ../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 "" "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Arabische " "omgevingen." #: ../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 "" "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Hebreeuwse " "omgevingen." #: ../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 "" "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Japanse " "omgevingen." @@ -1541,395 +1509,8 @@ 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 "" "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Tsjechische " "omgevingen." -#~ msgid "Haskell" -#~ msgstr "Haskell" - -#~ msgid "British Support" -#~ msgstr "Britse ondersteuning" - -#~ msgid "Cluster Storage" -#~ msgstr "Cluster-opslag" - -#~ msgid "Clustering Support." -#~ msgstr "Cluster-ondersteuning." - -#~ msgid "Miscellaneous Included Packages" -#~ msgstr "Verschillende bijgeleverde pakketten" - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "Pakketten die ondersteuning bieden voor cluster-opslag." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "Pakketten die ondersteuning bieden voor single-node GFS." - -#~ msgid "Single Node GFS Support" -#~ msgstr "Single Node GFS ondersteuning" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "" -#~ "Deze pakketten bieden compatibiliteitsondersteuning met voorgaande " -#~ "versies." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "Java Runtime Environments en Development Kits" - -#~ msgid "Misc" -#~ msgstr "Diverse" - -#~ msgid "Misc packages" -#~ msgstr "Diverse pakketten" - -#~ msgid "Multimedia" -#~ msgstr "Multimedia" - -#~ msgid "Multimedia applications" -#~ msgstr "Multimedia-toepassingen" - -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "" -#~ "Pakketten die additionele functionaliteit bieden voor Red Hat Enterprise " -#~ "Linux" - -#, fuzzy -#~ msgid "Red Hat Enterprise Linux Supplementary" -#~ msgstr "Red Hat Enterprise Linux 3 Documentatie" - -#~ msgid "Virtualization Support." -#~ msgstr "Ondersteuning voor virtualisatie." - -#, fuzzy -#~ msgid "Somail Support" -#~ msgstr "Swati ondersteuning" - -#~ msgid "Compatibility Arch Development Support" -#~ msgstr "Architectuur compatibiliteitsondersteuning voor ontwikkeling" - -#~ msgid "Compatibility Arch Mozilla Support" -#~ msgstr "Architectuur compatibiliteitsondersteuning voor Mozilla" - -#~ msgid "Compatibility Arch Support" -#~ msgstr "Architectuur compatibiliteitsondersteuning" - -#~ msgid "Cyrillic Support" -#~ msgstr "Cyrillische ondersteuning" - -#~ msgid "Desktops" -#~ msgstr "Werkomgevingen" - -#~ msgid "Emacs" -#~ msgstr "Emacs" - -#~ msgid "GNOME" -#~ msgstr "GNOME" - -#~ msgid "ISO8859-14 Support" -#~ msgstr "ISO8859-14 ondersteuning" - -#~ msgid "ISO8859-15 Support" -#~ msgstr "ISO8859-15 ondersteuning" - -#~ msgid "ISO8859-2 Support" -#~ msgstr "ISO8859-2 ondersteuning" - -#~ msgid "ISO8859-9 Support" -#~ msgstr "ISO8859-9 ondersteuning" - -#~ msgid "Install these packages to recompile the kernel." -#~ msgstr "" -#~ "Installeer deze pakketten om de kernel opnieuw te kunnen compileren." - -#~ msgid "KDE" -#~ msgstr "KDE" - -#~ msgid "KDE Desktop Environment" -#~ msgstr "KDE-werkomgeving" - -#~ msgid "Kernel Development" -#~ msgstr "Kernelontwikkeling" - -#~ msgid "Mozilla packages for the x86 platform" -#~ msgstr "Mozilla pakketten voor het x86 platform" - -#~ msgid "Multilib support packages" -#~ msgstr "Support pakketten voor Multilib" - -#~ msgid "SQL Database" -#~ msgstr "SQL Database" - -#~ msgid "Server" -#~ msgstr "Server" - -#~ msgid "Support for developing packages for the non-primary architecture" -#~ msgstr "" -#~ "Ondersteuning voor het ontwikkelen van pakketten voor de niet-primaire " -#~ "architectuur" - -#~ msgid "Syriac Support" -#~ msgstr "Cyrische ondersteuning" - -#~ msgid "System" -#~ msgstr "Systeem" - -#~ msgid "The GNU Emacs text editor." -#~ msgstr "De GNU Emacs tekst-editor." - -#~ msgid "" -#~ "These packages allow you to configure an IMAP or Postfix mail server." -#~ msgstr "" -#~ "Met deze pakketten kunt u een IMAP of Postfix e-mailserver configureren." - -#~ msgid "" -#~ "These packages provide compatibility support for previous releases of Red " -#~ "Hat Enterprise Linux." -#~ msgstr "" -#~ "Deze pakketten bieden compatibiliteitsondersteuning voor voorgaande " -#~ "versies van Red Hat Enterprise Linux." - -#~ msgid "Unsupported Development Libraries" -#~ msgstr "Niet-ondersteunde ontwikkelingsbibliotheken" - -#~ msgid "Workstation Common" -#~ msgstr "Werkstation algemeen" - -#~ msgid "ppc64 Compatibility Arch Support" -#~ msgstr "ppc64 Compatibiliteits-ondersteuning" - -#~ msgid "x86 Compatibility Arch Development Support" -#~ msgstr "x86 Compatibiliteits-ondersteuning voor softwareontwikkeling" - -#~ msgid "x86 Compatibility Arch Support" -#~ msgstr "x86 Compatibiliteits-ondersteuning" - -#~ msgid "Brazilian Portuguese" -#~ msgstr "Braziliaans Portugees" - -#~ msgid "English" -#~ msgstr "Engels" - -#~ msgid "French" -#~ msgstr "Frans" - -#~ msgid "German" -#~ msgstr "Duits" - -#~ msgid "Italian" -#~ msgstr "Italiaans" - -#~ msgid "Spanish" -#~ msgstr "Spaans" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Brazilian Portuguese language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de " -#~ "Braziliaans- Portugese taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "English language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Engelse " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "French language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Franse " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "German language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Duitse " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Italian language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de " -#~ "Italiaanse taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Spanish language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Spaanse " -#~ "taal." - -#~ msgid "Japanese" -#~ msgstr "Japans" - -#~ msgid "Korean" -#~ msgstr "Koreaans" - -#~ msgid "Simplified Chinese" -#~ msgstr "Versimpeld Chinees" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Japanese language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Japanse " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Korean language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Koreaanse " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Simplified Chinese language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de " -#~ "Versimpeld Chinese taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Traditional Chinese language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de " -#~ "Traditioneel Chinese taal." - -#~ msgid "Traditional Chinese" -#~ msgstr "Traditioneel Chinees" - -#~ msgid "ppc64 Compatibility Arch Development Support" -#~ msgstr "ppc64 Compatibiliteits-ondersteuning voor softwareontwikkeling" - -#~ msgid "Bengali" -#~ msgstr "Bengaals" - -#~ msgid "Gujarati" -#~ msgstr "Gujarati" - -#~ msgid "Hindi" -#~ msgstr "Hindi" - -#~ msgid "Punjabi" -#~ msgstr "Punjabi" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Bengali language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Bengaalse " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Gujarati language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Gujarati " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Hindi language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Hindi " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Punjabi language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Punjabi " -#~ "taal." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Tamil language." -#~ msgstr "" -#~ "Deze groep bevat de Red Hat Enterprise Linux documentatie in de Tamil " -#~ "taal." - -#~ msgid "Red Hat Enterprise Linux Extras" -#~ msgstr "Red Hat Enterprise Linux Extras" - -#~ msgid "Workstation" -#~ msgstr "Werkstation" - -#~ msgid "Workstation applications and utilities." -#~ msgstr "Toepassingen en hulpprogramma's voor werkstations." - -#~ msgid "Compatibility Arch" -#~ msgstr "Architectuur compatibiliteit" - -#~ msgid "Compatibility Arch Libraries" -#~ msgstr "Architectuur compatibiliteitsbibliotheken" - -#~ msgid "Multilib library packages" -#~ msgstr "Library pakketten voor Multilib" - -#~ msgid "" -#~ "Packages which provide functionality for the compatibility architecture." -#~ msgstr "" -#~ "Pakketten die functionaliteit bieden voor de architectuur compatibiliteit." - -#~ msgid "IBM eServer iSeries/pSeries Provided Software" -#~ msgstr "Software voor IBM eServer iSeries/pSeries" - -#~ msgid "Software provided by IBM for eServer iSeries and pSeries machines" -#~ msgstr "" -#~ "Software geleverd door IBM voor eServer iSeries and pSeries machines" - -#~ msgid "HPC" -#~ msgstr "HPC" - -#~ msgid "High Performance Computing Support" -#~ msgstr "Ondersteuning voor High Performance Computing" - -#~ msgid "" -#~ "These packages provide the kernel and userspace tools needed for using " -#~ "the Xen virtual machine monitor" -#~ msgstr "" -#~ "Deze pakketten bieden de kernel en userspace-hulpmiddelen die nodig zijn " -#~ "om de Xen virtual machine monitor te gebruiken" - -#~ msgid "Xen" -#~ msgstr "Xen" - -#~ msgid "Cups" -#~ msgstr "Cups" - -#~ msgid "Cups printing service and drivers to use it." -#~ msgstr "Cups printerondersteuning en bijbehorende stuurprogramma's." - -#~ msgid "SQL Database Server" -#~ msgstr "SQL-databaseserver" - -#~ msgid "Supported Packages" -#~ msgstr "Ondersteunde pakketten" - -#~ msgid "" -#~ "These packages include network-based servers such as CIPE, DHCP, and " -#~ "telnet." -#~ msgstr "" -#~ "Deze pakketten bevatten netwerkgebaseerde servers als CIPE, DHCP en " -#~ "telnet." - -#~ msgid "This package group allows you to run an SQL server on the system." -#~ msgstr "Met deze pakketgroep kunt u een SQL-server op het systeem draaien." - -#~ msgid "GNOME Desktop" -#~ msgstr "GNOME Desktop" - -#~ msgid "" -#~ "These packages include network-based servers such as DHCP and telnet." -#~ msgstr "" -#~ "Deze pakketten bevatten netwerkgebaseerde servers als DHCP en telnet." From ausil at fedoraproject.org Fri May 1 21:37:48 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 21:37:48 +0000 (UTC) Subject: rpms/pam_yubico/EL-5 pam_yubico.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090501213748.8A74F7012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pam_yubico/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26157 Modified Files: sources Added Files: pam_yubico.spec Log Message: initial build --- NEW FILE pam_yubico.spec --- Name: pam_yubico Version: 2.1 Release: 1%{?dist} Summary: A Pluggable Authentication Module for yubikeys Group: System Environment/Base License: BSD URL: http://yubico-pam.googlecode.com/ Source0: http://yubico-pam.googlecode.com/files/pam_yubico-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ykclient-devel pam-devel #Requires: %description This is pam_yubico, a pluggable authentication module that can be used with Linux-PAM and yubikeys. This module supports yubikey OTP checking. %prep %setup -q %build %configure --libdir=/%{_lib} \ --with-pam-dir=/%{_lib}/security/ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_lib}/security/pam_yubico.la %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc NEWS README COPYING ChangeLog /%{_lib}/security/pam_yubico.so %changelog * Wed Apr 29 2009 Dennis Gilmore - 2.1-1 - initial packaging Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam_yubico/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:46:11 -0000 1.1 +++ sources 1 May 2009 21:37:18 -0000 1.2 @@ -0,0 +1 @@ +ea288fa829790892170887ab4bb779bc pam_yubico-2.1.tar.gz From cwickert at fedoraproject.org Fri May 1 21:38:49 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Fri, 1 May 2009 21:38:49 +0000 (UTC) Subject: rpms/lxshortcut/devel import.log, NONE, 1.1 lxshortcut.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501213849.979947012F@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxshortcut/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26377/devel Modified Files: .cvsignore sources Added Files: import.log lxshortcut.spec Log Message: Initial import of lxshortcut. Review at https://bugzilla.redhat.com/show_bug.cgi?id=498492 --- NEW FILE import.log --- lxshortcut-0_1-1_fc11:HEAD:lxshortcut-0.1-1.fc11.src.rpm:1241213846 --- NEW FILE lxshortcut.spec --- Name: lxshortcut Version: 0.1 Release: 1%{?dist} Summary: Small utility to edit application shortcuts Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.org Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, gettext %description LXShortcut is a small utility to edit application shortcuts created with freedesktop.org Desktop Entry spec. Now editing of application shortcuts becomes quite easy. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %changelog * Sun Dec 07 2008 Christoph Wickert - 0.1-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxshortcut/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:53:06 -0000 1.1 +++ .cvsignore 1 May 2009 21:38:19 -0000 1.2 @@ -0,0 +1 @@ +lxshortcut-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxshortcut/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:53:06 -0000 1.1 +++ sources 1 May 2009 21:38:19 -0000 1.2 @@ -0,0 +1 @@ +63d1d0a4706b580d819b4d51fa057b25 lxshortcut-0.1.tar.gz From cwickert at fedoraproject.org Fri May 1 21:41:04 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Fri, 1 May 2009 21:41:04 +0000 (UTC) Subject: rpms/lxshortcut/devel lxshortcut.spec,1.1,1.2 Message-ID: <20090501214104.CE80F7012F@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxshortcut/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26811 Modified Files: lxshortcut.spec Log Message: preserve timestamps during install Index: lxshortcut.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxshortcut/devel/lxshortcut.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- lxshortcut.spec 1 May 2009 21:38:19 -0000 1.1 +++ lxshortcut.spec 1 May 2009 21:40:34 -0000 1.2 @@ -28,7 +28,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} From cwickert at fedoraproject.org Fri May 1 21:43:34 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Fri, 1 May 2009 21:43:34 +0000 (UTC) Subject: rpms/lxshortcut/F-11 lxshortcut.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501214334.688427012F@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxshortcut/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27174/F-11 Modified Files: .cvsignore sources Added Files: lxshortcut.spec Log Message: Initial version for this branch --- NEW FILE lxshortcut.spec --- Name: lxshortcut Version: 0.1 Release: 1%{?dist} Summary: Small utility to edit application shortcuts Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.org Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, gettext %description LXShortcut is a small utility to edit application shortcuts created with freedesktop.org Desktop Entry spec. Now editing of application shortcuts becomes quite easy. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %changelog * Sun Dec 07 2008 Christoph Wickert - 0.1-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxshortcut/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:53:06 -0000 1.1 +++ .cvsignore 1 May 2009 21:43:04 -0000 1.2 @@ -0,0 +1 @@ +lxshortcut-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxshortcut/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:53:06 -0000 1.1 +++ sources 1 May 2009 21:43:04 -0000 1.2 @@ -0,0 +1 @@ +63d1d0a4706b580d819b4d51fa057b25 lxshortcut-0.1.tar.gz From cwickert at fedoraproject.org Fri May 1 21:43:34 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Fri, 1 May 2009 21:43:34 +0000 (UTC) Subject: rpms/lxshortcut/F-10 lxshortcut.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501214334.4CA487012F@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxshortcut/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27174/F-10 Modified Files: .cvsignore sources Added Files: lxshortcut.spec Log Message: Initial version for this branch --- NEW FILE lxshortcut.spec --- Name: lxshortcut Version: 0.1 Release: 1%{?dist} Summary: Small utility to edit application shortcuts Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.org Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, gettext %description LXShortcut is a small utility to edit application shortcuts created with freedesktop.org Desktop Entry spec. Now editing of application shortcuts becomes quite easy. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %changelog * Sun Dec 07 2008 Christoph Wickert - 0.1-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxshortcut/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:53:06 -0000 1.1 +++ .cvsignore 1 May 2009 21:43:03 -0000 1.2 @@ -0,0 +1 @@ +lxshortcut-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxshortcut/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:53:06 -0000 1.1 +++ sources 1 May 2009 21:43:03 -0000 1.2 @@ -0,0 +1 @@ +63d1d0a4706b580d819b4d51fa057b25 lxshortcut-0.1.tar.gz From davidz at fedoraproject.org Fri May 1 22:10:11 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Fri, 1 May 2009 22:10:11 +0000 (UTC) Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.8, 1.9 DeviceKit-disks.spec, 1.23, 1.24 sources, 1.8, 1.9 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch, 1.1, NONE Message-ID: <20090501221011.C89C17012F@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit-disks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30694 Modified Files: .cvsignore DeviceKit-disks.spec sources Removed Files: 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch Log Message: * Fri May 01 2009 David Zeuthen - 004-1%{?dist} - Upstream release 004 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 15 Apr 2009 18:56:16 -0000 1.8 +++ .cvsignore 1 May 2009 22:09:40 -0000 1.9 @@ -5,3 +5,4 @@ DeviceKit-disks-004.20090406git.tar.gz DeviceKit-disks-004.20090408git.tar.gz DeviceKit-disks-004.20090412git.tar.gz DeviceKit-disks-004.20090415git.tar.gz +DeviceKit-disks-004.tar.gz Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- DeviceKit-disks.spec 16 Apr 2009 17:09:55 -0000 1.23 +++ DeviceKit-disks.spec 1 May 2009 22:09:40 -0000 1.24 @@ -7,12 +7,12 @@ %define udev_version 139 %define mdadm_version 2.6.7 %define device_mapper_version 1.02 -%define libatasmart_version 0.8 +%define libatasmart_version 0.12 Summary: Disk Management Service Name: DeviceKit-disks Version: 004 -Release: 0.10.20090415git%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary @@ -59,8 +59,6 @@ Requires: ntfsprogs # for /proc/self/mountinfo, only available in 2.6.26 or higher Conflicts: kernel < 2.6.26 -Patch0: 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch - %description DeviceKit-disks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. @@ -77,7 +75,6 @@ D-Bus interface definitions for DeviceKi %prep %setup -q -%patch0 -p1 -b .vfat-whole-disk %build %configure @@ -135,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Fri May 01 2009 David Zeuthen - 004-1%{?dist} +- Upstream release 004 + * Thu Apr 16 2009 David Zeuthen - 004-0.10.20090415git%{?dist} - Properly detect vfat on whole disk devices (#495876) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 15 Apr 2009 18:56:16 -0000 1.8 +++ sources 1 May 2009 22:09:40 -0000 1.9 @@ -1 +1 @@ -7585b97cd3236b10f078b4078c34ee5a DeviceKit-disks-004.20090415git.tar.gz +1ed8e1931f56ad3fc53ba485391434b5 DeviceKit-disks-004.tar.gz --- 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch DELETED --- From transif at fedoraproject.org Fri May 1 22:13:37 2009 From: transif at fedoraproject.org (Transifex System User) Date: Fri, 1 May 2009 22:13:37 +0000 (UTC) Subject: comps/po fr.po,1.22,1.23 Message-ID: <20090501221337.81A637012F@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31105/po Modified Files: fr.po Log Message: Sending translation for French Index: fr.po =================================================================== RCS file: /cvs/pkgs/comps/po/fr.po,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- fr.po 29 Apr 2009 20:00:19 -0000 1.22 +++ fr.po 1 May 2009 22:13:06 -0000 1.23 @@ -2,6 +2,8 @@ # French translation of comps # This file is distributed under the same license as the comps package. # Copyright (C) 2006-2008 Fedora Project. +# +# # Audrey Simons , 2003, 2004. # Thomas Canniot , 2006, 2007, 2008. # Damien Durand , 2006. @@ -12,19 +14,20 @@ # Corina Roe , 2008. # Corentin Perard , 2009. # Corina Roe , 2009. -# -# +# Charles-Antoine Couret , 2009. msgid "" msgstr "" "Project-Id-Version: comps.HEAD.fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-02-12 19:41+0100\n" -"Last-Translator: Corentin Perard \n" +"POT-Creation-Date: 2009-04-26 19:01+0000\n" +"PO-Revision-Date: 2009-04-28 22:33+0200\n" +"Last-Translator: Charles-Antoine Couret \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\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 ../comps-f11.xml.in.h:1 @@ -82,142 +85,142 @@ msgid "Authoring and Publishing" msgstr "Cr??ation et ??dition" #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 -#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14 +#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 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:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7 +#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7 #: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Syst??me de base" #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 -#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16 +#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15 msgid "Basic support for the Ruby programming language." 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:15 ../comps-f11.xml.in.h:17 +#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16 msgid "Basque Support" msgstr "Prise en charge du basque" #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 -#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18 +#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17 msgid "Belarusian Support" msgstr "Prise en charge du bi??lorusse" #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 -#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19 +#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18 msgid "Bengali Support" msgstr "Prise en charge du bengal??" #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 -#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20 +#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19 msgid "Bhutanese Support" msgstr "Prise en charge du dzongkha" #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 -#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21 +#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20 msgid "Bosnian Support" msgstr "Prise en charge du bosniaque" #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 -#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22 +#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21 msgid "Brazilian Portuguese Support" msgstr "Prise en charge du portugais br??silien" #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20 -#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23 +#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22 msgid "Breton Support" msgstr "Prise en charge du breton" #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22 -#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25 +#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24 msgid "Bulgarian Support" msgstr "Prise en charge du bulgare" #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23 -#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26 +#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25 msgid "Catalan Support" msgstr "Prise en charge du catalan" #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24 -#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28 +#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26 msgid "Chinese Support" msgstr "Prise en charge du chinois" #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25 -#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29 +#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27 msgid "Clustering" msgstr "Syst??mes en grappe" #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26 -#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:30 +#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28 msgid "Clustering Support" msgstr "Prise en charge des syst??mes en grappe" #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27 -#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32 +#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29 msgid "Core" msgstr "Core" #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28 -#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33 +#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 msgid "Croatian Support" msgstr "Prise en charge du croate" #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29 -#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34 ../comps-el5.xml.in.h:8 +#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8 msgid "Czech Support" msgstr "Prise en charge du tch??que" #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30 -#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35 +#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32 msgid "DNS Name Server" msgstr "Serveur de nom DNS" #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31 -#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36 +#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 msgid "Danish Support" msgstr "Prise en charge du danois" #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32 -#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38 ../comps-el4.xml.in.h:8 +#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8 #: ../comps-el5.xml.in.h:9 msgid "Desktop Environments" msgstr "Environnements de bureau" #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33 -#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:9 +#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9 #: ../comps-el5.xml.in.h:10 msgid "Desktop environments" msgstr "Environnements de bureau" #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34 -#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:10 +#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10 #: ../comps-el5.xml.in.h:11 msgid "Development" msgstr "D??veloppement" #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35 -#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41 +#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38 msgid "Development Libraries" msgstr "Biblioth??ques de d??veloppement" #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36 -#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:11 +#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11 #: ../comps-el5.xml.in.h:12 msgid "Development Tools" msgstr "Outils de d??veloppement" #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37 -#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43 +#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40 msgid "Dial-up Networking Support" msgstr "Prise en charge de l'acc??s au r??seau par connexion t??l??phonique" #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38 -#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44 +#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41 msgid "Dutch Support" msgstr "Prise en charge du hollandais" @@ -226,78 +229,78 @@ 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:40 ../comps-f11.xml.in.h:45 ../comps-el4.xml.in.h:13 +#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13 #: ../comps-el5.xml.in.h:14 msgid "Editors" msgstr "??diteurs" #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40 -#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:14 +#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14 #: ../comps-el5.xml.in.h:15 msgid "Educational Software" msgstr "Logiciel ??ducatif" #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41 -#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47 ../comps-el4.xml.in.h:15 +#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15 #: ../comps-el5.xml.in.h:16 msgid "Educational software for learning" msgstr "Logiciel ??ducatif d'apprentissage" #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42 -#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49 ../comps-el4.xml.in.h:16 +#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16 #: ../comps-el5.xml.in.h:17 msgid "Engineering and Scientific" msgstr "Ing??nierie et scientifique" #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43 -#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50 +#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47 msgid "English (UK) Support" msgstr "Prise en charge de l'anglais (RU)" #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45 -#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52 +#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49 msgid "Estonian Support" msgstr "Prise en charge de l'estonien" #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46 -#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53 +#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50 msgid "Ethiopic Support" msgstr "Prise en charge de l'??thiopien" #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47 -#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:17 +#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17 #: ../comps-el5.xml.in.h:18 msgid "FTP Server" msgstr "Serveur FTP" #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48 -#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55 +#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52 msgid "Faeroese Support" msgstr "Prise en charge du f??ringien" #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50 -#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57 ../comps-el4.xml.in.h:18 +#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18 #: ../comps-el5.xml.in.h:19 msgid "Fedora Packager" msgstr "Empaqueteur Fedora" #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51 -#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59 +#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55 msgid "Filipino Support" msgstr "Prise en charge du pilipino" #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52 -#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60 +#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56 msgid "Finnish Support" msgstr "Prise en charge du finnois" #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55 -#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64 +#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 msgid "French Support" msgstr "Prise en charge du fran??ais" #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56 -#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67 ../comps-el4.xml.in.h:19 +#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../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 " @@ -308,19 +311,19 @@ msgstr "" "fichiers multim??dia." #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57 -#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68 ../comps-el4.xml.in.h:20 +#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20 #: ../comps-el5.xml.in.h:21 msgid "GNOME Desktop Environment" msgstr "Environnement de bureau GNOME" #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58 -#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:21 +#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21 #: ../comps-el5.xml.in.h:22 msgid "GNOME Software Development" msgstr "D??veloppement de logiciel GNOME" #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59 -#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70 +#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66 msgid "" "GNOME is a powerful graphical user interface which includes a panel, " "desktop, system icons, and a graphical file manager." @@ -330,86 +333,86 @@ msgstr "" "fichiers graphique." #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60 -#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71 +#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67 msgid "Gaelic Support" msgstr "Prise en charge du ga??lique" #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61 -#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72 +#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68 msgid "Galician Support" msgstr "Prise en charge du galicien" #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62 -#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73 ../comps-el5.xml.in.h:24 +#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24 msgid "Games and Entertainment" msgstr "Jeux et divertissements" #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63 -#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74 +#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70 msgid "Georgian Support" msgstr "Prise en charge du g??orgien" #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64 -#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75 +#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71 msgid "German Support" msgstr "Prise en charge de l'allemand" #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65 -#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:23 +#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23 #: ../comps-el5.xml.in.h:25 msgid "Graphical Internet" msgstr "Internet graphique" #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66 -#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77 ../comps-el4.xml.in.h:24 +#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24 #: ../comps-el5.xml.in.h:26 msgid "Graphics" msgstr "Graphismes" #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67 -#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78 +#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74 msgid "Greek Support" msgstr "Prise en charge du grec" #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68 -#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79 +#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75 msgid "Gujarati Support" msgstr "Prise en charge du gujar??t??" #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69 -#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80 ../comps-el4.xml.in.h:25 +#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25 #: ../comps-el5.xml.in.h:27 msgid "Hardware Support" 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:72 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:26 +#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../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:73 ../comps-f11.xml.in.h:84 +#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79 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:74 ../comps-f11.xml.in.h:85 +#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80 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:75 ../comps-f11.xml.in.h:86 +#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81 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:76 ../comps-f11.xml.in.h:87 +#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82 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:79 ../comps-f11.xml.in.h:90 ../comps-el4.xml.in.h:27 +#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27 #: ../comps-el5.xml.in.h:29 msgid "" "Install these packages in order to develop GTK+ and GNOME graphical " @@ -419,7 +422,7 @@ msgstr "" "GNOME." #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76 -#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91 +#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86 msgid "" "Install these packages in order to develop GTK+ and XFCE graphical " "applications." @@ -428,14 +431,14 @@ msgstr "" "XFCE." #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77 -#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:28 +#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../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 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:82 ../comps-f11.xml.in.h:93 +#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88 msgid "" "Install these tools to enable the system to print or act as a print server." msgstr "" @@ -443,7 +446,7 @@ msgstr "" "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:83 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:29 +#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../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." @@ -452,50 +455,50 @@ msgstr "" "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:85 ../comps-f11.xml.in.h:97 +#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91 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:86 ../comps-f11.xml.in.h:98 +#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92 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:87 ../comps-f11.xml.in.h:99 +#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93 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:88 ../comps-f11.xml.in.h:100 ../comps-el4.xml.in.h:30 +#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../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:89 ../comps-f11.xml.in.h:101 ../comps-el4.xml.in.h:31 +#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../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:90 ../comps-f11.xml.in.h:102 ../comps-el4.xml.in.h:32 +#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../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:91 ../comps-f11.xml.in.h:103 ../comps-el4.xml.in.h:33 +#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../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:92 ../comps-f11.xml.in.h:104 ../comps-el4.xml.in.h:34 +#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../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:93 ../comps-f11.xml.in.h:105 +#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99 msgid "" "KDE is a powerful graphical user interface which includes a panel, desktop, " "system icons, and a graphical file manager." @@ -505,121 +508,121 @@ msgstr "" "fichiers graphique." #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90 -#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106 +#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100 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:97 ../comps-f11.xml.in.h:110 +#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103 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:99 ../comps-f11.xml.in.h:113 +#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106 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:95 -#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116 +#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109 msgid "Languages" msgstr "Langues" #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96 -#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117 +#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110 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:97 -#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119 +#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111 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:99 -#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121 +#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113 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:100 -#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:122 +#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114 msgid "Legacy Software Development" msgstr "D??veloppement de logiciel ancien" #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101 -#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:123 +#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115 msgid "Legacy Software Support" msgstr "Prise en charge du logiciel ancien" #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102 -#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:124 +#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116 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:105 -#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:128 +#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119 #: ../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:106 -#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:131 +#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122 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:107 -#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:132 +#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123 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:108 -#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:135 +#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124 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:109 -#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:136 +#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125 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:111 -#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:139 +#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128 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:113 -#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:142 +#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131 #: ../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:114 -#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:143 +#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132 #: ../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:116 -#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:145 +#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134 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:117 -#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:146 +#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135 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:118 -#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:149 +#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 msgid "Office/Productivity" msgstr "Bureautique/Productivit??" #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120 -#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:152 +#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141 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:121 -#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:153 +#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 msgid "" "Packages which provide functionality for developing and building " @@ -629,73 +632,73 @@ msgstr "" "d'applications." #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122 -#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:154 +#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143 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:123 -#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:155 +#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144 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:124 -#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:156 +#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145 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:125 -#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:157 +#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146 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:126 -#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:158 +#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147 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:127 -#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:159 +#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148 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:128 -#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:160 +#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149 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:129 -#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:161 +#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130 -#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:162 +#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151 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:133 -#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:163 +#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152 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:134 -#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:166 +#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153 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:135 -#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:167 +#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154 msgid "Server Configuration Tools" msgstr "Outils de configuration de serveurs" #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136 -#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:168 +#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155 #: ../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:137 -#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:169 +#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156 #: ../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." @@ -704,39 +707,39 @@ msgstr "" "bureau." #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138 -#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:171 +#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158 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:139 -#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:172 +#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159 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:140 -#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:173 +#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160 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:141 -#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:174 +#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161 msgid "Smallest possible installation" msgstr "Plus petite installation possible" # running = verbe ici #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142 -#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:175 +#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" msgstr "Logiciels utilis??s pour ex??cuter des serveurs r??seau" #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143 -#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:176 +#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163 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:144 -#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:177 +#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -745,28 +748,28 @@ msgstr "" "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:145 -#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:178 +#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165 #: ../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:146 -#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:179 +#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166 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:147 -#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:180 +#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167 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:148 -#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:181 +#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168 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:149 -#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:185 +#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "" @@ -774,50 +777,50 @@ msgstr "" "Java" #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150 -#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:187 +#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." 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:151 -#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:189 +#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175 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:152 -#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:190 +#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176 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:153 -#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:191 +#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177 #: ../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:154 -#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:192 +#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178 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:155 -#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:194 +#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180 msgid "Tamil Support" msgstr "Prise en charge du tamoul" #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156 -#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:195 +#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181 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:157 -#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:197 +#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182 #: ../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:158 -#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:198 +#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183 msgid "Thai Support" msgstr "Prise en charge du tha??" @@ -826,7 +829,7 @@ msgid "The Eclipse Integrated Developmen 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:159 -#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:199 +#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." msgstr "" @@ -834,7 +837,7 @@ msgstr "" "bien plus encore." #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160 -#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:200 +#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185 msgid "" "The packages in this group are core libraries needed to develop applications." msgstr "" @@ -842,7 +845,7 @@ msgstr "" "d??veloppement d'applications." #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161 -#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:201 +#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186 #: ../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 "" @@ -850,7 +853,7 @@ msgstr "" "SMTP." #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162 -#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:202 +#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187 msgid "" "These packages allow you to develop applications for the X Window System." msgstr "" @@ -858,7 +861,7 @@ msgstr "" "Window." #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163 -#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:203 +#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 msgid "" "These packages are helpful when developing web applications or web pages." @@ -867,7 +870,7 @@ msgstr "" "web." #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164 -#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:204 +#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189 msgid "" "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "" @@ -875,7 +878,7 @@ msgstr "" "Kerberos et NIS." #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165 -#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:205 +#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." @@ -884,19 +887,19 @@ msgstr "" "rsh et telnet." #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166 -#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:206 +#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191 msgid "These packages provide a virtualization environment." 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:167 -#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:207 +#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192 msgid "These packages provide compatibility with previous releases." 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:168 -#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:208 +#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193 msgid "" "These packages provide support for various locales including fonts and input " "methods." @@ -906,7 +909,7 @@ msgstr "" "m??thodes de saisie." #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169 -#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:209 +#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -915,19 +918,19 @@ msgstr "" "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:170 -#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:210 +#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195 #: ../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:171 -#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:211 +#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196 #: ../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:172 -#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:212 +#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 msgid "" "These tools include core development tools such as automake, gcc, perl, " @@ -937,21 +940,21 @@ msgstr "" "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:173 -#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:213 +#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198 #: ../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 news." #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174 -#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:214 +#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199 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:175 -#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:215 +#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." @@ -960,7 +963,7 @@ msgstr "" "machines d??di??es 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:176 -#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:216 +#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." msgstr "" @@ -968,7 +971,7 @@ msgstr "" "conversation." #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177 -#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:217 +#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 msgid "" "This group includes packages for performing mathematical and scientific " @@ -978,7 +981,7 @@ msgstr "" "scientifiques, des cr??ations de diagrammes et des conversions d'unit??s." #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178 -#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:218 +#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203 #: ../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 "" @@ -986,7 +989,7 @@ msgstr "" "images." #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179 -#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:219 +#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 msgid "" "This group includes text-based email, Web, and chat clients. These " @@ -996,7 +999,7 @@ msgstr "" "mode texte. 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:180 -#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:220 +#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205 #: ../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, " @@ -1007,7 +1010,7 @@ msgstr "" "du mat??riel syst??me." #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181 -#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:221 +#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206 #: ../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." @@ -1016,14 +1019,14 @@ msgstr "" "environnements en arm??nien." #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182 -#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:222 +#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207 #: ../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:183 -#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:224 +#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209 #: ../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 " @@ -1034,7 +1037,7 @@ msgstr "" "surveiller le trafic du r??seau." #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184 -#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:225 +#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210 msgid "" "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" @@ -1042,7 +1045,7 @@ msgstr "" "sur le syst??me." #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185 -#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:226 +#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." @@ -1051,211 +1054,211 @@ msgstr "" "Linux et Microsoft Windows (tm)." #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186 -#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:227 +#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212 msgid "This package group contains packages useful for use with MySQL." msgstr "Ce groupe contient des paquets utiles ?? utiliser avec MySQL." #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187 -#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:228 +#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213 msgid "This package group includes packages useful for use with Postgresql." msgstr "Ce groupe comprend des paquets utiles ?? utiliser avec Postgresql." #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188 -#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:229 +#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214 msgid "Tibetan Support" msgstr "Prise en charge du tib??tain" #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189 -#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:230 +#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215 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:190 -#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:231 +#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216 #: ../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:191 -#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:232 +#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217 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:192 -#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:233 +#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218 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:193 -#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:234 +#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219 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:194 -#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:236 +#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221 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:195 -#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:238 +#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223 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:196 -#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:240 +#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225 #: ../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:197 -#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:241 +#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226 #: ../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:198 -#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:242 +#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227 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:199 -#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:243 +#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228 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:200 -#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:244 +#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229 msgid "Virtualization" msgstr "Virtualisation" #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202 -#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:246 +#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231 #: ../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:203 -#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:247 +#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232 #: ../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:204 -#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:248 +#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233 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:205 -#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:249 +#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234 #: ../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:206 -#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:250 +#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235 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:207 -#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:251 +#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236 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:208 -#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:252 +#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237 #: ../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:209 -#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:253 +#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238 msgid "XFCE" msgstr "XFCE" #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210 -#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:254 +#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239 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:211 -#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:255 +#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240 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:212 -#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:256 +#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241 msgid "Zulu Support" msgstr "Prise en charge du zoulou" #: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 -#: ../comps-f11.xml.in.h:24 +#: ../comps-f11.xml.in.h:23 msgid "Buildsystem building group" msgstr "Groupe de construction de l'environnement de compilation" #: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 -#: ../comps-f11.xml.in.h:56 +#: ../comps-f11.xml.in.h:53 msgid "Fedora Eclipse" msgstr "Fedora Eclipse" #: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 -#: ../comps-f11.xml.in.h:62 +#: ../comps-f11.xml.in.h:58 msgid "Fonts" msgstr "Polices de caract??res" #: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 -#: ../comps-f11.xml.in.h:63 +#: ../comps-f11.xml.in.h:59 msgid "Fonts packages for rendering text on the desktop." 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:84 -#: ../comps-f11.xml.in.h:95 +#: ../comps-f11.xml.in.h:90 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:98 ../comps-f10.xml.in.h:105 -#: ../comps-f11.xml.in.h:120 +#: ../comps-f11.xml.in.h:112 msgid "Legacy Fonts" msgstr "Anciennes polices de caract??res" #: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110 -#: ../comps-f11.xml.in.h:125 +#: ../comps-f11.xml.in.h:117 msgid "Low Saxon Support" msgstr "Prise en charge du bas-allemand" #: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118 -#: ../comps-f11.xml.in.h:138 +#: ../comps-f11.xml.in.h:127 msgid "Mongolian Support" msgstr "Prise en charge du mongol" #: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121 -#: ../comps-f11.xml.in.h:141 +#: ../comps-f11.xml.in.h:130 msgid "Nepali Support" msgstr "Prise en charge du n??palais" #: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128 -#: ../comps-f11.xml.in.h:150 +#: ../comps-f11.xml.in.h:139 msgid "Older bitmap and vector fonts packages" msgstr "Anciens paquets de polices de caract??res vectorielles et matricielles" -#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51 +#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48 msgid "Esperanto Support" msgstr "Prise en charge de l'esp??ranto" -#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108 +#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102 msgid "Kashubian Support" msgstr "Prise en charge du kachoube" -#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114 +#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107 msgid "Kurdish Support" msgstr "Prise en charge du kurde" #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111 -#: ../comps-f11.xml.in.h:127 +#: ../comps-f11.xml.in.h:118 msgid "Macedonian Support" msgstr "Prise en charge du mac??donien" #: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124 -#: ../comps-f11.xml.in.h:144 +#: ../comps-f11.xml.in.h:133 msgid "Northern Sami Support" msgstr "Prise en charge du same du nord" @@ -1268,7 +1271,7 @@ msgid "SUGAR is the desktop environment msgstr "SUGAR est l'environnement de bureau d??velopp?? pour l'OLPC XO." #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213 -#: ../comps-f11.xml.in.h:245 +#: ../comps-f11.xml.in.h:230 msgid "Walloon Support" msgstr "Prise en charge du wallon" @@ -1276,53 +1279,53 @@ msgstr "Prise en charge du wallon" msgid "A software playground for learning about learning." msgstr "Un terrain de jeu logiciel pour apprendre ?? apprendre." -#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:81 +#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77 msgid "Haskell Development" msgstr "D??veloppement Haskell" -#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 +#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83 msgid "Input Methods" msgstr "M??thodes de saisie" -#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 +#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84 msgid "Input method packages for the input of international text." msgstr "Paquets de m??thodes de saisie de textes internationaux." -#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107 +#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101 msgid "Kashmiri Support" msgstr "Prise en charge du kachm??r??" -#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112 +#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105 msgid "Konkani Support" msgstr "Prise en charge du konkani" -#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115 +#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108 msgid "LXDE" msgstr "LXDE" -#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129 +#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120 msgid "Maithili Support" msgstr "Prise en charge du maithili" -#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140 +#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129 msgid "Myanmar (Burmese) Support" msgstr "Prise en charge du birman" -#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:170 +#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157 msgid "Sindhi Support" msgstr "Prise en charge du sindhi" -#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:184 +#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171 msgid "Support for developing programs in the Haskell programming language." msgstr "" "Prise en charge du d??veloppement d'applications en langage de programmation " "Haskell" -#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:193 +#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179 msgid "Tajik Support" msgstr "Prise en charge du tadjik" -#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:239 +#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224 msgid "Uzbek Support" msgstr "Prise en charge de l'ouzbek" @@ -1330,146 +1333,73 @@ msgstr "Prise en charge de l'ouzbek" msgid "Amazigh Support" msgstr "Prise en charge du berb??re" -#: ../comps-f11.xml.in.h:13 -#, fuzzy -msgid "Azerbaijani Support" -msgstr "Prise en charge du serbe" - -#: ../comps-f11.xml.in.h:27 -#, fuzzy -msgid "Chichewa Support" -msgstr "Prise en charge du chinois" - -#: ../comps-f11.xml.in.h:31 -#, fuzzy -msgid "Coptic Support" -msgstr "Prise en charge du croate" - -#: ../comps-f11.xml.in.h:37 +#: ../comps-f11.xml.in.h:34 msgid "Design and Simulation tools for hardware engineers" msgstr "" +"Outils de simulation et de conception pour les ing??nieurs en ??lectronique" -#: ../comps-f11.xml.in.h:48 +#: ../comps-f11.xml.in.h:45 msgid "Electronic Lab" -msgstr "" - -#: ../comps-f11.xml.in.h:58 -#, fuzzy -msgid "Fijian Support" -msgstr "Prise en charge du frison" +msgstr "Labo ??lectronique" -#: ../comps-f11.xml.in.h:61 +#: ../comps-f11.xml.in.h:57 msgid "Font design and packaging" msgstr "Cr??ation et empaquetage de polices de caract??res" -#: ../comps-f11.xml.in.h:65 +#: ../comps-f11.xml.in.h:61 msgid "Frisian Support" msgstr "Prise en charge du frison" -#: ../comps-f11.xml.in.h:66 +#: ../comps-f11.xml.in.h:62 msgid "Friulian Support" msgstr "Prise en charge du frioulan" -#: ../comps-f11.xml.in.h:83 -#, fuzzy -msgid "Hiligaynon Support" -msgstr "Prise en charge du pilipino" - -#: ../comps-f11.xml.in.h:96 -#, fuzzy -msgid "Interlingua Support" -msgstr "Prise en charge de l'italien" - -#: ../comps-f11.xml.in.h:109 -#, fuzzy -msgid "Kazakh Support" -msgstr "Prise en charge du kannada" - -#: ../comps-f11.xml.in.h:111 +#: ../comps-f11.xml.in.h:104 msgid "Kinyarwanda Support" msgstr "Prise en charge du kinyarwanda" -#: ../comps-f11.xml.in.h:118 -#, fuzzy -msgid "Latin Support" -msgstr "Prise en charge du letton" - -#: ../comps-f11.xml.in.h:126 -#, fuzzy -msgid "Luxembourgish Support" -msgstr "Prise en charge du turc" - -#: ../comps-f11.xml.in.h:130 +#: ../comps-f11.xml.in.h:121 msgid "Malagasy Support" msgstr "Prise en charge du malgache" -#: ../comps-f11.xml.in.h:133 -#, fuzzy -msgid "Maltese Support" -msgstr "Prise en charge du malais" - -#: ../comps-f11.xml.in.h:134 -#, fuzzy -msgid "Manx Support" -msgstr "Prise en charge du malais" - -#: ../comps-f11.xml.in.h:137 +#: ../comps-f11.xml.in.h:126 msgid "MinGW cross-compiler" -msgstr "" +msgstr "compilateur crois?? MinGW" -#: ../comps-f11.xml.in.h:147 +#: ../comps-f11.xml.in.h:136 msgid "OCaml" -msgstr "" +msgstr "OCaml" -#: ../comps-f11.xml.in.h:148 +#: ../comps-f11.xml.in.h:137 msgid "Occitan Support" msgstr "Prise en charge de l'occitan" -#: ../comps-f11.xml.in.h:151 +#: ../comps-f11.xml.in.h:140 msgid "Online Help and Documentation" -msgstr "" - -#: ../comps-f11.xml.in.h:164 -#, fuzzy -msgid "Sanskrit Support" -msgstr "Prise en charge de l'espagnol" +msgstr "Aide et documentation en ligne" -#: ../comps-f11.xml.in.h:165 -#, fuzzy -msgid "Sardinian Support" -msgstr "Prise en charge de l'ukrainien" - -#: ../comps-f11.xml.in.h:182 -#, fuzzy +#: ../comps-f11.xml.in.h:169 msgid "Sugar Desktop Environment" -msgstr "Environnements de bureau" +msgstr "Environnement de bureau Sugar" -#: ../comps-f11.xml.in.h:183 +#: ../comps-f11.xml.in.h:170 msgid "" "Support for cross-compiling programs to 32 bit Windows targets, testing " "them, and building installers, all from within Fedora." msgstr "" +"Prise en charge de la compilation crois??e des programmes 32 bits pour" +"Windows, des phases de tests et de cr??ation des programmes" +"d'installation, le tout dans Fedora." -#: ../comps-f11.xml.in.h:186 -#, fuzzy +#: ../comps-f11.xml.in.h:173 msgid "" "Support for developing software using the Objective CAML programming " "language and libraries." msgstr "" -"Prise en charge du d??veloppement d'applications en langage de programmation " -"Java" - -#: ../comps-f11.xml.in.h:188 -#, fuzzy -msgid "Swahili Support" -msgstr "Prise en charge du swati" +"Prise en charge du d??veloppement d'applications utilisant le langage de " +"programmation et les biblioth??ques Objective CAML" -#: ../comps-f11.xml.in.h:196 -#, fuzzy -msgid "Tetum Support" -msgstr "Prise en charge du t??lougou" - -#: ../comps-f11.xml.in.h:223 +#: ../comps-f11.xml.in.h:208 msgid "" "This group is a collection of tools used in the design, modification, " "manipulation, and packaging of fonts." @@ -1477,11 +1407,11 @@ msgstr "" "Ce groupe comprend un ensemble d'outils utilis??s pour le dessin, la " "modification, la manipulation et l'empaquetage de polices de caract??res." -#: ../comps-f11.xml.in.h:235 +#: ../comps-f11.xml.in.h:220 msgid "Turkmen Support" msgstr "Prise en charge du turkm??ne" -#: ../comps-f11.xml.in.h:237 +#: ../comps-f11.xml.in.h:222 msgid "Upper Sorbian Support" msgstr "Prise en charge du haut-sorabe" @@ -1568,3 +1498,5 @@ msgid "" msgstr "" "Ce groupe comprend un ensemble d'outils et de ressources pour les " "environnements en tch??que." + + From davidz at fedoraproject.org Fri May 1 22:16:31 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Fri, 1 May 2009 22:16:31 +0000 (UTC) Subject: rpms/DeviceKit-disks/devel DeviceKit-disks.spec,1.24,1.25 Message-ID: <20090501221631.8D67E7012F@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit-disks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31375 Modified Files: DeviceKit-disks.spec Log Message: * Fri May 01 2009 David Zeuthen - 004-2%{?dist} - Rebuild Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- DeviceKit-disks.spec 1 May 2009 22:09:40 -0000 1.24 +++ DeviceKit-disks.spec 1 May 2009 22:16:01 -0000 1.25 @@ -12,11 +12,11 @@ Summary: Disk Management Service Name: DeviceKit-disks Version: 004 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary -Source0: %{name}-%{version}.20090415git.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Fri May 01 2009 David Zeuthen - 004-2%{?dist} +- Rebuild + * Fri May 01 2009 David Zeuthen - 004-1%{?dist} - Upstream release 004 From oget at fedoraproject.org Fri May 1 22:24:15 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 1 May 2009 22:24:15 +0000 (UTC) Subject: rpms/jorbis/devel import.log, NONE, 1.1 jorbis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501222415.B93257012F@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/jorbis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32306/devel Modified Files: .cvsignore sources Added Files: import.log jorbis.spec Log Message: * Wed Apr 29 2009 Orcan Ogetbil - 0.0.17-2 - Fix duplicate files issue * Sun Apr 19 2009 Orcan Ogetbil - 0.0.17-1 - Initial Fedora build --- NEW FILE import.log --- jorbis-0_0_17-2_fc10:HEAD:jorbis-0.0.17-2.fc10.src.rpm:1241216594 --- NEW FILE jorbis.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jorbis Summary: Pure Java Ogg Vorbis Decoder URL: http://www.jcraft.com/jorbis/index.html Source0: http://www.jcraft.com/%{name}/%{name}-%{version}.zip Group: System Environment/Libraries Version: 0.0.17 Release: 2%{?dist} License: LGPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ant BuildRequires: java-devel >= 1.6 BuildRequires: 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 Requires: java >= 1.5 Requires: jpackage-utils %description JOrbis is a pure Java Ogg Vorbis decoder. JOrbis accepts Ogg Vorbis bitstreams and decodes them to raw PCMs. %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}. %package player Summary: An ogg player using JOrbis Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description player JOrbisPlayer is a simple ogg-Player. %package comment Summary: JOrbisComment is a simple comment editor for Ogg Vorbis Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description comment JOrbisComment is a simple comment editor for Ogg Vorbis. This program is just provided here for setting an example, how to use JOrbis for editing comments. %prep %setup -q # Fix weird permission chmod -x com/jcraft/jorbis/Util.java %build %javac `find ./ -name '*.java'` %jar cf %{name}.jar com/jcraft/*/*.class %jar cf %{name}-player.jar player/*.class %jar cf %{name}-comment.jar comment_editor/*.class %javadoc -d doc -public `find ./ -name '*.java'` %install rm -rf %{buildroot} # jars install -dm 755 %{buildroot}%{_javadir} install -pm 644 jorbis.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar install -pm 644 %{name}-player.jar \ %{buildroot}%{_javadir}/%{name}-player-%{version}.jar install -pm 644 %{name}-comment.jar \ %{buildroot}%{_javadir}/%{name}-comment-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done popd # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf %{buildroot} %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 %post player %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun player %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %post comment %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun comment %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(-,root,root,-) %doc COPYING.LIB ChangeLog README %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %if %{with_gcj} %dir %{_libdir}/gcj/%{name} %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %files player %defattr(-,root,root,-) %doc player/JOrbisPlayer.html %{_javadir}/%{name}-player*.jar %if %{with_gcj} %{_libdir}/gcj/%{name}/%{name}-player*.jar.* %endif %files comment %defattr(-,root,root,-) %doc comment_editor/README %{_javadir}/%{name}-comment*.jar %if %{with_gcj} %{_libdir}/gcj/%{name}/%{name}-comment*.jar.* %endif %changelog * Wed Apr 29 2009 Orcan Ogetbil - 0.0.17-2 - Fix duplicate files issue * Sun Apr 19 2009 Orcan Ogetbil - 0.0.17-1 - Initial Fedora build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jorbis/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:04:06 -0000 1.1 +++ .cvsignore 1 May 2009 22:23:44 -0000 1.2 @@ -0,0 +1 @@ +jorbis-0.0.17.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jorbis/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:04:06 -0000 1.1 +++ sources 1 May 2009 22:23:44 -0000 1.2 @@ -0,0 +1 @@ +6141edfb16d34412a86c95a97fd4b10f jorbis-0.0.17.zip From oget at fedoraproject.org Fri May 1 22:26:17 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 1 May 2009 22:26:17 +0000 (UTC) Subject: rpms/jorbis/F-11 import.log, NONE, 1.1 jorbis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501222617.107E37012F@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/jorbis/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32742/F-11 Modified Files: .cvsignore sources Added Files: import.log jorbis.spec Log Message: * Wed Apr 29 2009 Orcan Ogetbil - 0.0.17-2 - Fix duplicate files issue * Sun Apr 19 2009 Orcan Ogetbil - 0.0.17-1 - Initial Fedora build --- NEW FILE import.log --- jorbis-0_0_17-2_fc10:F-11:jorbis-0.0.17-2.fc10.src.rpm:1241216727 --- NEW FILE jorbis.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jorbis Summary: Pure Java Ogg Vorbis Decoder URL: http://www.jcraft.com/jorbis/index.html Source0: http://www.jcraft.com/%{name}/%{name}-%{version}.zip Group: System Environment/Libraries Version: 0.0.17 Release: 2%{?dist} License: LGPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ant BuildRequires: java-devel >= 1.6 BuildRequires: 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 Requires: java >= 1.5 Requires: jpackage-utils %description JOrbis is a pure Java Ogg Vorbis decoder. JOrbis accepts Ogg Vorbis bitstreams and decodes them to raw PCMs. %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}. %package player Summary: An ogg player using JOrbis Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description player JOrbisPlayer is a simple ogg-Player. %package comment Summary: JOrbisComment is a simple comment editor for Ogg Vorbis Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description comment JOrbisComment is a simple comment editor for Ogg Vorbis. This program is just provided here for setting an example, how to use JOrbis for editing comments. %prep %setup -q # Fix weird permission chmod -x com/jcraft/jorbis/Util.java %build %javac `find ./ -name '*.java'` %jar cf %{name}.jar com/jcraft/*/*.class %jar cf %{name}-player.jar player/*.class %jar cf %{name}-comment.jar comment_editor/*.class %javadoc -d doc -public `find ./ -name '*.java'` %install rm -rf %{buildroot} # jars install -dm 755 %{buildroot}%{_javadir} install -pm 644 jorbis.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar install -pm 644 %{name}-player.jar \ %{buildroot}%{_javadir}/%{name}-player-%{version}.jar install -pm 644 %{name}-comment.jar \ %{buildroot}%{_javadir}/%{name}-comment-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done popd # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf %{buildroot} %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 %post player %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun player %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %post comment %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun comment %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(-,root,root,-) %doc COPYING.LIB ChangeLog README %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %if %{with_gcj} %dir %{_libdir}/gcj/%{name} %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %files player %defattr(-,root,root,-) %doc player/JOrbisPlayer.html %{_javadir}/%{name}-player*.jar %if %{with_gcj} %{_libdir}/gcj/%{name}/%{name}-player*.jar.* %endif %files comment %defattr(-,root,root,-) %doc comment_editor/README %{_javadir}/%{name}-comment*.jar %if %{with_gcj} %{_libdir}/gcj/%{name}/%{name}-comment*.jar.* %endif %changelog * Wed Apr 29 2009 Orcan Ogetbil - 0.0.17-2 - Fix duplicate files issue * Sun Apr 19 2009 Orcan Ogetbil - 0.0.17-1 - Initial Fedora build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jorbis/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:04:06 -0000 1.1 +++ .cvsignore 1 May 2009 22:25:46 -0000 1.2 @@ -0,0 +1 @@ +jorbis-0.0.17.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jorbis/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:04:06 -0000 1.1 +++ sources 1 May 2009 22:25:46 -0000 1.2 @@ -0,0 +1 @@ +6141edfb16d34412a86c95a97fd4b10f jorbis-0.0.17.zip From ausil at fedoraproject.org Fri May 1 22:28:24 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 22:28:24 +0000 (UTC) Subject: rpms/pam_yubico/F-11 pam_yubico.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090501222824.4C5B87012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pam_yubico/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv866 Modified Files: sources Added Files: pam_yubico.spec Log Message: initial buidl --- NEW FILE pam_yubico.spec --- Name: pam_yubico Version: 2.1 Release: 1%{?dist} Summary: A Pluggable Authentication Module for yubikeys Group: System Environment/Base License: BSD URL: http://yubico-pam.googlecode.com/ Source0: http://yubico-pam.googlecode.com/files/pam_yubico-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ykclient-devel pam-devel #Requires: %description This is pam_yubico, a pluggable authentication module that can be used with Linux-PAM and yubikeys. This module supports yubikey OTP checking. %prep %setup -q %build %configure --libdir=/%{_lib} \ --with-pam-dir=/%{_lib}/security/ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_lib}/security/pam_yubico.la %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc NEWS README COPYING ChangeLog /%{_lib}/security/pam_yubico.so %changelog * Wed Apr 29 2009 Dennis Gilmore - 2.1-1 - initial packaging Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam_yubico/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:46:11 -0000 1.1 +++ sources 1 May 2009 22:27:54 -0000 1.2 @@ -0,0 +1 @@ +ea288fa829790892170887ab4bb779bc pam_yubico-2.1.tar.gz From oget at fedoraproject.org Fri May 1 22:29:07 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 1 May 2009 22:29:07 +0000 (UTC) Subject: rpms/jorbis/F-9 import.log, NONE, 1.1 jorbis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501222907.D8E1D7012F@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/jorbis/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1205/F-9 Modified Files: .cvsignore sources Added Files: import.log jorbis.spec Log Message: * Wed Apr 29 2009 Orcan Ogetbil - 0.0.17-2 - Fix duplicate files issue * Sun Apr 19 2009 Orcan Ogetbil - 0.0.17-1 - Initial Fedora build --- NEW FILE import.log --- jorbis-0_0_17-2_fc10:F-9:jorbis-0.0.17-2.fc10.src.rpm:1241216898 --- NEW FILE jorbis.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jorbis Summary: Pure Java Ogg Vorbis Decoder URL: http://www.jcraft.com/jorbis/index.html Source0: http://www.jcraft.com/%{name}/%{name}-%{version}.zip Group: System Environment/Libraries Version: 0.0.17 Release: 2%{?dist} License: LGPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ant BuildRequires: java-devel >= 1.6 BuildRequires: 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 Requires: java >= 1.5 Requires: jpackage-utils %description JOrbis is a pure Java Ogg Vorbis decoder. JOrbis accepts Ogg Vorbis bitstreams and decodes them to raw PCMs. %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}. %package player Summary: An ogg player using JOrbis Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description player JOrbisPlayer is a simple ogg-Player. %package comment Summary: JOrbisComment is a simple comment editor for Ogg Vorbis Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description comment JOrbisComment is a simple comment editor for Ogg Vorbis. This program is just provided here for setting an example, how to use JOrbis for editing comments. %prep %setup -q # Fix weird permission chmod -x com/jcraft/jorbis/Util.java %build %javac `find ./ -name '*.java'` %jar cf %{name}.jar com/jcraft/*/*.class %jar cf %{name}-player.jar player/*.class %jar cf %{name}-comment.jar comment_editor/*.class %javadoc -d doc -public `find ./ -name '*.java'` %install rm -rf %{buildroot} # jars install -dm 755 %{buildroot}%{_javadir} install -pm 644 jorbis.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar install -pm 644 %{name}-player.jar \ %{buildroot}%{_javadir}/%{name}-player-%{version}.jar install -pm 644 %{name}-comment.jar \ %{buildroot}%{_javadir}/%{name}-comment-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done popd # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf %{buildroot} %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 %post player %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun player %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %post comment %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun comment %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(-,root,root,-) %doc COPYING.LIB ChangeLog README %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %if %{with_gcj} %dir %{_libdir}/gcj/%{name} %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %files player %defattr(-,root,root,-) %doc player/JOrbisPlayer.html %{_javadir}/%{name}-player*.jar %if %{with_gcj} %{_libdir}/gcj/%{name}/%{name}-player*.jar.* %endif %files comment %defattr(-,root,root,-) %doc comment_editor/README %{_javadir}/%{name}-comment*.jar %if %{with_gcj} %{_libdir}/gcj/%{name}/%{name}-comment*.jar.* %endif %changelog * Wed Apr 29 2009 Orcan Ogetbil - 0.0.17-2 - Fix duplicate files issue * Sun Apr 19 2009 Orcan Ogetbil - 0.0.17-1 - Initial Fedora build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jorbis/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:04:06 -0000 1.1 +++ .cvsignore 1 May 2009 22:28:37 -0000 1.2 @@ -0,0 +1 @@ +jorbis-0.0.17.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jorbis/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:04:06 -0000 1.1 +++ sources 1 May 2009 22:28:37 -0000 1.2 @@ -0,0 +1 @@ +6141edfb16d34412a86c95a97fd4b10f jorbis-0.0.17.zip From davidz at fedoraproject.org Fri May 1 22:29:41 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Fri, 1 May 2009 22:29:41 +0000 (UTC) Subject: rpms/gnome-disk-utility/devel .cvsignore, 1.6, 1.7 gnome-disk-utility.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <20090501222941.D5B687012F@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gnome-disk-utility/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1320 Modified Files: .cvsignore gnome-disk-utility.spec sources Log Message: * Fri May 01 2009 David Zeuthen - 0.3-1%{?dist} - Upstream release 0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 15 Apr 2009 19:09:55 -0000 1.6 +++ .cvsignore 1 May 2009 22:29:11 -0000 1.7 @@ -3,3 +3,4 @@ gnome-disk-utility-0.2.tar.bz2 gnome-disk-utility-0.3.20090406git.tar.bz2 gnome-disk-utility-0.3.20090412git.tar.bz2 gnome-disk-utility-0.3.20090415git.tar.bz2 +gnome-disk-utility-0.3.tar.bz2 Index: gnome-disk-utility.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- gnome-disk-utility.spec 15 Apr 2009 19:09:55 -0000 1.11 +++ gnome-disk-utility.spec 1 May 2009 22:29:11 -0000 1.12 @@ -9,15 +9,16 @@ %define devicekit_disks_version 004 %define unique_version 1.0.4 %define libnotify_version 0.4.5 +%define nautilus_version 2.26 Summary: Disk management application Name: gnome-disk-utility Version: 0.3 -Release: 0.5.20090415git%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://git.gnome.org/cgit/gnome-disk-utility -Source0: %{name}-%{version}.20090415git.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -33,11 +34,14 @@ BuildRequires: DeviceKit-disks-devel >= BuildRequires: PolicyKit-gnome-devel >= %{polkit_gnome_version} BuildRequires: unique-devel >= %{unique_version} BuildRequires: libnotify-devel >= %{libnotify_version} +BuildRequires: nautilus-devel >= %{nautilus_version} BuildRequires: libsexy-devel BuildRequires: intltool Requires(post): scrollkeeper Requires(postun): scrollkeeper Requires: %{name}-libs = %{version}-%{release} +Obsoletes: gnome-disk-utility-format +Obsoletes: nautilus-gdu %description This package contains the Palimpsest disk management application. @@ -116,9 +120,11 @@ desktop-file-install --delete-original rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.a -# TODO: no translations yet -#%find_lang --with-gnome %{name} + +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT @@ -154,6 +160,8 @@ fi %{_libexecdir}/gdu-notification-daemon %{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop +%{_libdir}/nautilus/extensions-2.0/*.so +%{_libexecdir}/gdu-format-tool %{_bindir}/palimpsest %{_datadir}/applications/palimpsest.desktop @@ -164,10 +172,7 @@ fi %dir %{_datadir}/omf/palimpsest %{_datadir}/omf/palimpsest/* -# TODO: no translations yet -#%files libs -f %{name}.lang - -%files libs +%files libs -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING HACKING doc/TODO @@ -208,6 +213,9 @@ fi %{_includedir}/gnome-disk-utility/gdu-gtk/* %changelog +* Fri May 01 2009 David Zeuthen - 0.3-1%{?dist} +- Upstream release 0.3 + * Wed Apr 15 2009 David Zeuthen - 0.3-0.5.20090415git%{?dist} - New snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 15 Apr 2009 19:09:55 -0000 1.6 +++ sources 1 May 2009 22:29:11 -0000 1.7 @@ -1 +1 @@ -7aa1e2dc7de710d2494de3bae94ee15a gnome-disk-utility-0.3.20090415git.tar.bz2 +1aa94c224cd3dd2ebfd05bf31476dbb5 gnome-disk-utility-0.3.tar.bz2 From ausil at fedoraproject.org Fri May 1 22:30:01 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 1 May 2009 22:30:01 +0000 (UTC) Subject: rpms/pam_yubico/F-10 pam_yubico.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090501223001.4E7D07012F@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pam_yubico/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1455 Modified Files: sources Added Files: pam_yubico.spec Log Message: initial build --- NEW FILE pam_yubico.spec --- Name: pam_yubico Version: 2.1 Release: 1%{?dist} Summary: A Pluggable Authentication Module for yubikeys Group: System Environment/Base License: BSD URL: http://yubico-pam.googlecode.com/ Source0: http://yubico-pam.googlecode.com/files/pam_yubico-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ykclient-devel pam-devel #Requires: %description This is pam_yubico, a pluggable authentication module that can be used with Linux-PAM and yubikeys. This module supports yubikey OTP checking. %prep %setup -q %build %configure --libdir=/%{_lib} \ --with-pam-dir=/%{_lib}/security/ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_lib}/security/pam_yubico.la %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc NEWS README COPYING ChangeLog /%{_lib}/security/pam_yubico.so %changelog * Wed Apr 29 2009 Dennis Gilmore - 2.1-1 - initial packaging Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam_yubico/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:46:11 -0000 1.1 +++ sources 1 May 2009 22:29:31 -0000 1.2 @@ -0,0 +1 @@ +ea288fa829790892170887ab4bb779bc pam_yubico-2.1.tar.gz From oget at fedoraproject.org Fri May 1 22:34:23 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 1 May 2009 22:34:23 +0000 (UTC) Subject: rpms/jVorbisEnc/devel import.log, NONE, 1.1 jVorbisEnc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501223423.30EE370131@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/jVorbisEnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2306/devel Modified Files: .cvsignore sources Added Files: import.log jVorbisEnc.spec Log Message: * Thu Apr 30 2009 Orcan Ogetbil - 0.1-3 - License is LGPLv2+ * Wed Apr 29 2009 Orcan Ogetbil - 0.1-2 - Disable building of aot bits on ppc64 (RHBZ #498351) * Sat Mar 21 2009 Orcan Ogetbil - 0.1-1 - Initial build for Fedora. SPEC file borrowed from SUSE. * Mon Mar 19 2006 Toni Graffy - 0.1a-0.pm.1 - First packaged release 0.1a --- NEW FILE import.log --- jVorbisEnc-0_1-3_fc10:HEAD:jVorbisEnc-0.1-3.fc10.src.rpm:1241217211 --- NEW FILE jVorbisEnc.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jVorbisEnc Summary: Pure Java Ogg Vorbis Encoder Group: System Environment/Libraries Version: 0.1 Release: 3%{?dist} License: LGPLv2+ URL: http://zbigniew.sudnik.org/app/vorbis/vorbis.html Source0: http://zbigniew.sudnik.org/app/vorbis/download/%{name}_src.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jpackage-utils BuildRequires: java-devel >= 1.5 %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 Requires: jpackage-utils Requires: java >= 1.5 %description JVorbis is a music encoder, which compresses high quality audio format (44.1-48.0kHz, 16+ bit, polyphonic). %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 -c -n %{name} %build mkdir classes %javac -d classes `find ./ -name \*.java` %jar cf %{name}.jar -C classes . %javadoc -d doc -public `find ./ -name \*.java` %install rm -rf %{buildroot} # jars install -dm 755 %{buildroot}%{_javadir} install -pm 644 %{name}.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done popd # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} # Building of aot bits fail on ppc64. RHBZ #498351 %ifnarch ppc64 %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 %endif %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_javadir}/%{name}*.jar %ifnarch ppc64 %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Thu Apr 30 2009 Orcan Ogetbil - 0.1-3 - License is LGPLv2+ * Wed Apr 29 2009 Orcan Ogetbil - 0.1-2 - Disable building of aot bits on ppc64 (RHBZ #498351) * Sat Mar 21 2009 Orcan Ogetbil - 0.1-1 - Initial build for Fedora. SPEC file borrowed from SUSE. * Mon Mar 19 2006 Toni Graffy - 0.1a-0.pm.1 - First packaged release 0.1a Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jVorbisEnc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:53:55 -0000 1.1 +++ .cvsignore 1 May 2009 22:33:52 -0000 1.2 @@ -0,0 +1 @@ +jVorbisEnc_src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jVorbisEnc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:53:55 -0000 1.1 +++ sources 1 May 2009 22:33:52 -0000 1.2 @@ -0,0 +1 @@ +8476478045d6f7c0114272bc8bab97e1 jVorbisEnc_src.zip From kalev at fedoraproject.org Fri May 1 22:35:02 2009 From: kalev at fedoraproject.org (Kalev Lember) Date: Fri, 1 May 2009 22:35:02 +0000 (UTC) Subject: rpms/powwow/devel .cvsignore, 1.2, 1.3 powwow.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090501223502.5FEBE70133@cvs1.fedora.phx.redhat.com> Author: kalev Update of /cvs/pkgs/rpms/powwow/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2327 Modified Files: .cvsignore powwow.spec sources Log Message: Update to powwow 1.2.15. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/powwow/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 21 Apr 2009 20:08:49 -0000 1.2 +++ .cvsignore 1 May 2009 22:34:32 -0000 1.3 @@ -1 +1 @@ -powwow-1.2.14.tar.gz +powwow-1.2.15.tar.gz Index: powwow.spec =================================================================== RCS file: /cvs/pkgs/rpms/powwow/devel/powwow.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- powwow.spec 21 Apr 2009 20:08:49 -0000 1.1 +++ powwow.spec 1 May 2009 22:34:32 -0000 1.2 @@ -1,6 +1,6 @@ Name: powwow -Version: 1.2.14 -Release: 3%{?dist} +Version: 1.2.15 +Release: 1%{?dist} Summary: A console MUD client Group: Applications/Internet @@ -52,14 +52,6 @@ make install DESTDIR=$RPM_BUILD_ROOT # the standard directory. rm -f $RPM_BUILD_ROOT%{_datadir}/powwow/powwow.doc -# Rename / delete executables to avoid possible name clashes and to reflect -# changes in upcoming powwow release. -# The following lines can be removed after powwow-1.2.15 has been released. -mv $RPM_BUILD_ROOT%{_bindir}/{movie_play,powwow-movieplay} -ln -s powwow-movieplay $RPM_BUILD_ROOT%{_bindir}/powwow-movie2ascii -mv $RPM_BUILD_ROOT%{_bindir}/{muc,powwow-muc} -rm -f $RPM_BUILD_ROOT%{_bindir}/{catrw,follow} - %clean rm -rf $RPM_BUILD_ROOT @@ -82,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 02 2009 Kalev Lember - 1.2.15-1 +- Update to powwow 1.2.15. + * Mon Apr 20 2009 Kalev Lember - 1.2.14-3 - Rework powwow-devel description. - Rename movie_play and muc, remove catrw and follow to avoid Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/powwow/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 21 Apr 2009 20:08:49 -0000 1.2 +++ sources 1 May 2009 22:34:32 -0000 1.3 @@ -1 +1 @@ -5c1d600ca8e577dc620c1c15c01cfdf5 powwow-1.2.14.tar.gz +1eaaf6d601fb1e1b9ce4f4e69f31872b powwow-1.2.15.tar.gz From oget at fedoraproject.org Fri May 1 22:36:09 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 1 May 2009 22:36:09 +0000 (UTC) Subject: rpms/jVorbisEnc/F-11 import.log, NONE, 1.1 jVorbisEnc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501223609.D2B277012F@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/jVorbisEnc/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3351/F-11 Modified Files: .cvsignore sources Added Files: import.log jVorbisEnc.spec Log Message: * Thu Apr 30 2009 Orcan Ogetbil - 0.1-3 - License is LGPLv2+ * Wed Apr 29 2009 Orcan Ogetbil - 0.1-2 - Disable building of aot bits on ppc64 (RHBZ #498351) * Sat Mar 21 2009 Orcan Ogetbil - 0.1-1 - Initial build for Fedora. SPEC file borrowed from SUSE. * Mon Mar 19 2006 Toni Graffy - 0.1a-0.pm.1 - First packaged release 0.1a --- NEW FILE import.log --- jVorbisEnc-0_1-3_fc10:F-11:jVorbisEnc-0.1-3.fc10.src.rpm:1241217317 --- NEW FILE jVorbisEnc.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jVorbisEnc Summary: Pure Java Ogg Vorbis Encoder Group: System Environment/Libraries Version: 0.1 Release: 3%{?dist} License: LGPLv2+ URL: http://zbigniew.sudnik.org/app/vorbis/vorbis.html Source0: http://zbigniew.sudnik.org/app/vorbis/download/%{name}_src.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jpackage-utils BuildRequires: java-devel >= 1.5 %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 Requires: jpackage-utils Requires: java >= 1.5 %description JVorbis is a music encoder, which compresses high quality audio format (44.1-48.0kHz, 16+ bit, polyphonic). %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 -c -n %{name} %build mkdir classes %javac -d classes `find ./ -name \*.java` %jar cf %{name}.jar -C classes . %javadoc -d doc -public `find ./ -name \*.java` %install rm -rf %{buildroot} # jars install -dm 755 %{buildroot}%{_javadir} install -pm 644 %{name}.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done popd # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} # Building of aot bits fail on ppc64. RHBZ #498351 %ifnarch ppc64 %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 %endif %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_javadir}/%{name}*.jar %ifnarch ppc64 %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Thu Apr 30 2009 Orcan Ogetbil - 0.1-3 - License is LGPLv2+ * Wed Apr 29 2009 Orcan Ogetbil - 0.1-2 - Disable building of aot bits on ppc64 (RHBZ #498351) * Sat Mar 21 2009 Orcan Ogetbil - 0.1-1 - Initial build for Fedora. SPEC file borrowed from SUSE. * Mon Mar 19 2006 Toni Graffy - 0.1a-0.pm.1 - First packaged release 0.1a Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jVorbisEnc/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:53:55 -0000 1.1 +++ .cvsignore 1 May 2009 22:35:39 -0000 1.2 @@ -0,0 +1 @@ +jVorbisEnc_src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jVorbisEnc/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:53:55 -0000 1.1 +++ sources 1 May 2009 22:35:39 -0000 1.2 @@ -0,0 +1 @@ +8476478045d6f7c0114272bc8bab97e1 jVorbisEnc_src.zip From oget at fedoraproject.org Fri May 1 22:27:48 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 1 May 2009 22:27:48 +0000 (UTC) Subject: rpms/jorbis/F-10 import.log, NONE, 1.1 jorbis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501222748.7C1067012F@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/jorbis/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv743/F-10 Modified Files: .cvsignore sources Added Files: import.log jorbis.spec Log Message: * Wed Apr 29 2009 Orcan Ogetbil - 0.0.17-2 - Fix duplicate files issue * Sun Apr 19 2009 Orcan Ogetbil - 0.0.17-1 - Initial Fedora build --- NEW FILE import.log --- jorbis-0_0_17-2_fc10:F-10:jorbis-0.0.17-2.fc10.src.rpm:1241216819 --- NEW FILE jorbis.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jorbis Summary: Pure Java Ogg Vorbis Decoder URL: http://www.jcraft.com/jorbis/index.html Source0: http://www.jcraft.com/%{name}/%{name}-%{version}.zip Group: System Environment/Libraries Version: 0.0.17 Release: 2%{?dist} License: LGPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ant BuildRequires: java-devel >= 1.6 BuildRequires: 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 Requires: java >= 1.5 Requires: jpackage-utils %description JOrbis is a pure Java Ogg Vorbis decoder. JOrbis accepts Ogg Vorbis bitstreams and decodes them to raw PCMs. %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}. %package player Summary: An ogg player using JOrbis Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description player JOrbisPlayer is a simple ogg-Player. %package comment Summary: JOrbisComment is a simple comment editor for Ogg Vorbis Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description comment JOrbisComment is a simple comment editor for Ogg Vorbis. This program is just provided here for setting an example, how to use JOrbis for editing comments. %prep %setup -q # Fix weird permission chmod -x com/jcraft/jorbis/Util.java %build %javac `find ./ -name '*.java'` %jar cf %{name}.jar com/jcraft/*/*.class %jar cf %{name}-player.jar player/*.class %jar cf %{name}-comment.jar comment_editor/*.class %javadoc -d doc -public `find ./ -name '*.java'` %install rm -rf %{buildroot} # jars install -dm 755 %{buildroot}%{_javadir} install -pm 644 jorbis.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar install -pm 644 %{name}-player.jar \ %{buildroot}%{_javadir}/%{name}-player-%{version}.jar install -pm 644 %{name}-comment.jar \ %{buildroot}%{_javadir}/%{name}-comment-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done popd # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf %{buildroot} %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 %post player %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun player %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %post comment %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun comment %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(-,root,root,-) %doc COPYING.LIB ChangeLog README %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %if %{with_gcj} %dir %{_libdir}/gcj/%{name} %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %files player %defattr(-,root,root,-) %doc player/JOrbisPlayer.html %{_javadir}/%{name}-player*.jar %if %{with_gcj} %{_libdir}/gcj/%{name}/%{name}-player*.jar.* %endif %files comment %defattr(-,root,root,-) %doc comment_editor/README %{_javadir}/%{name}-comment*.jar %if %{with_gcj} %{_libdir}/gcj/%{name}/%{name}-comment*.jar.* %endif %changelog * Wed Apr 29 2009 Orcan Ogetbil - 0.0.17-2 - Fix duplicate files issue * Sun Apr 19 2009 Orcan Ogetbil - 0.0.17-1 - Initial Fedora build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jorbis/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:04:06 -0000 1.1 +++ .cvsignore 1 May 2009 22:27:18 -0000 1.2 @@ -0,0 +1 @@ +jorbis-0.0.17.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jorbis/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:04:06 -0000 1.1 +++ sources 1 May 2009 22:27:18 -0000 1.2 @@ -0,0 +1 @@ +6141edfb16d34412a86c95a97fd4b10f jorbis-0.0.17.zip From oget at fedoraproject.org Fri May 1 22:37:28 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 1 May 2009 22:37:28 +0000 (UTC) Subject: rpms/jVorbisEnc/F-10 import.log, NONE, 1.1 jVorbisEnc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501223728.179607012F@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/jVorbisEnc/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3764/F-10 Modified Files: .cvsignore sources Added Files: import.log jVorbisEnc.spec Log Message: * Thu Apr 30 2009 Orcan Ogetbil - 0.1-3 - License is LGPLv2+ * Wed Apr 29 2009 Orcan Ogetbil - 0.1-2 - Disable building of aot bits on ppc64 (RHBZ #498351) * Sat Mar 21 2009 Orcan Ogetbil - 0.1-1 - Initial build for Fedora. SPEC file borrowed from SUSE. * Mon Mar 19 2006 Toni Graffy - 0.1a-0.pm.1 - First packaged release 0.1a --- NEW FILE import.log --- jVorbisEnc-0_1-3_fc10:F-10:jVorbisEnc-0.1-3.fc10.src.rpm:1241217397 --- NEW FILE jVorbisEnc.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jVorbisEnc Summary: Pure Java Ogg Vorbis Encoder Group: System Environment/Libraries Version: 0.1 Release: 3%{?dist} License: LGPLv2+ URL: http://zbigniew.sudnik.org/app/vorbis/vorbis.html Source0: http://zbigniew.sudnik.org/app/vorbis/download/%{name}_src.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jpackage-utils BuildRequires: java-devel >= 1.5 %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 Requires: jpackage-utils Requires: java >= 1.5 %description JVorbis is a music encoder, which compresses high quality audio format (44.1-48.0kHz, 16+ bit, polyphonic). %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 -c -n %{name} %build mkdir classes %javac -d classes `find ./ -name \*.java` %jar cf %{name}.jar -C classes . %javadoc -d doc -public `find ./ -name \*.java` %install rm -rf %{buildroot} # jars install -dm 755 %{buildroot}%{_javadir} install -pm 644 %{name}.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done popd # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} # Building of aot bits fail on ppc64. RHBZ #498351 %ifnarch ppc64 %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 %endif %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_javadir}/%{name}*.jar %ifnarch ppc64 %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Thu Apr 30 2009 Orcan Ogetbil - 0.1-3 - License is LGPLv2+ * Wed Apr 29 2009 Orcan Ogetbil - 0.1-2 - Disable building of aot bits on ppc64 (RHBZ #498351) * Sat Mar 21 2009 Orcan Ogetbil - 0.1-1 - Initial build for Fedora. SPEC file borrowed from SUSE. * Mon Mar 19 2006 Toni Graffy - 0.1a-0.pm.1 - First packaged release 0.1a Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jVorbisEnc/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:53:55 -0000 1.1 +++ .cvsignore 1 May 2009 22:36:57 -0000 1.2 @@ -0,0 +1 @@ +jVorbisEnc_src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jVorbisEnc/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:53:55 -0000 1.1 +++ sources 1 May 2009 22:36:57 -0000 1.2 @@ -0,0 +1 @@ +8476478045d6f7c0114272bc8bab97e1 jVorbisEnc_src.zip From oget at fedoraproject.org Fri May 1 22:38:51 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 1 May 2009 22:38:51 +0000 (UTC) Subject: rpms/jVorbisEnc/F-9 import.log, NONE, 1.1 jVorbisEnc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090501223851.708397012F@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/jVorbisEnc/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4160/F-9 Modified Files: .cvsignore sources Added Files: import.log jVorbisEnc.spec Log Message: * Thu Apr 30 2009 Orcan Ogetbil - 0.1-3 - License is LGPLv2+ * Wed Apr 29 2009 Orcan Ogetbil - 0.1-2 - Disable building of aot bits on ppc64 (RHBZ #498351) * Sat Mar 21 2009 Orcan Ogetbil - 0.1-1 - Initial build for Fedora. SPEC file borrowed from SUSE. * Mon Mar 19 2006 Toni Graffy - 0.1a-0.pm.1 - First packaged release 0.1a --- NEW FILE import.log --- jVorbisEnc-0_1-3_fc10:F-9:jVorbisEnc-0.1-3.fc10.src.rpm:1241217479 --- NEW FILE jVorbisEnc.spec --- %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jVorbisEnc Summary: Pure Java Ogg Vorbis Encoder Group: System Environment/Libraries Version: 0.1 Release: 3%{?dist} License: LGPLv2+ URL: http://zbigniew.sudnik.org/app/vorbis/vorbis.html Source0: http://zbigniew.sudnik.org/app/vorbis/download/%{name}_src.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jpackage-utils BuildRequires: java-devel >= 1.5 %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 Requires: jpackage-utils Requires: java >= 1.5 %description JVorbis is a music encoder, which compresses high quality audio format (44.1-48.0kHz, 16+ bit, polyphonic). %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 -c -n %{name} %build mkdir classes %javac -d classes `find ./ -name \*.java` %jar cf %{name}.jar -C classes . %javadoc -d doc -public `find ./ -name \*.java` %install rm -rf %{buildroot} # jars install -dm 755 %{buildroot}%{_javadir} install -pm 644 %{name}.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done popd # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name} # Building of aot bits fail on ppc64. RHBZ #498351 %ifnarch ppc64 %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 %endif %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_javadir}/%{name}*.jar %ifnarch ppc64 %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Thu Apr 30 2009 Orcan Ogetbil - 0.1-3 - License is LGPLv2+ * Wed Apr 29 2009 Orcan Ogetbil - 0.1-2 - Disable building of aot bits on ppc64 (RHBZ #498351) * Sat Mar 21 2009 Orcan Ogetbil - 0.1-1 - Initial build for Fedora. SPEC file borrowed from SUSE. * Mon Mar 19 2006 Toni Graffy - 0.1a-0.pm.1 - First packaged release 0.1a Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jVorbisEnc/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:53:55 -0000 1.1 +++ .cvsignore 1 May 2009 22:38:21 -0000 1.2 @@ -0,0 +1 @@ +jVorbisEnc_src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jVorbisEnc/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:53:55 -0000 1.1 +++ sources 1 May 2009 22:38:21 -0000 1.2 @@ -0,0 +1 @@ +8476478045d6f7c0114272bc8bab97e1 jVorbisEnc_src.zip From kalev at fedoraproject.org Fri May 1 22:49:06 2009 From: kalev at fedoraproject.org (Kalev Lember) Date: Fri, 1 May 2009 22:49:06 +0000 (UTC) Subject: rpms/powwow/F-11 .cvsignore, 1.2, 1.3 powwow.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090501224906.DC2987012F@cvs1.fedora.phx.redhat.com> Author: kalev Update of /cvs/pkgs/rpms/powwow/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5269 Modified Files: .cvsignore powwow.spec sources Log Message: Update to powwow 1.2.15. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 21 Apr 2009 20:12:29 -0000 1.2 +++ .cvsignore 1 May 2009 22:48:35 -0000 1.3 @@ -1 +1 @@ -powwow-1.2.14.tar.gz +powwow-1.2.15.tar.gz Index: powwow.spec =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-11/powwow.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- powwow.spec 21 Apr 2009 20:12:30 -0000 1.1 +++ powwow.spec 1 May 2009 22:48:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: powwow -Version: 1.2.14 -Release: 3%{?dist} +Version: 1.2.15 +Release: 1%{?dist} Summary: A console MUD client Group: Applications/Internet @@ -52,14 +52,6 @@ make install DESTDIR=$RPM_BUILD_ROOT # the standard directory. rm -f $RPM_BUILD_ROOT%{_datadir}/powwow/powwow.doc -# Rename / delete executables to avoid possible name clashes and to reflect -# changes in upcoming powwow release. -# The following lines can be removed after powwow-1.2.15 has been released. -mv $RPM_BUILD_ROOT%{_bindir}/{movie_play,powwow-movieplay} -ln -s powwow-movieplay $RPM_BUILD_ROOT%{_bindir}/powwow-movie2ascii -mv $RPM_BUILD_ROOT%{_bindir}/{muc,powwow-muc} -rm -f $RPM_BUILD_ROOT%{_bindir}/{catrw,follow} - %clean rm -rf $RPM_BUILD_ROOT @@ -82,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 02 2009 Kalev Lember - 1.2.15-1 +- Update to powwow 1.2.15. + * Mon Apr 20 2009 Kalev Lember - 1.2.14-3 - Rework powwow-devel description. - Rename movie_play and muc, remove catrw and follow to avoid Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 21 Apr 2009 20:12:30 -0000 1.2 +++ sources 1 May 2009 22:48:35 -0000 1.3 @@ -1 +1 @@ -5c1d600ca8e577dc620c1c15c01cfdf5 powwow-1.2.14.tar.gz +1eaaf6d601fb1e1b9ce4f4e69f31872b powwow-1.2.15.tar.gz From kalev at fedoraproject.org Fri May 1 22:52:38 2009 From: kalev at fedoraproject.org (Kalev Lember) Date: Fri, 1 May 2009 22:52:38 +0000 (UTC) Subject: rpms/powwow/F-10 .cvsignore, 1.2, 1.3 powwow.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090501225238.9C5AD7012F@cvs1.fedora.phx.redhat.com> Author: kalev Update of /cvs/pkgs/rpms/powwow/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5721 Modified Files: .cvsignore powwow.spec sources Log Message: Update to powwow 1.2.15. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 21 Apr 2009 20:15:05 -0000 1.2 +++ .cvsignore 1 May 2009 22:52:08 -0000 1.3 @@ -1 +1 @@ -powwow-1.2.14.tar.gz +powwow-1.2.15.tar.gz Index: powwow.spec =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-10/powwow.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- powwow.spec 21 Apr 2009 20:15:06 -0000 1.1 +++ powwow.spec 1 May 2009 22:52:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: powwow -Version: 1.2.14 -Release: 3%{?dist} +Version: 1.2.15 +Release: 1%{?dist} Summary: A console MUD client Group: Applications/Internet @@ -52,14 +52,6 @@ make install DESTDIR=$RPM_BUILD_ROOT # the standard directory. rm -f $RPM_BUILD_ROOT%{_datadir}/powwow/powwow.doc -# Rename / delete executables to avoid possible name clashes and to reflect -# changes in upcoming powwow release. -# The following lines can be removed after powwow-1.2.15 has been released. -mv $RPM_BUILD_ROOT%{_bindir}/{movie_play,powwow-movieplay} -ln -s powwow-movieplay $RPM_BUILD_ROOT%{_bindir}/powwow-movie2ascii -mv $RPM_BUILD_ROOT%{_bindir}/{muc,powwow-muc} -rm -f $RPM_BUILD_ROOT%{_bindir}/{catrw,follow} - %clean rm -rf $RPM_BUILD_ROOT @@ -82,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 02 2009 Kalev Lember - 1.2.15-1 +- Update to powwow 1.2.15. + * Mon Apr 20 2009 Kalev Lember - 1.2.14-3 - Rework powwow-devel description. - Rename movie_play and muc, remove catrw and follow to avoid Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 21 Apr 2009 20:15:07 -0000 1.2 +++ sources 1 May 2009 22:52:08 -0000 1.3 @@ -1 +1 @@ -5c1d600ca8e577dc620c1c15c01cfdf5 powwow-1.2.14.tar.gz +1eaaf6d601fb1e1b9ce4f4e69f31872b powwow-1.2.15.tar.gz From kalev at fedoraproject.org Fri May 1 22:55:42 2009 From: kalev at fedoraproject.org (Kalev Lember) Date: Fri, 1 May 2009 22:55:42 +0000 (UTC) Subject: rpms/powwow/F-9 .cvsignore, 1.2, 1.3 powwow.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090501225542.7B2687012F@cvs1.fedora.phx.redhat.com> Author: kalev Update of /cvs/pkgs/rpms/powwow/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6052 Modified Files: .cvsignore powwow.spec sources Log Message: Update to powwow 1.2.15. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 21 Apr 2009 20:17:39 -0000 1.2 +++ .cvsignore 1 May 2009 22:55:11 -0000 1.3 @@ -1 +1 @@ -powwow-1.2.14.tar.gz +powwow-1.2.15.tar.gz Index: powwow.spec =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-9/powwow.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- powwow.spec 21 Apr 2009 20:17:39 -0000 1.1 +++ powwow.spec 1 May 2009 22:55:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: powwow -Version: 1.2.14 -Release: 3%{?dist} +Version: 1.2.15 +Release: 1%{?dist} Summary: A console MUD client Group: Applications/Internet @@ -52,14 +52,6 @@ make install DESTDIR=$RPM_BUILD_ROOT # the standard directory. rm -f $RPM_BUILD_ROOT%{_datadir}/powwow/powwow.doc -# Rename / delete executables to avoid possible name clashes and to reflect -# changes in upcoming powwow release. -# The following lines can be removed after powwow-1.2.15 has been released. -mv $RPM_BUILD_ROOT%{_bindir}/{movie_play,powwow-movieplay} -ln -s powwow-movieplay $RPM_BUILD_ROOT%{_bindir}/powwow-movie2ascii -mv $RPM_BUILD_ROOT%{_bindir}/{muc,powwow-muc} -rm -f $RPM_BUILD_ROOT%{_bindir}/{catrw,follow} - %clean rm -rf $RPM_BUILD_ROOT @@ -82,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 02 2009 Kalev Lember - 1.2.15-1 +- Update to powwow 1.2.15. + * Mon Apr 20 2009 Kalev Lember - 1.2.14-3 - Rework powwow-devel description. - Rename movie_play and muc, remove catrw and follow to avoid Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/powwow/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 21 Apr 2009 20:17:39 -0000 1.2 +++ sources 1 May 2009 22:55:11 -0000 1.3 @@ -1 +1 @@ -5c1d600ca8e577dc620c1c15c01cfdf5 powwow-1.2.14.tar.gz +1eaaf6d601fb1e1b9ce4f4e69f31872b powwow-1.2.15.tar.gz From petersen at fedoraproject.org Fri May 1 23:41:26 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Fri, 1 May 2009 23:41:26 +0000 (UTC) Subject: rpms/scim/devel .cvsignore, 1.27, 1.28 scim.spec, 1.142, 1.143 sources, 1.29, 1.30 scim-1.4.7-translation-update-431995.patch, 1.2, NONE ta.po, 1.1, NONE Message-ID: <20090501234126.79AE67012F@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/scim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11329 Modified Files: .cvsignore scim.spec sources Removed Files: scim-1.4.7-translation-update-431995.patch ta.po Log Message: - update to 1.4.9 - ta.po is now upstream and scim-1.4.7-translation-update-431995.patch no longer needed Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- .cvsignore 27 Jan 2009 09:32:21 -0000 1.27 +++ .cvsignore 1 May 2009 23:40:55 -0000 1.28 @@ -1,2 +1,2 @@ scim-icons-0.7.tar.gz -scim-1.4.8.tar.gz +scim-1.4.9.tar.gz Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -p -r1.142 -r1.143 --- scim.spec 25 Mar 2009 07:24:24 -0000 1.142 +++ scim.spec 1 May 2009 23:40:56 -0000 1.143 @@ -1,20 +1,16 @@ -#%%define snapdate 20060716 -%define snapshot 0%{?snapdate:1} - Name: scim -Version: 1.4.8 -Release: 3%{?dist} +Version: 1.4.9 +Release: 1%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ Group: System Environment/Libraries URL: http://www.scim-im.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: xinput-scim Source2: scim-icons-0.7.tar.gz Source3: scim-system-config Source4: scim-system-global -Source5: ta.po BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libXt-devel @@ -22,10 +18,6 @@ BuildRequires: gtk2-devel, libXt-devel Buildrequires: autoconf automake gettext libtool # for system ltdl Buildrequires: libtool-ltdl-devel -%if %{snapshot} -# for devel docs -BuildRequires: doxygen -%endif Requires: %{name}-libs = %{version}-%{release} Requires: imsettings, im-chooser Requires(post): %{_sbindir}/alternatives @@ -43,7 +35,6 @@ Patch20: scim-1.4.7-fix-fallback.patch Patch21: scim-1.4.7-fix-capslock.patch 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 Patch27: scim-1.4.7-menu-pos.patch @@ -153,7 +144,7 @@ This package requires the SCIM packages %prep -%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -a2 +%setup -q -a2 cp -p scim-icons/icons/*.png data/icons cp -p scim-icons/pixmaps/*.png data/pixmaps @@ -164,9 +155,6 @@ cp -p %{SOURCE3} configs/config mv configs/global{,.orig} cp -p %{SOURCE4} configs/global -# Tamil translation -cp -pi %{SOURCE5} po - %patch7 -p1 -b .7-emacs-ccmode~ %patch9 -p1 -b .9-icon-size~ %patch11 -p1 -b .11-factory-menu~ @@ -178,7 +166,6 @@ cp -pi %{SOURCE5} po %patch21 -p1 -b .21-fix-capslock %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 %patch27 -p1 -b .27-menu-pos @@ -188,7 +175,7 @@ cp -pi %{SOURCE5} po %patch31 -p1 -b .31-sysltdl %patch32 -E -p1 -b .fix-dlopen -# patch17, patch24 touch configure.ac and Makefile.am +# patch17 touches configure.ac and Makefile.am ./bootstrap @@ -196,11 +183,6 @@ cp -pi %{SOURCE5} po %configure --disable-static --enable-ld-version-script make %{?_smp_mflags} -%if %{snapshot} -make -C docs html -rm -f docs/html/Helvetica.ttf -%endif - %install rm -rf ${RPM_BUILD_ROOT} @@ -317,6 +299,11 @@ fi %changelog +* Sat May 2 2009 Jens Petersen - 1.4.9-1 +- update to 1.4.9 +- ta.po is now upstream and scim-1.4.7-translation-update-431995.patch + no longer needed + * Wed Mar 25 2009 Huang Peng - 1.4.8-3 - Use lt_dlopenadvise to replace lt_dlopenext to fix bug 491841 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- sources 27 Jan 2009 09:32:21 -0000 1.29 +++ sources 1 May 2009 23:40:56 -0000 1.30 @@ -1,2 +1,2 @@ 2308b7fc4a5f981d08c7f00c90a7291b scim-icons-0.7.tar.gz -c52da019d48df4ba44cbd01558203cc7 scim-1.4.8.tar.gz +975ba34b01304ea8166ac8ea27aa9e88 scim-1.4.9.tar.gz --- scim-1.4.7-translation-update-431995.patch DELETED --- --- ta.po DELETED --- From bskeggs at fedoraproject.org Fri May 1 23:45:23 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Fri, 1 May 2009 23:45:23 +0000 (UTC) Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.42, 1.43 kernel.spec, 1.1583, 1.1584 Message-ID: <20090501234523.15DC37012F@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11741 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Sat May 02 2009 Ben Skeggs 2.6.29.2-122 - drm-nouveau.patch: nv50 connector grouping fixes - bios parser updates from ddx (nv50 panel mode from VBIOS table) - pre-nv50 modesetting updates from ddx (in disabled codepath) drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v retrieving revision 1.42 retrieving revision 1.43 diff -u -p -r1.42 -r1.43 --- drm-nouveau.patch 24 Apr 2009 04:10:41 -0000 1.42 +++ drm-nouveau.patch 1 May 2009 23:45:21 -0000 1.43 @@ -424,10 +424,10 @@ index 0000000..e3d354f +} diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c new file mode 100644 -index 0000000..fd3e08a +index 0000000..2baf01b --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c -@@ -0,0 +1,4577 @@ +@@ -0,0 +1,4799 @@ +/* + * Copyright 2005-2006 Erik Waling + * Copyright 2006 Stephane Marchesin @@ -461,6 +461,7 @@ index 0000000..fd3e08a +#define NV_CIO_CRE_44_HEADB 0x3 +#define FEATURE_MOBILE 0x10 /* also FEATURE_QUADRO for BMP */ +#define LEGACY_I2C_CRT 0x80 ++#define LEGACY_I2C_PANEL 0x81 + +#define EDID1_LEN 128 + @@ -517,12 +518,11 @@ index 0000000..fd3e08a + +static void load_vbios_prom(struct drm_device *dev, uint8_t *data) +{ -+ struct drm_nouveau_private *dev_priv = dev->dev_private; + uint32_t pci_nv_20, save_pci_nv_20; + int pcir_ptr; + int i; + -+ if (dev_priv->card_type >= NV_50) ++ if (nv_arch(dev) >= NV_50) + pci_nv_20 = 0x88050; + else + pci_nv_20 = NV_PBUS_PCI_NV_20; @@ -561,11 +561,10 @@ index 0000000..fd3e08a + +static void load_vbios_pramin(struct drm_device *dev, uint8_t *data) +{ -+ struct drm_nouveau_private *dev_priv = dev->dev_private; + uint32_t old_bar0_pramin = 0; + int i; + -+ if (dev_priv->card_type >= NV_50) { ++ if (nv_arch(dev) >= NV_50) { + uint32_t vbios_vram = (nv_rd32(0x619f04) & ~0xff) << 8; + + if (!vbios_vram) @@ -584,7 +583,7 @@ index 0000000..fd3e08a + data[i] = nv_rd08(NV_PRAMIN_OFFSET + i); + +out: -+ if (dev_priv->card_type >= NV_50) ++ if (nv_arch(dev) >= NV_50) + nv_wr32(0x1700, old_bar0_pramin); +} + @@ -676,6 +675,21 @@ index 0000000..fd3e08a +// BIOS_USLEEP(2000); +} + ++static uint32_t ++munge_reg(struct drm_device *dev, uint32_t reg) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ ++ if (nv_arch(dev) < NV_50) ++ return reg; ++ ++ if (reg & 0x40000000) ++ reg += dev_priv->VBIOS.display.head * 0x800; ++ ++ reg &= ~(0x40000000); ++ return reg; ++} ++ +static int valid_reg(struct drm_device *dev, uint32_t reg) +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; @@ -700,7 +714,7 @@ index 0000000..fd3e08a + if (WITHIN(reg,NV_PFIFO_OFFSET,NV_PFIFO_SIZE)) + return 1; + /* maybe a little large, but it will do for the moment. */ -+ if (dev_priv->VBIOS.pub.chip_version >= 0x80 && WITHIN(reg, 0x1000, 0xEFFF)) ++ if (nv_arch(dev) >= NV_50 && WITHIN(reg, 0x1000, 0xEFFF)) + return 1; + if (dev_priv->VBIOS.pub.chip_version >= 0x30 && WITHIN(reg,0x4000,0x600)) + return 1; @@ -714,12 +728,13 @@ index 0000000..fd3e08a + if (WITHIN(reg,0x88000,NV_PBUS_SIZE)) /* new PBUS */ + return 1; + } -+ if (dev_priv->VBIOS.pub.chip_version >= 0x80) { -+ /* No clue what they do, but because they are outside normal ranges we'd -+ * better list them seperately. */ -+ if (reg == 0x00020018 || reg == 0x0002004C || reg == 0x00020060 || -+ reg == 0x00021218 || reg == 0x0002130C || reg == 0x00089008 || -+ reg == 0x00089028) ++ if (nv_arch(dev) >= NV_50) { ++ /* No clue what they do, but because they are outside normal ++ * ranges we'd better list them seperately. */ ++ if (reg == 0x00020018 || reg == 0x0002004C || ++ reg == 0x00020060 || reg == 0x00021218 || ++ reg == 0x0002130C || reg == 0x00089008 || ++ reg == 0x00089028) + return 1; + } + if (WITHIN(reg,NV_PFB_OFFSET,NV_PFB_SIZE)) @@ -728,7 +743,8 @@ index 0000000..fd3e08a + return 1; + if (WITHIN(reg,NV_PCRTC0_OFFSET,NV_PCRTC0_SIZE * 2)) + return 1; -+ if (dev_priv->VBIOS.pub.chip_version >= 0x80 && WITHIN(reg, NV50_DISPLAY_OFFSET, NV50_DISPLAY_SIZE)) ++ if (nv_arch(dev) >= NV_50 && ++ WITHIN(reg, NV50_DISPLAY_OFFSET, NV50_DISPLAY_SIZE)) + return 1; + if (WITHIN(reg,NV_PRAMDAC0_OFFSET,NV_PRAMDAC0_SIZE * 2)) + return 1; @@ -778,6 +794,7 @@ index 0000000..fd3e08a +{ + uint32_t data; + ++ reg = munge_reg(dev, reg); + if (!valid_reg(dev, reg)) + return 0; + @@ -806,6 +823,7 @@ index 0000000..fd3e08a +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + ++ reg = munge_reg(dev, reg); + if (!valid_reg(dev, reg)) + return; + @@ -3185,7 +3203,10 @@ index 0000000..fd3e08a + if (bios->major_version < 5 && bios->data[0x48] & 0x4) + return (NVReadVgaCrtc5758(dev, 0, 0xf) & 0xf); + -+ return ((bios_rd32(dev, NV_PEXTDEV_BOOT_0) >> 16) & 0xf); ++ if (nv_arch(dev) >= NV_50) ++ return ((bios_rd32(dev, NV_PEXTDEV_BOOT_0) >> 24) & 0xf); ++ else ++ return ((bios_rd32(dev, NV_PEXTDEV_BOOT_0) >> 16) & 0xf); +} + +static int parse_fp_mode_table(struct drm_device *dev, struct nvbios *bios) @@ -3199,7 +3220,8 @@ index 0000000..fd3e08a + /* Apple cards don't have the fp table; the laptops use DDC */ +#ifndef __powerpc__ + NV_ERROR(dev, "Pointer to flat panel table invalid\n"); -+ if (bios->pub.chip_version != 0x67) /* sigh, IGPs */ ++ if (bios->pub.chip_version != 0x67 && /* sigh, IGPs */ ++ bios->pub.chip_version != 0x73) + return -EINVAL; +#endif + bios->pub.digital_min_front_porch = 0x4b; @@ -3256,36 +3278,7 @@ index 0000000..fd3e08a + + fpstrapping = get_fp_strap(dev, bios); + -+ if (lth.lvds_ver == 0x40) { -+ /* Query all modes and find one with a matching clock. */ -+ /* Note that this only serves as a backup solution if ddc fails. */ -+ -+ uint32_t clock, needed_clock; -+ int i, index = 0xf, matches = 0; -+ needed_clock = bios_rd32(dev, 0x00616404) & 0xFFFFF; -+ NV_TRACE(dev, "LVDS clock seems to be %d KHz.\n", needed_clock); -+ -+ for (i = 0; i < fpentries; i++) { -+ clock = ROM16(fptable[headerlen + recordlen * i]) * 10; -+ if (clock == needed_clock) { -+ matches++; -+ index = i; -+ } -+ } -+ -+ if (matches == 1) -+ NV_TRACE(dev, "Found a mode with matching clock\n"); -+ else -+ NV_TRACE(dev, "Found %d modes, this is not useful\n", matches); -+ -+ if (matches != 1) -+ index = 0xF; -+ -+ fpindex = bios->data[bios->fp.fpxlatetableptr + index * bios->fp.xlatwidth]; -+ /* strapping only set as a hack for DDC test below */ -+ fpstrapping = fpindex & 0xf; -+ } else -+ fpindex = bios->data[bios->fp.fpxlatetableptr + fpstrapping * bios->fp.xlatwidth]; ++ fpindex = bios->data[bios->fp.fpxlatetableptr + fpstrapping * bios->fp.xlatwidth]; + + if (fpindex > fpentries) { + NV_ERROR(dev, "Bad flat panel table index\n"); @@ -3382,7 +3375,7 @@ index 0000000..fd3e08a + int fpstrapping = get_fp_strap(dev, bios), lvdsmanufacturerindex = 0; + struct lvdstableheader lth; + uint16_t lvdsofs; -+ int ret; ++ int ret, chip_version = bios->pub.chip_version; + + if ((ret = parse_lvds_manufacturer_table_header(dev, bios, <h))) + return ret; @@ -3395,14 +3388,23 @@ index 0000000..fd3e08a + if (!pxclk) + break; + -+ /* change in behaviour guessed at nv30; see datapoints below */ -+ if (bios->pub.chip_version < 0x30) { ++ if (chip_version < 0x25) { + /* nv17 behaviour */ + /* it seems the old style lvds script pointer is reused + * to select 18/24 bit colour depth for EDID panels */ + lvdsmanufacturerindex = (bios->legacy.lvds_single_a_script_ptr & 1) ? 2 : 0; + if (pxclk >= bios->fp.duallink_transition_clk) + lvdsmanufacturerindex++; ++ } else if (chip_version < 0x30) { ++ /* nv28 behaviour (off-chip encoder) */ ++ /* nv28 does a complex dance of first using byte 121 of ++ * the EDID to choose the lvdsmanufacturerindex, then ++ * later attempting to match the EDID manufacturer and ++ * product IDs in a table (signature 'pidt' (panel id ++ * table?)), setting an lvdsmanufacturerindex of 0 and ++ * an fp strap of the match index (or 0xf if none) ++ */ ++ lvdsmanufacturerindex = 0; + } else { + /* nv31, nv34 behaviour */ + lvdsmanufacturerindex = 0; @@ -3461,7 +3463,7 @@ index 0000000..fd3e08a + } + + /* set dual_link flag for EDID case */ -+ if (pxclk) ++ if (pxclk && (chip_version < 0x25 || chip_version > 0x28)) + bios->fp.dual_link = (pxclk >= bios->fp.duallink_transition_clk); + + *dl = bios->fp.dual_link; @@ -3469,6 +3471,156 @@ index 0000000..fd3e08a + return 0; +} + ++static int ++find_script_pointers(struct drm_device *dev, uint8_t *table, uint16_t *script0, ++ uint16_t *script1, uint16_t headerlen, int pxclk) ++{ ++ /* The output script tables describing a particular output type ++ * look as follows: ++ * ++ * offset + 0 (32 bits): output this table matches (hash of DCB) ++ * offset + 4 ( 8 bits): unknown ++ * offset + 5 ( 8 bits): number of configurations ++ * offset + 6 (16 bits): pointer to some script ++ * offset + 8 (16 bits): pointer to some script ++ * ++ * headerlen == 10 ++ * offset + 10 : configuration 0 ++ * ++ * headerlen == 12 ++ * offset + 10 : pointer to some script ++ * offset + 12 : configuration 0 ++ * ++ * Each config entry is as follows: ++ * ++ * offset + 0 (16 bits): unknown, assumed to be a match value ++ * offset + 2 (16 bits): pointer to script table (clock set?) ++ * offset + 4 (16 bits): pointer to script table (reset?) ++ * ++ * There doesn't appear to be a count value to say how many ++ * entries exist in each script table, instead, a 0 value in ++ * the first 16-bit word seems to indicate both the end of the ++ * list and the default entry. The second 16-bit word in the ++ * script tables is a pointer to the script to execute. ++ */ ++ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ struct nvbios *bios = &dev_priv->VBIOS; ++ int i, cmpval = 0x0100; ++ ++ *script0 = *script1 = 0; ++ for (i = 0; i < table[5]; i++) { ++ uint16_t offset; ++ ++ if (ROM16(table[headerlen + i*6 + 0]) != cmpval) ++ continue; ++ ++ offset = ROM16(table[headerlen + i*6 + 2]); ++ if (offset) ++ *script0 = clkcmptable(bios, offset, pxclk); ++ ++ if (!*script0) ++ NV_WARN(dev, "script0 missing!\n"); ++ ++ offset = ROM16(table[headerlen + i*6 + 4]); ++ if (offset) ++ *script1 = clkcmptable(bios, offset, pxclk); ++ ++ return 0; ++ } ++ ++ NV_ERROR(dev, "couldn't find suitable output scripts\n"); ++ return 1; ++} ++ ++int ++nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent, ++ int pxclk) ++{ ++ /* The display script table is located by the BIT 'U' table. ++ * ++ * It contains an array of pointers to various tables describing ++ * a particular output type. The first 32-bits of the output ++ * tables contains similar information to a DCB entry, and is ++ * used to decide whether that particular table is suitable for ++ * the output you want to access. ++ * ++ * The "record header length" field here seems to indicate the ++ * offset of the first configuration entry in the output tables. ++ * This is 10 on most cards I've seen, but 12 has been witnessed ++ * on DP cards, and there's another script pointer within the ++ * header. ++ * ++ * offset + 0 ( 8 bits): version ++ * offset + 1 ( 8 bits): header length ++ * offset + 2 ( 8 bits): record length ++ * offset + 3 ( 8 bits): number of records ++ * offset + 4 ( 8 bits): record header length ++ * offset + 5 (16 bits): pointer to first output script table ++ */ ++ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ init_exec_t iexec = {true, false}; ++ struct nvbios *bios = &dev_priv->VBIOS; ++ uint8_t *table = &bios->data[bios->display.script_table_ptr]; ++ uint8_t *entry, *otable = NULL; ++ uint16_t script0, script1; ++ int i; ++ bool run_scripts = false; ++ ++ if (!bios->display.script_table_ptr) { ++ NV_ERROR(dev, "No pointer to output script table\n"); ++ return 1; ++ } ++ ++ if (table[0] != 0x20) { ++ NV_ERROR(dev, "Output script table version 0x%02x unknown\n", table[0]); ++ return 1; ++ } ++ ++ NV_DEBUG(dev, "Searching for output entry for %d %d %d\n", ++ dcbent->type, dcbent->location, dcbent->or); ++ entry = table + table[1]; ++ for (i = 0; i < table[3]; i++, entry += table[2]) { ++ uint32_t match; ++ ++ if (ROM16(entry[0]) == 0) ++ continue; ++ otable = &bios->data[ROM16(entry[0])]; ++ match = ROM32(otable[0]); ++ ++ NV_DEBUG(dev, " %d: 0x%08x\n", i, match); ++ if ((((match & 0x000f0000) >> 16) & dcbent->or) && ++ ((match & 0x0000000f) >> 0) == dcbent->type && ++ ((match & 0x000000f0) >> 4) == dcbent->location) ++ break; ++ } ++ ++ if (i == table[3]) { ++ NV_ERROR(dev, "Couldn't find matching output script table\n"); ++ return 1; ++ } ++ ++ if (find_script_pointers(dev, otable, &script0, &script1, table[4], pxclk)) ++ return 1; ++ bios->display.head = ffs(dcbent->or) - 1; ++ ++ if (script0) { ++ NV_TRACE(dev, "0x%04X: Parsing output Script0\n", script0); ++ if (run_scripts) ++ parse_init_table(dev, bios, script0, &iexec); ++ } ++ ++ if (script1) { ++ NV_TRACE(dev, "0x%04X: Parsing output Script1\n", script1); ++ if (run_scripts) ++ parse_init_table(dev, bios, script1, &iexec); ++ } ++ ++ return run_scripts ? 0 : 1; ++} ++ ++ +int run_tmds_table(struct drm_device *dev, struct dcb_entry *dcbent, int head, int pxclk) +{ + /* the pxclk parameter is in kHz @@ -3481,10 +3633,13 @@ index 0000000..fd3e08a + + struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nvbios *bios = &dev_priv->VBIOS; ++ int cv = bios->pub.chip_version; + uint16_t clktable = 0, scriptptr; + uint32_t sel_clk_binding, sel_clk; + -+ if (dcbent->location != DCB_LOC_ON_CHIP) ++ /* pre-nv17 off-chip tmds uses scripts, post nv17 doesn't */ ++ if (cv >= 0x17 && cv != 0x1a && cv != 0x20 && ++ dcbent->location != DCB_LOC_ON_CHIP) + return 0; + + switch (ffs(dcbent->or)) { @@ -3614,6 +3769,8 @@ index 0000000..fd3e08a + pll_lim->vco2.max_n = 0x1f; + pll_lim->vco2.min_m = 0x1; + pll_lim->vco2.max_m = 0x4; ++ pll_lim->max_log2p = 0x7; ++ pll_lim->max_usable_log2p = 0x6; + } else if (pll_lim_ver == 0x20 || pll_lim_ver == 0x21) { + uint16_t plloffs = bios->pll_limit_tbl_ptr + headerlen; + uint32_t reg = 0; /* default match */ @@ -3680,7 +3837,13 @@ index 0000000..fd3e08a + pll_lim->vco2.min_m = pll_rec[26]; + pll_lim->vco2.max_m = pll_rec[27]; + -+ pll_lim->max_log2p_bias = pll_rec[29]; ++ pll_lim->max_usable_log2p = pll_lim->max_log2p = pll_rec[29]; ++ if (pll_lim->max_log2p > 0x7) ++ /* pll decoding in nv_hw.c assumes never > 7 */ ++ NV_WARN(dev, "Max log2 P value greater than 7 (%d)\n", ++ pll_lim->max_log2p); ++ if (cv < 0x60) ++ pll_lim->max_usable_log2p = 0x6; + pll_lim->log2p_bias = pll_rec[30]; + + if (recordlen > 0x22) @@ -3740,7 +3903,7 @@ index 0000000..fd3e08a + pll_lim->vco2.max_n = record[21]; + pll_lim->vco2.min_m = record[22]; + pll_lim->vco2.max_m = record[23]; -+ pll_lim->max_log2p_bias = record[25]; ++ pll_lim->max_usable_log2p = pll_lim->max_log2p = record[25]; + pll_lim->log2p_bias = record[27]; + pll_lim->refclk = ROM32(record[28]); + } @@ -3767,6 +3930,11 @@ index 0000000..fd3e08a + pll_lim->vco1.min_m = 0x8; + pll_lim->vco1.max_m = 0xe; + } ++ if (cv < 0x17 || cv == 0x1a || cv == 0x20) ++ pll_lim->max_log2p = 4; ++ else ++ pll_lim->max_log2p = 5; ++ pll_lim->max_usable_log2p = pll_lim->max_log2p; + } + + if (!pll_lim->refclk) @@ -3805,7 +3973,7 @@ index 0000000..fd3e08a + ErrorF("pll.vco2.min_m: %d\n", pll_lim->vco2.min_m); + ErrorF("pll.vco2.max_m: %d\n", pll_lim->vco2.max_m); + -+ ErrorF("pll.max_log2p_bias: %d\n", pll_lim->max_log2p_bias); ++ ErrorF("pll.max_log2p: %d\n", pll_lim->max_log2p); + ErrorF("pll.log2p_bias: %d\n", pll_lim->log2p_bias); + + ErrorF("pll.refclk: %d\n", pll_lim->refclk); @@ -4108,6 +4276,29 @@ index 0000000..fd3e08a + return 0; +} + ++static int ++parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios, ++ bit_entry_t *bitentry) ++{ ++ /* Parses the pointer to the G80 output script tables ++ * ++ * Starting at bitentry->offset: ++ * ++ * offset + 0 (16 bits): output script table pointer ++ */ ++ ++ uint16_t outputscripttableptr; ++ ++ if (bitentry->length != 3) { ++ NV_ERROR(dev, "Do not understand BIT U table\n"); ++ return -EINVAL; ++ } ++ ++ outputscripttableptr = ROM16(bios->data[bitentry->offset]); ++ bios->display.script_table_ptr = outputscripttableptr; ++ return 0; ++} ++ +struct bit_table { + const char id; + int (* const parse_fn)(struct drm_device *, struct nvbios *, bit_entry_t *); @@ -4160,6 +4351,7 @@ index 0000000..fd3e08a + parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('M', M)); /* memory? */ + parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('L', lvds)); + parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('T', tmds)); ++ parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('U', U)); + + return 0; +} @@ -4474,6 +4666,32 @@ index 0000000..fd3e08a + /* "or" mostly unused in early gen crt modesetting, 0 is fine */ +} + ++static void fabricate_dvi_i_output(struct parsed_dcb *dcb, bool twoHeads) ++{ ++ struct dcb_entry *entry = new_dcb_entry(dcb); ++ ++ entry->type = 2; ++ entry->i2c_index = LEGACY_I2C_PANEL; ++ entry->heads = twoHeads ? 3 : 1; ++ entry->location = !DCB_LOC_ON_CHIP; /* ie OFF CHIP */ ++ entry->or = 1; /* naturally on head A; see setting of CRE_LCD__INDEX */ ++ entry->duallink_possible = false; /* SiI164 and co. are single link */ ++ ++#if 0 ++ /* for dvi-a either crtc probably works, but my card appears to only ++ * support dvi-d. "nvidia" still attempts to program it for dvi-a, ++ * doing the full fp output setup (program 0x6808.. fp dimension regs, ++ * setting 0x680848 to 0x10000111 to enable, maybe setting 0x680880); ++ * the monitor picks up the mode res ok and lights up, but no pixel ++ * data appears, so the board manufacturer probably connected up the ++ * sync lines, but missed the video traces / components ++ * ++ * with this introduction, dvi-a left as an exercise for the reader. ++ */ ++ fabricate_vga_output(dcb, LEGACY_I2C_PANEL, entry->heads); ++#endif ++} ++ +static bool +parse_dcb20_entry(struct drm_device *dev, struct bios_parsed_dcb *bdcb, + uint32_t conn, uint32_t conf, struct dcb_entry *entry) @@ -4482,7 +4700,7 @@ index 0000000..fd3e08a + entry->i2c_index = (conn >> 4) & 0xf; + entry->heads = (conn >> 8) & 0xf; + entry->bus = (conn >> 16) & 0xf; -+ entry->location = (conn >> 20) & 0xf; ++ entry->location = (conn >> 20) & 0x3; + entry->or = (conn >> 24) & 0xf; + /* Normal entries consist of a single bit, but dual link has the + * next most significant bit set too @@ -4668,7 +4886,7 @@ index 0000000..fd3e08a + dcb->entries = newentries; +} + -+static int parse_dcb_table(struct drm_device *dev, struct nvbios *bios) ++static int parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads) +{ + struct bios_parsed_dcb *bdcb = &bios->bdcb; + struct parsed_dcb *dcb; @@ -4748,8 +4966,11 @@ index 0000000..fd3e08a + * v1.1 (NV5+, maybe some NV4) is entirely unhelpful + */ + NV_TRACEWARN(dev, "No useful information in BIOS output table; " -+ "assuming a CRT output exists\n"); ++ "adding all possible outputs\n"); + fabricate_vga_output(dcb, LEGACY_I2C_CRT, 1); ++ if (bios->tmds.output0_script_ptr || ++ bios->tmds.output1_script_ptr) ++ fabricate_dvi_i_output(dcb, twoHeads); + return 0; + } + @@ -4798,9 +5019,12 @@ index 0000000..fd3e08a + struct parsed_dcb *dcb = &bios->bdcb.dcb; + int i; + -+ for (i = 0; i < dcb->entries; i++) ++ for (i = 0; i < dcb->entries; i++) { + if (dcb->entry[i].i2c_index == LEGACY_I2C_CRT) + dcb->entry[i].i2c_index = bios->legacy.i2c_indices.crt; ++ if (dcb->entry[i].i2c_index == LEGACY_I2C_PANEL) ++ dcb->entry[i].i2c_index = bios->legacy.i2c_indices.panel; ++ } +} + +static int load_nv17_hwsq_ucode_entry(struct drm_device *dev, struct nvbios *bios, uint16_t hwsq_offset, int entry) @@ -4942,10 +5166,8 @@ index 0000000..fd3e08a + struct nvbios *bios = &dev_priv->VBIOS; + int ret = 0; + -+ NV_ERROR(dev, "FIXME twoHeads\n"); -+ + NVLockVgaCrtcs(dev, false); -+ if (1) //dev->twoHeads) ++ if (nv_two_heads(dev)) + NVSetOwner(dev, crtchead); + + if (bios->major_version < 5) /* BMP only */ @@ -4977,7 +5199,7 @@ index 0000000..fd3e08a + return -ENODEV; + if ((ret = nouveau_parse_vbios_struct(dev))) + return ret; -+ if ((ret = parse_dcb_table(dev, bios))) ++ if ((ret = parse_dcb_table(dev, bios, nv_two_heads(dev)))) + return ret; + fixup_legacy_i2c(bios); + @@ -5007,10 +5229,10 @@ index 0000000..fd3e08a +} diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h new file mode 100644 -index 0000000..03445b3 +index 0000000..b7e0f32 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h -@@ -0,0 +1,209 @@ +@@ -0,0 +1,223 @@ +/* + * Copyright 2007-2008 Nouveau Project + * @@ -5137,7 +5359,16 @@ index 0000000..03445b3 + uint8_t max_n; + } vco1, vco2; + -+ uint8_t max_log2p_bias; ++ uint8_t max_log2p; ++ /* ++ * for most pre nv50 cards setting a log2P of 7 (the common max_log2p ++ * value) is no different to 6 (at least for vplls) so allowing the MNP ++ * calc to use 7 causes the generated clock to be out by a factor of 2. ++ * however, max_log2p cannot be fixed-up during parsing as the ++ * unmodified max_log2p value is still needed for setting mplls, hence ++ * an additional max_usable_log2p member ++ */ ++ uint8_t max_usable_log2p; + uint8_t log2p_bias; + int refclk; +}; @@ -5181,6 +5412,11 @@ index 0000000..03445b3 + struct bios_parsed_dcb bdcb; + + struct { ++ int head; ++ uint16_t script_table_ptr; ++ } display; ++ ++ struct { + uint16_t fptablepointer; /* also used by tmds */ + uint16_t fpxlatetableptr; + int xlatwidth; @@ -5643,10 +5879,10 @@ index 0000000..0f80857 +}; diff --git a/drivers/gpu/drm/nouveau/nouveau_calc.c b/drivers/gpu/drm/nouveau/nouveau_calc.c new file mode 100644 -index 0000000..1f5fcd5 +index 0000000..a319ad4 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_calc.c -@@ -0,0 +1,627 @@ +@@ -0,0 +1,622 @@ +/* + * Copyright 1993-2003 NVIDIA, Corporation + * Copyright 2007-2009 Stuart Bennett @@ -5987,7 +6223,6 @@ index 0000000..1f5fcd5 +nv4_10UpdateArbitrationSettings(struct drm_device *dev, int VClk, int bpp, + int *burst, int *lwm) +{ -+ struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nv_fifo_info fifo_data; + struct nv_sim_state sim_data; + int MClk = nouveau_hw_get_clock(dev, MPLL); @@ -6011,14 +6246,14 @@ index 0000000..1f5fcd5 + sim_data.mem_latency = 3; + sim_data.mem_page_miss = 10; + } else { -+ sim_data.enable_video = (dev_priv->card_type != NV_04); ++ sim_data.enable_video = (nv_arch(dev) != NV_04); + sim_data.memory_type = nvReadFB(dev, NV_PFB_CFG0) & 0x1; + sim_data.memory_width = (nvReadEXTDEV(dev, NV_PEXTDEV_BOOT_0) & 0x10) ? 128 : 64; + sim_data.mem_latency = cfg1 & 0xf; + sim_data.mem_page_miss = ((cfg1 >> 4) & 0xf) + ((cfg1 >> 31) & 0x1); + } + -+ if (dev_priv->card_type == NV_04) ++ if (nv_arch(dev) == NV_04) + nv4CalcArbitration(&fifo_data, &sim_data); + else + nv10CalcArbitration(&fifo_data, &sim_data); @@ -6051,9 +6286,7 @@ index 0000000..1f5fcd5 +void +nouveau_calc_arb(struct drm_device *dev, int vclk, int bpp, int *burst, int *lwm) +{ -+ struct drm_nouveau_private *dev_priv = dev->dev_private; -+ -+ if (dev_priv->card_type < NV_30) ++ if (nv_arch(dev) < NV_30) + nv4_10UpdateArbitrationSettings(dev, vclk, bpp, burst, lwm); + else if ((dev->pci_device & 0xfff0) == 0x0240 /*CHIPSET_C51*/ || + (dev->pci_device & 0xfff0) == 0x03d0 /*CHIPSET_C512*/) { @@ -6076,12 +6309,12 @@ index 0000000..1f5fcd5 + * returns calculated clock + */ + struct drm_nouveau_private *dev_priv = dev->dev_private; -+ int chip_version = dev_priv->vbios->chip_version; ++ int cv = dev_priv->vbios->chip_version; + int minvco = pll_lim->vco1.minfreq, maxvco = pll_lim->vco1.maxfreq; + int minM = pll_lim->vco1.min_m, maxM = pll_lim->vco1.max_m; + int minN = pll_lim->vco1.min_n, maxN = pll_lim->vco1.max_n; + int minU = pll_lim->vco1.min_inputfreq, maxU = pll_lim->vco1.max_inputfreq; -+ int maxlog2P; ++ int maxlog2P = pll_lim->max_usable_log2p; + int crystal = pll_lim->refclk; + int M, N, log2P, P; + int clkP, calcclk; @@ -6090,22 +6323,19 @@ index 0000000..1f5fcd5 + + /* this division verified for nv20, nv18, nv28 (Haiku), and nv34 */ + /* possibly correlated with introduction of 27MHz crystal */ -+ if (chip_version <= 0x16 || chip_version == 0x20) { ++ if (cv < 0x17 || cv == 0x1a || cv == 0x20) { + if (clk > 250000) + maxM = 6; + if (clk > 340000) + maxM = 2; -+ maxlog2P = 4; -+ } else if (chip_version < 0x40) { ++ } else if (cv < 0x40) { + if (clk > 150000) + maxM = 6; + if (clk > 200000) + maxM = 4; + if (clk > 340000) + maxM = 2; -+ maxlog2P = 5; -+ } else /* nv4x may be subject to the nv17+ limits, but assume not for now */ -+ maxlog2P = 6; ++ } + + if ((clk << maxlog2P) < minvco) { + minvco = clk << maxlog2P; @@ -6181,6 +6411,7 @@ index 0000000..1f5fcd5 + int minN1 = pll_lim->vco1.min_n, maxN1 = pll_lim->vco1.max_n; + int minM2 = pll_lim->vco2.min_m, maxM2 = pll_lim->vco2.max_m; + int minN2 = pll_lim->vco2.min_n, maxN2 = pll_lim->vco2.max_n; ++ int maxlog2P = pll_lim->max_usable_log2p; + int crystal = pll_lim->refclk; + bool fixedgain2 = (minM2 == maxM2 && minN2 == maxN2); + int M1, N1, M2, N2, log2P; @@ -6189,7 +6420,7 @@ index 0000000..1f5fcd5 + int bestclk = 0; + + int vco2 = (maxvco2 - maxvco2/200) / 2; -+ for (log2P = 0; clk && log2P < 6 && clk <= (vco2 >> log2P); log2P++) /* log2P is maximum of 6 */ ++ for (log2P = 0; clk && log2P < maxlog2P && clk <= (vco2 >> log2P); log2P++) + ; + clkP = clk << log2P; + @@ -6276,10 +6507,10 @@ index 0000000..1f5fcd5 +} diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h new file mode 100644 -index 0000000..9c78c88 +index 0000000..052d9aa --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_connector.h -@@ -0,0 +1,52 @@ +@@ -0,0 +1,51 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -6317,7 +6548,6 @@ index 0000000..9c78c88 + struct drm_display_mode *native_mode; + bool digital; + -+ int bus; + struct nouveau_i2c_chan *i2c_chan; + + int scaling_mode; @@ -6328,7 +6558,7 @@ index 0000000..9c78c88 +}; +#define to_nouveau_connector(x) container_of((x), struct nouveau_connector, base) + -+int nv50_connector_create(struct drm_device *dev, int bus, int i2c_index, int type); ++int nv50_connector_create(struct drm_device *dev, int i2c_index, int type); +void nv50_connector_detect_all(struct drm_device *dev); + +#endif /* __NOUVEAU_CONNECTOR_H__ */ @@ -7058,10 +7288,10 @@ index 0000000..f497aae +MODULE_LICENSE("GPL and additional rights"); diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h new file mode 100644 -index 0000000..7d2da72 +index 0000000..13d6f9d --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h -@@ -0,0 +1,776 @@ +@@ -0,0 +1,834 @@ +/* + * Copyright 2005 Stephane Marchesin. + * All Rights Reserved. @@ -7608,6 +7838,9 @@ index 0000000..7d2da72 +extern int nouveau_parse_bios(struct drm_device *); +extern int get_pll_limits(struct drm_device *, uint32_t limit_match, + struct pll_lims *); ++extern int nouveau_bios_run_display_table(struct drm_device *, ++ struct dcb_entry *, int pxclk); ++bool nouveau_bios_fp_mode(struct drm_device *, struct drm_display_mode *); + +/* nv04_fb.c */ +extern int nv04_fb_init(struct drm_device *); @@ -7837,10 +8070,65 @@ index 0000000..7d2da72 +#define NV_TRACE(d, fmt, arg...) NV_PRINTK(KERN_INFO, d, fmt, ##arg) +#define NV_WARN(d, fmt, arg...) NV_PRINTK(KERN_WARNING, d, fmt, ##arg) + ++static inline enum nouveau_card_type ++nv_arch(struct drm_device *dev) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ ++ switch (dev_priv->chipset & 0xf0) { ++ case 0x00: ++ return NV_04; ++ case 0x10: ++ return NV_10; ++ case 0x20: ++ return NV_20; ++ case 0x30: ++ return NV_30; ++ case 0x40: ++ case 0x60: ++ return NV_40; ++ case 0x50: ++ case 0x80: ++ case 0x90: ++ case 0xa0: ++ return NV_50; ++ default: ++ return NV_UNKNOWN; ++ } ++} ++ ++static inline bool ++nv_two_heads(struct drm_device *dev) ++{ ++ const int impl = dev->pci_device & 0x0ff0; ++ ++ if (nv_arch(dev) >= NV_10 && impl != 0x0100 && ++ impl != 0x0150 && impl != 0x01a0 && impl != 0x0200) ++ return true; ++ ++ return false; ++} ++ ++static inline bool ++nv_gf4_disp_arch(struct drm_device *dev) ++{ ++ return nv_two_heads(dev) && (dev->pci_device & 0x0ff0) != 0x0110; ++} ++ ++static inline bool ++nv_two_reg_pll(struct drm_device *dev) ++{ ++ const int impl = dev->pci_device & 0x0ff0; ++ ++ if (impl == 0x0310 || impl == 0x0340 || nv_arch(dev) >= NV_40) ++ return true; ++ return false; ++} ++ +#endif /* __NOUVEAU_DRV_H__ */ diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h new file mode 100644 -index 0000000..ea2b9dd +index 0000000..d9dc976 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h @@ -0,0 +1,46 @@ @@ -7876,7 +8164,7 @@ index 0000000..ea2b9dd +struct nouveau_encoder { + struct drm_encoder base; + -+ struct dcb_entry *dcb_entry; ++ struct dcb_entry *dcb; + int or; + + bool dual_link; @@ -10513,10 +10801,10 @@ index 0000000..66e35dc + diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c b/drivers/gpu/drm/nouveau/nouveau_hw.c new file mode 100644 -index 0000000..bd11b69 +index 0000000..ca03e70 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_hw.c -@@ -0,0 +1,1041 @@ +@@ -0,0 +1,1019 @@ +/* + * Copyright 2006 Dave Airlie + * Copyright 2007 Maarten Maathuis @@ -10619,8 +10907,7 @@ index 0000000..bd11b69 +{ + unsigned char seq1; + -+ NV_ERROR(dev, "FIXME\n"); -+ if (1) //dev_priv->twoHeads) ++ if (nv_two_heads(dev)) + NVSetOwner(dev, head); + + seq1 = NVReadVgaSeq(dev, head, NV_VIO_SR_CLOCK_INDEX); @@ -10642,7 +10929,7 @@ index 0000000..bd11b69 +{ + int shift = -4; + -+ if (chip_version < 0x17 || chip_version == 0x20) ++ if (chip_version < 0x17 || chip_version == 0x1a || chip_version == 0x20) + return shift; + + switch (reg) { @@ -10839,8 +11126,8 @@ index 0000000..bd11b69 + return; + + Pval2 = pv->log2P + pll_lim.log2p_bias; -+ if (Pval2 > pll_lim.max_log2p_bias) -+ Pval2 = pll_lim.max_log2p_bias; ++ if (Pval2 > pll_lim.max_log2p) ++ Pval2 = pll_lim.max_log2p; + Pval |= 1 << 28 | Pval2 << 20; + + saved4600 = nvReadMC(dev, 0x4600); @@ -10907,11 +11194,9 @@ index 0000000..bd11b69 +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + -+ NV_ERROR(dev, "FIXME two_reg_pll\n"); -+ + /* to force parsing as single stage (i.e. nv40 vplls) pass pll2 as 0 */ + -+ /* log2P is & 0x7 as never more than 6, and nv30/35 only uses 3 bits */ ++ /* log2P is & 0x7 as never more than 7, and nv30/35 only uses 3 bits */ + pllvals->log2P = (pll1 >> 16) & 0x7; + pllvals->N2 = pllvals->M2 = 1; + @@ -10922,7 +11207,7 @@ index 0000000..bd11b69 + pllvals->NM2 = pll2 >> 16; + } else { + pllvals->NM1 = pll1 & 0xffff; -+ if (1/*dev_priv->two_reg_pll*/ && pll2 & NV31_RAMDAC_ENABLE_VCO2) ++ if (nv_two_reg_pll(dev) && pll2 & NV31_RAMDAC_ENABLE_VCO2) + pllvals->NM2 = pll2 & 0xffff; + else if (dev_priv->chipset == 0x30 || dev_priv->chipset == 0x35) { + pllvals->M1 &= 0xf; /* only 4 bits */ @@ -10939,7 +11224,6 @@ index 0000000..bd11b69 +nouveau_hw_get_pllvals(struct drm_device *dev, enum pll_types plltype, + struct nouveau_pll_vals *pllvals) +{ -+ struct drm_nouveau_private *dev_priv = dev->dev_private; + const uint32_t nv04_regs[MAX_PLL_TYPES] = { NV_PRAMDAC_NVPLL_COEFF, + NV_PRAMDAC_MPLL_COEFF, + NV_PRAMDAC_VPLL_COEFF, @@ -10954,7 +11238,7 @@ index 0000000..bd11b69 + + NV_ERROR(dev, "two_reg_pll\n"); + -+ if (dev_priv->card_type < NV_40) ++ if (nv_arch(dev) < NV_40) + reg1 = nv04_regs[plltype]; + else + reg1 = nv40_regs[plltype]; @@ -10969,7 +11253,7 @@ index 0000000..bd11b69 + pll2 = nvReadMC(dev, reg2); + } + -+ if (dev_priv->card_type == 0x40 && reg1 >= NV_PRAMDAC_VPLL_COEFF) { ++ if (nv_arch(dev) == 0x40 && reg1 >= NV_PRAMDAC_VPLL_COEFF) { + uint32_t ramdac580 = NVReadRAMDAC(dev, 0, NV_PRAMDAC_580); + + /* check whether vpll has been forced into single stage mode */ @@ -11046,7 +11330,7 @@ index 0000000..bd11b69 + + if (pv.M1 >= pll_lim.vco1.min_m && pv.M1 <= pll_lim.vco1.max_m && + pv.N1 >= pll_lim.vco1.min_n && pv.N1 <= pll_lim.vco1.max_n && -+ pv.log2P <= 4) /* log2P limit for NV11 */ ++ pv.log2P <= pll_lim.max_log2p) + return; + + NV_WARN(dev, "VPLL %d outwith limits, attempting to fix\n", head + 1); @@ -11054,7 +11338,7 @@ index 0000000..bd11b69 + /* set lowest clock within static limits */ + pv.M1 = pll_lim.vco1.max_m; + pv.N1 = pll_lim.vco1.min_n; -+ pv.log2P = 4; ++ pv.log2P = pll_lim.max_usable_log2p; + nouveau_hw_setpll(dev, pllreg, &pv); +} + @@ -11069,8 +11353,8 @@ index 0000000..bd11b69 + uint8_t misc, gr4, gr5, gr6, seq2, seq4; + int i; + -+ NV_ERROR(dev, "FIXME twoHeads, saved_vga_font\n"); -+ if (1) //dev_priv->twoHeads) ++ NV_ERROR(dev, "FIXME saved_vga_font\n"); ++ if (nv_two_heads(dev)) + NVSetOwner(dev, 0); + + NVSetEnablePalette(dev, 0, true); @@ -11081,7 +11365,7 @@ index 0000000..bd11b69 + return; + + NV_INFO(dev, "%sing VGA fonts\n", save ? "Sav" : "Restor"); -+ if (1) //dev_priv->twoHeads) ++ if (nv_two_heads(dev)) + NVBlankScreen(dev, 1, true); + NVBlankScreen(dev, 0, true); + @@ -11144,7 +11428,7 @@ index 0000000..bd11b69 + NVWriteVgaSeq(dev, 0, NV_VIO_SR_PLANE_MASK_INDEX, seq2); + NVWriteVgaSeq(dev, 0, NV_VIO_SR_MEM_MODE_INDEX, seq4); + -+ if (1) //dev_priv->twoHeads) ++ if (nv_two_heads(dev)) + NVBlankScreen(dev, 1, false); + NVBlankScreen(dev, 0, false); +} @@ -11175,53 +11459,52 @@ index 0000000..bd11b69 + struct nv04_crtc_reg * regp = &state->crtc_reg[head]; + int i; + -+ NV_ERROR(dev, "FIXME twoHeads\n"); ++ if (nv_arch(dev) >= NV_10) ++ regp->nv10_cursync = NVReadRAMDAC(dev, head, NV_RAMDAC_NV10_CURSYNC); + + nouveau_hw_get_pllvals(dev, head ? VPLL2 : VPLL1, ®p->pllvals); -+ if (1) //dev_priv->twoHeads) -+ state->sel_clk = NVReadRAMDAC(dev, 0, NV_PRAMDAC_SEL_CLK); + state->pllsel = NVReadRAMDAC(dev, 0, NV_PRAMDAC_PLL_COEFF_SELECT); ++ if (nv_two_heads(dev)) ++ state->sel_clk = NVReadRAMDAC(dev, 0, NV_PRAMDAC_SEL_CLK); ++ if (dev_priv->chipset == 0x11) ++ regp->dither = NVReadRAMDAC(dev, head, NV_RAMDAC_DITHER_NV11); + + regp->ramdac_gen_ctrl = NVReadRAMDAC(dev, head, NV_PRAMDAC_GENERAL_CONTROL); + -+ if (1) { //dev_priv->twoHeads) { -+ if (dev_priv->chipset >= 0x17) -+ regp->ramdac_630 = NVReadRAMDAC(dev, head, NV_PRAMDAC_630); -+ if (dev_priv->chipset >= 0x30) -+ regp->ramdac_634 = NVReadRAMDAC(dev, head, NV_PRAMDAC_634); -+ -+ regp->fp_control = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL); -+ regp->fp_debug_0 = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_0); -+ regp->fp_debug_1 = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_1); -+ regp->fp_debug_2 = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_2); ++ if (nv_gf4_disp_arch(dev)) ++ regp->ramdac_630 = NVReadRAMDAC(dev, head, NV_PRAMDAC_630); ++ if (dev_priv->chipset >= 0x30) ++ regp->ramdac_634 = NVReadRAMDAC(dev, head, NV_PRAMDAC_634); + -+ regp->ramdac_a20 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A20); -+ regp->ramdac_a24 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A24); -+ regp->ramdac_a34 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A34); ++ for (i = 0; i < 7; i++) { ++ uint32_t ramdac_reg = NV_PRAMDAC_FP_VDISPLAY_END + (i * 4); ++ regp->fp_vert_regs[i] = NVReadRAMDAC(dev, head, ramdac_reg); ++ regp->fp_horiz_regs[i] = NVReadRAMDAC(dev, head, ramdac_reg + 0x20); + } + -+ if (dev_priv->chipset == 0x11) { -+ regp->dither = NVReadRAMDAC(dev, head, NV_RAMDAC_DITHER_NV11); -+ } else if (1) { //dev_priv->twoHeads) { ++ if (nv_gf4_disp_arch(dev)) { + regp->dither = NVReadRAMDAC(dev, head, NV_RAMDAC_FP_DITHER); + for (i = 0; i < 3; i++) { + regp->dither_regs[i] = NVReadRAMDAC(dev, head, NV_PRAMDAC_850 + i * 4); + regp->dither_regs[i + 3] = NVReadRAMDAC(dev, head, NV_PRAMDAC_85C + i * 4); + } + } -+ if (dev_priv->card_type >= NV_10) -+ regp->nv10_cursync = NVReadRAMDAC(dev, head, NV_RAMDAC_NV10_CURSYNC); -+ -+ /* The regs below are 0 for non-flatpanels, so you can load and save them */ + -+ for (i = 0; i < 7; i++) { -+ uint32_t ramdac_reg = NV_PRAMDAC_FP_HDISPLAY_END + (i * 4); -+ regp->fp_horiz_regs[i] = NVReadRAMDAC(dev, head, ramdac_reg); ++ regp->fp_control = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL); ++ regp->fp_debug_0 = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_0); ++ if (!nv_gf4_disp_arch(dev) && head == 0) { ++ /* early chips don't allow access to PRAMDAC_TMDS_* without ++ * the head A FPCLK on (nv11 even locks up) */ ++ NVWriteRAMDAC(dev, 0, NV_PRAMDAC_FP_DEBUG_0, regp->fp_debug_0 & ++ ~NV_PRAMDAC_FP_DEBUG_0_PWRDOWN_FPCLK); + } ++ regp->fp_debug_1 = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_1); ++ regp->fp_debug_2 = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_2); + -+ for (i = 0; i < 7; i++) { -+ uint32_t ramdac_reg = NV_PRAMDAC_FP_VDISPLAY_END + (i * 4); -+ regp->fp_vert_regs[i] = NVReadRAMDAC(dev, head, ramdac_reg); ++ if (nv_arch(dev) == NV_40) { ++ regp->ramdac_a20 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A20); ++ regp->ramdac_a24 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A24); ++ regp->ramdac_a34 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A34); + } +} + @@ -11234,58 +11517,47 @@ index 0000000..bd11b69 + uint32_t pllreg = head ? NV_RAMDAC_VPLL2 : NV_PRAMDAC_VPLL_COEFF; + int i; + -+ NV_ERROR(dev, "FIXME twoHeads\n"); ++ if (nv_arch(dev) >= NV_10) ++ NVWriteRAMDAC(dev, head, NV_RAMDAC_NV10_CURSYNC, regp->nv10_cursync); + -+ /* This sequence is important, the NV28 is very sensitive in this area. */ -+ /* Keep pllsel last and sel_clk first. */ -+ if (1) //dev_priv->twoHeads) -+ NVWriteRAMDAC(dev, 0, NV_PRAMDAC_SEL_CLK, state->sel_clk); + nouveau_hw_setpll(dev, pllreg, ®p->pllvals); + NVWriteRAMDAC(dev, 0, NV_PRAMDAC_PLL_COEFF_SELECT, state->pllsel); ++ if (nv_two_heads(dev)) ++ NVWriteRAMDAC(dev, 0, NV_PRAMDAC_SEL_CLK, state->sel_clk); ++ if (dev_priv->chipset == 0x11) ++ NVWriteRAMDAC(dev, head, NV_RAMDAC_DITHER_NV11, regp->dither); + + NVWriteRAMDAC(dev, head, NV_PRAMDAC_GENERAL_CONTROL, regp->ramdac_gen_ctrl); + -+ if (1) { //dev_priv->twoHeads) { -+ if (dev_priv->chipset >= 0x17) -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_630, regp->ramdac_630); -+ if (dev_priv->chipset >= 0x30) -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_634, regp->ramdac_634); -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL, regp->fp_control); -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_0, regp->fp_debug_0); -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_1, regp->fp_debug_1); -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_2, regp->fp_debug_2); -+ if (dev_priv->chipset == 0x30) { /* For unknown purposes. */ -+ uint32_t reg890 = NVReadRAMDAC(dev, head, NV_PRAMDAC_890); -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_89C, reg890); -+ } ++ if (nv_gf4_disp_arch(dev)) ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_630, regp->ramdac_630); ++ if (dev_priv->chipset >= 0x30) ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_634, regp->ramdac_634); + -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_A20, regp->ramdac_a20); -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_A24, regp->ramdac_a24); -+ NVWriteRAMDAC(dev, head, NV_PRAMDAC_A34, regp->ramdac_a34); ++ for (i = 0; i < 7; i++) { ++ uint32_t ramdac_reg = NV_PRAMDAC_FP_VDISPLAY_END + (i * 4); ++ ++ NVWriteRAMDAC(dev, head, ramdac_reg, regp->fp_vert_regs[i]); ++ NVWriteRAMDAC(dev, head, ramdac_reg + 0x20, regp->fp_horiz_regs[i]); + } + -+ if (dev_priv->chipset == 0x11) -+ NVWriteRAMDAC(dev, head, NV_RAMDAC_DITHER_NV11, regp->dither); -+ else if (1) { //dev_priv->twoHeads) { ++ if (nv_gf4_disp_arch(dev)) { + NVWriteRAMDAC(dev, head, NV_RAMDAC_FP_DITHER, regp->dither); + for (i = 0; i < 3; i++) { + NVWriteRAMDAC(dev, head, NV_PRAMDAC_850 + i * 4, regp->dither_regs[i]); + NVWriteRAMDAC(dev, head, NV_PRAMDAC_85C + i * 4, regp->dither_regs[i + 3]); + } + } -+ if (dev_priv->card_type >= NV_10) -+ NVWriteRAMDAC(dev, head, NV_RAMDAC_NV10_CURSYNC, regp->nv10_cursync); -+ -+ /* The regs below are 0 for non-flatpanels, so you can load and save them */ + -+ for (i = 0; i < 7; i++) { -+ uint32_t ramdac_reg = NV_PRAMDAC_FP_HDISPLAY_END + (i * 4); -+ NVWriteRAMDAC(dev, head, ramdac_reg, regp->fp_horiz_regs[i]); -+ } ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL, regp->fp_control); ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_0, regp->fp_debug_0); ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_1, regp->fp_debug_1); ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_DEBUG_2, regp->fp_debug_2); + -+ for (i = 0; i < 7; i++) { -+ uint32_t ramdac_reg = NV_PRAMDAC_FP_VDISPLAY_END + (i * 4); -+ NVWriteRAMDAC(dev, head, ramdac_reg, regp->fp_vert_regs[i]); ++ if (nv_arch(dev) == NV_40) { ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_A20, regp->ramdac_a20); ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_A24, regp->ramdac_a24); ++ NVWriteRAMDAC(dev, head, NV_PRAMDAC_A34, regp->ramdac_a34); + } +} + @@ -11343,12 +11615,9 @@ index 0000000..bd11b69 +nv_save_state_ext(struct drm_device *dev, int head, + struct nv04_mode_state *state) +{ -+ struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nv04_crtc_reg * regp = &state->crtc_reg[head]; + int i; + -+ NV_ERROR(dev, "FIXME twoHeads\n"); -+ + rd_cio_state(dev, head, regp, NV_CIO_CRE_LCD__INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_RPC0_INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_RPC1_INDEX); @@ -11360,21 +11629,21 @@ index 0000000..bd11b69 + rd_cio_state(dev, head, regp, NV_CIO_CRE_FF_INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_FFLWM__INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_21); -+ if (dev_priv->card_type >= NV_30) ++ if (nv_arch(dev) >= NV_30) + rd_cio_state(dev, head, regp, NV_CIO_CRE_47); + rd_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR0_INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR1_INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR2_INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_ILACE__INDEX); + -+ if (dev_priv->card_type >= NV_10) { ++ if (nv_arch(dev) >= NV_10) { + regp->crtc_830 = NVReadCRTC(dev, head, NV_PCRTC_830); + regp->crtc_834 = NVReadCRTC(dev, head, NV_PCRTC_834); -+ if (dev_priv->card_type == NV_40) { ++ if (nv_arch(dev) == NV_40) { + regp->crtc_850 = NVReadCRTC(dev, head, NV_PCRTC_850); + regp->gpio_ext = NVReadCRTC(dev, head, NV_PCRTC_GPIO_EXT); + } -+ if (1) //dev_priv->twoHeads) ++ if (nv_two_heads(dev)) + regp->crtc_eng_ctrl = NVReadCRTC(dev, head, NV_PCRTC_ENGINE_CTRL); + regp->cursor_cfg = NVReadCRTC(dev, head, NV_PCRTC_CURSOR_CONFIG); + } @@ -11383,14 +11652,14 @@ index 0000000..bd11b69 + + rd_cio_state(dev, head, regp, NV_CIO_CRE_SCRATCH3__INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_SCRATCH4__INDEX); -+ if (dev_priv->card_type >= NV_10) { ++ if (nv_arch(dev) >= NV_10) { + rd_cio_state(dev, head, regp, NV_CIO_CRE_EBR_INDEX); + rd_cio_state(dev, head, regp, NV_CIO_CRE_CSB); + rd_cio_state(dev, head, regp, NV_CIO_CRE_4B); + rd_cio_state(dev, head, regp, NV_CIO_CRE_TVOUT_LATENCY); + } + /* NV11 and NV20 don't have this, they stop at 0x52. */ -+ if (dev_priv->chipset >= 0x17 && 1) { //dev_priv->twoHeads) { ++ if (nv_gf4_disp_arch(dev)) { + rd_cio_state(dev, head, regp, NV_CIO_CRE_53); + rd_cio_state(dev, head, regp, NV_CIO_CRE_54); + @@ -11414,10 +11683,8 @@ index 0000000..bd11b69 + struct nv04_crtc_reg * regp = &state->crtc_reg[head]; + int i; + -+ NV_ERROR(dev, "FIXME twoHeads\n"); -+ -+ if (dev_priv->card_type >= NV_10) { -+ if (1) //dev_priv->twoHeads) ++ if (nv_arch(dev) >= NV_10) { ++ if (nv_two_heads(dev)) + /* setting ENGINE_CTRL (EC) *must* come before + * CIO_CRE_LCD, as writing CRE_LCD sets bits 16 & 17 in + * EC that should not be overwritten by writing stale EC @@ -11434,16 +11701,15 @@ index 0000000..bd11b69 + nvWriteVIDEO(dev, NV_PVIDEO_UVPLANE_LIMIT(1), dev_priv->fb_available_size - 1); + nvWriteMC(dev, NV_PBUS_POWERCTRL_2, 0); + -+ wr_cio_state(dev, head, regp, NV_CIO_CRE_21); + NVWriteCRTC(dev, head, NV_PCRTC_CURSOR_CONFIG, regp->cursor_cfg); + NVWriteCRTC(dev, head, NV_PCRTC_830, regp->crtc_830); + NVWriteCRTC(dev, head, NV_PCRTC_834, regp->crtc_834); -+ if (dev_priv->card_type == NV_40) { ++ if (nv_arch(dev) == NV_40) { + NVWriteCRTC(dev, head, NV_PCRTC_850, regp->crtc_850); + NVWriteCRTC(dev, head, NV_PCRTC_GPIO_EXT, regp->gpio_ext); + } + -+ if (dev_priv->card_type == NV_40) { ++ if (nv_arch(dev) == NV_40) { + uint32_t reg900 = NVReadRAMDAC(dev, head, NV_PRAMDAC_900); + if (regp->crtc_cfg == NV_PCRTC_CONFIG_START_ADDRESS_HSYNC) + NVWriteRAMDAC(dev, head, NV_PRAMDAC_900, reg900 | 0x10000); @@ -11463,26 +11729,26 @@ index 0000000..bd11b69 + wr_cio_state(dev, head, regp, NV_CIO_CRE_ENH_INDEX); + wr_cio_state(dev, head, regp, NV_CIO_CRE_FF_INDEX); + wr_cio_state(dev, head, regp, NV_CIO_CRE_FFLWM__INDEX); -+ if (dev_priv->card_type >= NV_30) ++ if (nv_arch(dev) >= NV_30) + wr_cio_state(dev, head, regp, NV_CIO_CRE_47); + + wr_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR0_INDEX); + wr_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR1_INDEX); + wr_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR2_INDEX); -+ if (dev_priv->card_type == NV_40) ++ if (nv_arch(dev) == NV_40) + nv_fix_nv40_hw_cursor(dev, head); + wr_cio_state(dev, head, regp, NV_CIO_CRE_ILACE__INDEX); + + wr_cio_state(dev, head, regp, NV_CIO_CRE_SCRATCH3__INDEX); + wr_cio_state(dev, head, regp, NV_CIO_CRE_SCRATCH4__INDEX); -+ if (dev_priv->card_type >= NV_10) { ++ if (nv_arch(dev) >= NV_10) { + wr_cio_state(dev, head, regp, NV_CIO_CRE_EBR_INDEX); + wr_cio_state(dev, head, regp, NV_CIO_CRE_CSB); + wr_cio_state(dev, head, regp, NV_CIO_CRE_4B); + wr_cio_state(dev, head, regp, NV_CIO_CRE_TVOUT_LATENCY); + } + /* NV11 and NV20 stop at 0x52. */ -+ if (dev_priv->chipset >= 0x17 && 1) { //dev_priv->twoHeads) { ++ if (nv_gf4_disp_arch(dev)) { + wr_cio_state(dev, head, regp, NV_CIO_CRE_53); + wr_cio_state(dev, head, regp, NV_CIO_CRE_54); + @@ -11560,10 +11826,10 @@ index 0000000..bd11b69 +} diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.h b/drivers/gpu/drm/nouveau/nouveau_hw.h new file mode 100644 -index 0000000..74f5913 +index 0000000..03aa876 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_hw.h -@@ -0,0 +1,508 @@ +@@ -0,0 +1,530 @@ +/* + * Copyright 2008 Stuart Bennett + * @@ -11999,6 +12265,28 @@ index 0000000..74f5913 + return waslocked; +} + ++static inline void ++nv_lock_vga_crtc_shadow(struct drm_device *dev, int head, int lock) ++{ ++ /* shadow lock: connects 0x60?3d? regs to "real" 0x3d? regs ++ * bit7: unlocks HDT, HBS, HBE, HRS, HRE, HEB ++ * bit6: seems to have some effect on CR09 (double scan, VBS_9) ++ * bit5: unlocks HDE ++ * bit4: unlocks VDE ++ * bit3: unlocks VDT, OVL, VRS, ?VRE?, VBS, VBE, LSR, EBR ++ * bit2: same as bit 1 of 0x60?804 ++ * bit0: same as bit 0 of 0x60?804 ++ */ ++ ++ uint8_t cr21 = lock; ++ ++ if (lock < 0) ++ /* 0xfa is generic "unlock all" mask */ ++ cr21 = NVReadVgaCrtc(dev, head, NV_CIO_CRE_21) | 0xfa; ++ ++ NVWriteVgaCrtc(dev, head, NV_CIO_CRE_21, cr21); ++} ++ +/* renders the extended crtc regs (cr19+) on all crtcs impervious: + * immutable and unreadable + */ @@ -12074,10 +12362,10 @@ index 0000000..74f5913 +#endif /* __NOUVEAU_HW_H__ */ diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c new file mode 100644 -index 0000000..5cd2fbf +index 0000000..93cdc61 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c -@@ -0,0 +1,225 @@ +@@ -0,0 +1,222 @@ +/* + * Copyright 2009 Red Hat Inc. + * @@ -12275,7 +12563,6 @@ index 0000000..5cd2fbf +bool +nouveau_i2c_detect(struct nouveau_connector *connector) +{ -+ struct drm_device *dev = connector->base.dev; + /* kindly borrrowed from the intel driver, hope it works. */ + uint8_t out_buf[] = { 0x0, 0x0}; + uint8_t buf[2]; @@ -12299,8 +12586,6 @@ index 0000000..5cd2fbf + return false; + + ret = (i2c_transfer(&connector->i2c_chan->adapter, msgs, 2) == 2); -+ -+ NV_DEBUG(dev, "i2c_detect: bus=%d present=%d\n", connector->bus, ret); + return ret; +} diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h @@ -23550,10 +23835,10 @@ index 0000000..87c6213 +} diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c new file mode 100644 -index 0000000..bc43d4d +index 0000000..83fb192 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_connector.c -@@ -0,0 +1,536 @@ +@@ -0,0 +1,503 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -23591,49 +23876,6 @@ index 0000000..bc43d4d +#include "nv50_display.h" +#include "nv50_display_commands.h" + -+static struct drm_display_mode * -+nv50_connector_lvds_native_mode(struct drm_device *dev) -+{ -+ struct drm_display_mode *mode; -+ uint32_t output, tmp; -+ -+ output = nv_rd32(0x610050); -+ if ((output & 0x00000003) == 0x00000002) -+ output = 0x00000000; -+ else -+ if ((output & 0x00000300) == 0x00000200) -+ output = 0x000000540; -+ else { -+ NV_ERROR(dev, "Unable to determine LVDS head: 0x%08x\n", output); -+ return NULL; -+ } -+ -+ mode = drm_mode_create(dev); -+ if (!mode) -+ return NULL; -+ -+ mode->clock = nv_rd32(0x610ad4 + output) & 0x003fffff; -+ tmp = nv_rd32(0x610b4c + output); -+ mode->hdisplay = (tmp & 0x00003fff); -+ mode->vdisplay = (tmp & 0x3fff0000) >> 16; -+ tmp = nv_rd32(0x610afc + output); -+ mode->htotal = tmp & 0x3fff; -+ mode->vtotal = tmp >> 16; -+ tmp = nv_rd32(0x610ae8 + output); -+ mode->hsync_start = mode->htotal - (tmp & 0x3fff) - 1; -+ mode->vsync_start = mode->vtotal - (tmp >> 16) - 1; -+ tmp = nv_rd32(0x610b00 + output); -+ mode->hsync_end = mode->hsync_start + (tmp & 0x3fff) + 1; -+ mode->vsync_end = mode->vsync_start + (tmp >> 16) + 1; -+ mode->flags = 0; -+ mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER; -+ mode->vrefresh = drm_mode_vrefresh(mode); -+ -+ NV_DEBUG(dev, "Probed current LVDS mode:\n"); -+ drm_mode_debug_printmodeline(mode); -+ return mode; -+} -+ +static struct nouveau_encoder * +nv50_connector_to_encoder(struct nouveau_connector *connector, bool digital) +{ @@ -23641,6 +23883,7 @@ index 0000000..bc43d4d + struct drm_encoder *drm_encoder; + bool digital_possible = false; + bool analog_possible = false; ++ int i; + + switch (connector->base.connector_type) { + case DRM_MODE_CONNECTOR_VGA: @@ -23666,25 +23909,32 @@ index 0000000..bc43d4d + if (!digital_possible && digital) + return NULL; + -+ list_for_each_entry(drm_encoder, &dev->mode_config.encoder_list, head) { -+ struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder); ++ for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { ++ struct drm_mode_object *obj; ++ int id; ++ ++ id = connector->base.encoder_ids[i]; ++ if (!id) ++ break; + -+ if (connector->bus != encoder->dcb_entry->bus) ++ obj = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_ENCODER); ++ if (!obj) + continue; ++ drm_encoder = obj_to_encoder(obj); + + if (digital) { -+ switch (encoder->base.encoder_type) { ++ switch (drm_encoder->encoder_type) { + case DRM_MODE_ENCODER_TMDS: + case DRM_MODE_ENCODER_LVDS: -+ return encoder; ++ return to_nouveau_encoder(drm_encoder); + default: + break; + } + } else { -+ switch (encoder->base.encoder_type) { ++ switch (drm_encoder->encoder_type) { + case DRM_MODE_ENCODER_DAC: + case DRM_MODE_ENCODER_TVDAC: -+ return encoder; ++ return to_nouveau_encoder(drm_encoder); + default: + break; + } @@ -23750,7 +24000,7 @@ index 0000000..bc43d4d + struct drm_encoder_helper_funcs *helper = NULL; + + if (drm_connector->connector_type == DRM_MODE_CONNECTOR_LVDS) { -+ if (!connector->native_mode) { ++ if (!connector->native_mode && !nouveau_i2c_detect(connector)) { + NV_ERROR(dev, "No native mode for LVDS.\n"); + return connector_status_disconnected; + } @@ -23996,10 +24246,11 @@ index 0000000..bc43d4d + .set_property = nv50_connector_set_property +}; + -+int nv50_connector_create(struct drm_device *dev, int bus, int i2c_index, int type) ++int nv50_connector_create(struct drm_device *dev, int i2c_index, int type) +{ + struct nouveau_connector *connector = NULL; -+ int i; ++ struct drm_encoder *drm_encoder; ++ struct drm_display_mode native; + + NV_DEBUG(dev, "\n"); + @@ -24007,8 +24258,6 @@ index 0000000..bc43d4d + if (!connector) + return -ENOMEM; + -+ connector->bus = bus; -+ + switch (type) { + case DRM_MODE_CONNECTOR_VGA: + NV_INFO(dev, "Detected a VGA connector\n"); @@ -24020,8 +24269,10 @@ index 0000000..bc43d4d + NV_INFO(dev, "Detected a DVI-I connector\n"); + break; + case DRM_MODE_CONNECTOR_LVDS: -+ connector->native_mode = nv50_connector_lvds_native_mode(dev); + NV_INFO(dev, "Detected a LVDS connector\n"); ++ ++ if (nouveau_bios_fp_mode(dev, &native)) ++ connector->native_mode = drm_mode_duplicate(dev, &native); + break; + case DRM_MODE_CONNECTOR_SVIDEO: + NV_INFO(dev, "Detected a TV connector\n"); @@ -24077,13 +24328,14 @@ index 0000000..bc43d4d + + drm_connector_attach_property(&connector->base, dev->mode_config.dithering_mode_property, connector->use_dithering ? DRM_MODE_DITHERING_ON : DRM_MODE_DITHERING_OFF); + -+ /* attach encoders, possibilities are analog + digital */ -+ for (i = 0; i < 2; i++) { -+ struct nouveau_encoder *encoder = connector->to_encoder(connector, i); -+ if (!encoder) ++ /* attach encoders */ ++ list_for_each_entry(drm_encoder, &dev->mode_config.encoder_list, head) { ++ struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder); ++ ++ if (encoder->dcb->i2c_index != i2c_index) + continue; + -+ drm_mode_connector_attach_encoder(&connector->base, &encoder->base); ++ drm_mode_connector_attach_encoder(&connector->base, drm_encoder); + } + + drm_sysfs_connector_add(&connector->base); @@ -25055,7 +25307,7 @@ index 0000000..763cffe + diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c new file mode 100644 -index 0000000..2ac1c95 +index 0000000..e64c314 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_dac.c @@ -0,0 +1,280 @@ @@ -25323,7 +25575,7 @@ index 0000000..2ac1c95 + if (!encoder) + return -ENOMEM; + -+ encoder->dcb_entry = entry; ++ encoder->dcb = entry; + encoder->or = ffs(entry->or) - 1; + + /* Set function pointers. */ @@ -25341,10 +25593,10 @@ index 0000000..2ac1c95 + diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c new file mode 100644 -index 0000000..6abdad7 +index 0000000..67ad5f6 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_display.c -@@ -0,0 +1,433 @@ +@@ -0,0 +1,422 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -25571,8 +25823,7 @@ index 0000000..6abdad7 +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + struct parsed_dcb *dcb = dev_priv->vbios->dcb; -+ uint32_t bus_mask = 0; -+ uint32_t bus_digital = 0, bus_analog = 0; ++ uint32_t connector[16] = {}; + int ret, i; + + NV_DEBUG(dev, "\n"); @@ -25599,71 +25850,61 @@ index 0000000..6abdad7 + return ret; + + /* Create CRTC objects */ -+ for (i = 0; i < 2; i++) { ++ for (i = 0; i < 2; i++) + nv50_crtc_create(dev, i); -+ } + -+ /* we setup the outputs up from the BIOS table */ ++ /* We setup the encoders from the BIOS table */ + for (i = 0 ; i < dcb->entries; i++) { + struct dcb_entry *entry = &dcb->entry[i]; + + switch (entry->type) { + case OUTPUT_TMDS: + case OUTPUT_LVDS: -+ bus_digital |= (1 << entry->bus); + nv50_sor_create(dev, entry); + break; + case OUTPUT_ANALOG: -+ bus_analog |= (1 << entry->bus); + nv50_dac_create(dev, entry); + break; + default: + break; + } ++ ++ connector[entry->i2c_index] |= (1 << entry->type); + } + -+ /* setup the connectors based on the output tables. */ ++ /* Look at which encoders are attached to each i2c bus to ++ * determine which connectors are present. ++ */ + for (i = 0 ; i < dcb->entries; i++) { + struct dcb_entry *entry = &dcb->entry[i]; -+ int connector = 0; ++ uint16_t encoders; ++ int type; + -+ /* already done? */ -+ if (bus_mask & (1 << entry->bus)) -+ continue; ++ encoders = connector[entry->i2c_index]; ++ connector[entry->i2c_index] = 0; + -+ /* only do it for supported outputs */ -+ if (entry->type != OUTPUT_ANALOG && -+ entry->type != OUTPUT_TMDS && -+ entry->type != OUTPUT_LVDS) ++ /* already done? */ ++ if (!encoders) + continue; + -+ switch (entry->type) { -+ case OUTPUT_TMDS: -+ case OUTPUT_ANALOG: -+ if ((bus_digital & (1 << entry->bus)) && -+ (bus_analog & (1 << entry->bus))) -+ connector = DRM_MODE_CONNECTOR_DVII; -+ else -+ if (bus_digital & (1 << entry->bus)) -+ connector = DRM_MODE_CONNECTOR_DVID; ++ if (encoders & (1 << OUTPUT_TMDS)) { ++ if (encoders & (1 << OUTPUT_ANALOG)) ++ type = DRM_MODE_CONNECTOR_DVII; + else -+ if (bus_analog & (1 << entry->bus)) -+ connector = DRM_MODE_CONNECTOR_VGA; -+ break; -+ case OUTPUT_LVDS: -+ connector = DRM_MODE_CONNECTOR_LVDS; -+ break; -+ default: -+ connector = DRM_MODE_CONNECTOR_Unknown; -+ break; -+ } ++ type = DRM_MODE_CONNECTOR_DVID; ++ } else ++ if (encoders & (1 << OUTPUT_ANALOG)) { ++ type = DRM_MODE_CONNECTOR_VGA; ++ } else ++ if (encoders & (1 << OUTPUT_LVDS)) { ++ type = DRM_MODE_CONNECTOR_LVDS; ++ } else ++ type = DRM_MODE_CONNECTOR_Unknown; + -+ if (connector == DRM_MODE_CONNECTOR_Unknown) ++ if (type == DRM_MODE_CONNECTOR_Unknown) + continue; + -+ nv50_connector_create(dev, entry->bus, entry->i2c_index, -+ connector); -+ bus_mask |= (1 << entry->bus); ++ nv50_connector_create(dev, entry->i2c_index, type); + } + + ret = nv50_display_init(dev); @@ -48324,7 +48565,7 @@ index 0000000..6572f12 +} diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c new file mode 100644 -index 0000000..c913950 +index 0000000..b4b096e --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_sor.c @@ -0,0 +1,275 @@ @@ -48576,7 +48817,7 @@ index 0000000..c913950 + if (!encoder) + return -ENOMEM; + -+ encoder->dcb_entry = entry; ++ encoder->dcb = entry; + encoder->or = ffs(entry->or) - 1; + + encoder->dual_link = nouveau_duallink; @@ -48605,10 +48846,10 @@ index 0000000..c913950 +} diff --git a/drivers/gpu/drm/nouveau/nvreg.h b/drivers/gpu/drm/nouveau/nvreg.h new file mode 100644 -index 0000000..6f142b3 +index 0000000..9afacbb --- /dev/null +++ b/drivers/gpu/drm/nouveau/nvreg.h -@@ -0,0 +1,498 @@ +@@ -0,0 +1,495 @@ +/* $XConsortium: nvreg.h /main/2 1996/10/28 05:13:41 kaleb $ */ +/* + * Copyright 1996-1997 David J. McKay @@ -48858,7 +49099,7 @@ index 0000000..6f142b3 +# define NV_CIO_SR_UNLOCK_RW_VALUE 0x57 +# define NV_CIO_SR_LOCK_VALUE 0x99 +# define NV_CIO_CRE_FFLWM__INDEX 0x20 /* fifo low water mark */ -+# define NV_CIO_CRE_21 0x21 /* referred to by some .scp as `shadow lock' */ ++# define NV_CIO_CRE_21 0x21 /* vga shadow crtc lock */ +# define NV_CIO_CRE_LSR_INDEX 0x25 /* ? */ +# define NV_CIO_CRE_LSR_VDT_10 0:0 +# define NV_CIO_CRE_LSR_VDE_10 1:1 @@ -48908,7 +49149,7 @@ index 0000000..6f142b3 +# define NV_CIO_CRE_54 0x54 /* `fp_vtiming' according to Haiku */ +# define NV_CIO_CRE_57 0x57 /* index reg for cr58 */ +# define NV_CIO_CRE_58 0x58 /* data reg for cr57 */ -+# define NV_CIO_CRE_59 0x59 ++# define NV_CIO_CRE_59 0x59 /* related to on/off-chip-ness of digital outputs */ +# define NV_CIO_CRE_5B 0x5B /* newer colour saturation reg */ +# define NV_CIO_CRE_85 0x85 +# define NV_CIO_CRE_86 0x86 @@ -48998,6 +49239,7 @@ index 0000000..6f142b3 +# define NV_PRAMDAC_FP_DEBUG_0_YINTERP_BILINEAR (1 << 12) +# define NV_PRAMDAC_FP_DEBUG_0_XWEIGHT_ROUND (1 << 20) +# define NV_PRAMDAC_FP_DEBUG_0_YWEIGHT_ROUND (1 << 24) ++# define NV_PRAMDAC_FP_DEBUG_0_PWRDOWN_FPCLK (1 << 28) +#define NV_PRAMDAC_FP_DEBUG_1 0x00680884 +# define NV_PRAMDAC_FP_DEBUG_1_XSCALE_VALUE 11:0 +# define NV_PRAMDAC_FP_DEBUG_1_XSCALE_TESTMODE_ENABLE (1 << 12) @@ -49006,10 +49248,6 @@ index 0000000..6f142b3 +#define NV_PRAMDAC_FP_DEBUG_2 0x00680888 +#define NV_PRAMDAC_FP_DEBUG_3 0x0068088C + -+/* Some unknown regs, purely for NV30 it seems. */ -+#define NV_PRAMDAC_890 0x00680890 -+#define NV_PRAMDAC_89C 0x0068089C -+ +/* see NV_PRAMDAC_INDIR_TMDS in rules.xml */ +#define NV_PRAMDAC_FP_TMDS_CONTROL 0x006808b0 +# define NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE (1 << 16) @@ -49117,7 +49355,7 @@ index b940fdf..cfa6af4 100644 unifdef-y += via_drm.h +unifdef-y += nouveau_drm.h diff --git a/include/drm/drmP.h b/include/drm/drmP.h -index b61b0c6..5b7ce2d 100644 +index 04fbd1e..f2a6bff 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1583 retrieving revision 1.1584 diff -u -p -r1.1583 -r1.1584 --- kernel.spec 1 May 2009 20:40:05 -0000 1.1583 +++ kernel.spec 1 May 2009 23:45:22 -0000 1.1584 @@ -1966,6 +1966,11 @@ fi # and build. %changelog +* Sat May 02 2009 Ben Skeggs 2.6.29.2-122 +- drm-nouveau.patch: nv50 connector grouping fixes +- bios parser updates from ddx (nv50 panel mode from VBIOS table) +- pre-nv50 modesetting updates from ddx (in disabled codepath) + * Fri May 01 2009 Kyle McMartin 2.6.29.2-121 - More bluetooth fixes from 2.6.30-rc. - linux-2.6-v4l-dvb-fixes.patch: restore, accidently nuked. From petersen at fedoraproject.org Fri May 1 23:57:32 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Fri, 1 May 2009 23:57:32 +0000 (UTC) Subject: rpms/scim-bridge/devel .cvsignore, 1.32, 1.33 scim-bridge-0.4.15-hotkey-help.patch, 1.3, 1.4 scim-bridge.spec, 1.69, 1.70 sources, 1.32, 1.33 Message-ID: <20090501235732.D064B7011E@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/scim-bridge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12548 Modified Files: .cvsignore scim-bridge-0.4.15-hotkey-help.patch scim-bridge.spec sources Log Message: - update to 0.4.16 - recreate scim-bridge-0.4.15-hotkey-help.patch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- .cvsignore 29 Jan 2009 08:47:36 -0000 1.32 +++ .cvsignore 1 May 2009 23:57:02 -0000 1.33 @@ -1 +1 @@ -scim-bridge-0.4.15.2.tar.gz +scim-bridge-0.4.16.tar.gz scim-bridge-0.4.15-hotkey-help.patch: Index: scim-bridge-0.4.15-hotkey-help.patch =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge-0.4.15-hotkey-help.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- scim-bridge-0.4.15-hotkey-help.patch 29 Jan 2009 08:37:09 -0000 1.3 +++ scim-bridge-0.4.15-hotkey-help.patch 1 May 2009 23:57:02 -0000 1.4 @@ -1,7 +1,7 @@ -diff -up scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent.cpp ---- scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.1-hotkey-help 2008-02-24 10:08:43.000000000 +1000 -+++ scim-bridge-0.4.15/agent/scim-bridge-agent.cpp 2008-06-23 10:55:39.000000000 +1000 -@@ -529,6 +529,27 @@ void ScimBridgeAgentImpl::slot_reload_co +diff -up scim-bridge-0.4.16/agent/scim-bridge-agent.cpp.1-hotkey-help scim-bridge-0.4.16/agent/scim-bridge-agent.cpp +--- scim-bridge-0.4.16/agent/scim-bridge-agent.cpp.1-hotkey-help 2009-03-08 23:07:29.000000000 +1000 ++++ scim-bridge-0.4.16/agent/scim-bridge-agent.cpp 2009-05-02 09:49:03.000000000 +1000 +@@ -542,6 +542,27 @@ void ScimBridgeAgentImpl::slot_reload_co scim_global_config_flush (); scim_keyboard_layout = scim_get_default_keyboard_layout (); @@ -29,9 +29,9 @@ diff -up scim-bridge-0.4.15/agent/scim-b } -diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp ---- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help 2007-11-07 20:48:45.000000000 +1000 -+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp 2008-06-23 09:44:58.000000000 +1000 +diff -up scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp +--- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help 2009-02-04 00:36:14.000000000 +1000 ++++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp 2009-05-02 09:51:26.000000000 +1000 @@ -60,6 +60,8 @@ static unsigned int imengine_id = 0; static bool on_the_spot_enabled = true; @@ -41,7 +41,7 @@ diff -up scim-bridge-0.4.15/agent/scim-b /* Class definition */ class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext { -@@ -273,6 +275,12 @@ void ScimBridgeAgentIMContext::set_on_th +@@ -274,6 +276,12 @@ void ScimBridgeAgentIMContext::set_on_th } @@ -52,9 +52,9 @@ diff -up scim-bridge-0.4.15/agent/scim-b + + ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener): - client_listener (new_client_listener), imengine (NULL), enabled (false), preedit_mode (PREEDIT_ANY), + client_listener (new_client_listener), imengine (NULL), enabled (false), focused(false) ,preedit_mode (PREEDIT_ANY), preedit_shown (false), preedit_cursor_position (0) -@@ -915,9 +923,11 @@ void ScimBridgeAgentIMContextImpl::panel +@@ -923,9 +931,11 @@ void ScimBridgeAgentIMContextImpl::panel void ScimBridgeAgentIMContextImpl::panel_request_help () { @@ -69,9 +69,9 @@ diff -up scim-bridge-0.4.15/agent/scim-b IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ()); if (factory.null ()) factory = fallback_imengine_factory; -diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h ---- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.1-hotkey-help 2007-06-02 13:33:48.000000000 +1000 -+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h 2008-06-23 09:44:58.000000000 +1000 +diff -up scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h.1-hotkey-help scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h +--- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h.1-hotkey-help 2008-11-02 16:44:49.000000000 +1000 ++++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h 2009-05-02 09:49:03.000000000 +1000 @@ -130,6 +130,21 @@ class ScimBridgeAgentIMContext static void set_enabled_by_default (bool enabled); Index: scim-bridge.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- scim-bridge.spec 3 Mar 2009 14:27:46 -0000 1.69 +++ scim-bridge.spec 1 May 2009 23:57:02 -0000 1.70 @@ -5,8 +5,8 @@ Name: scim-bridge -Version: 0.4.15.2 -Release: 3%{?dist} +Version: 0.4.16 +Release: 1%{?dist} Summary: SCIM Bridge Gtk IM module Group: System Environment/Libraries @@ -76,7 +76,7 @@ This package provides the SCIM Bridge Qt %prep -%setup -q -n %{name}-0.4.15 +%setup -q %patch0 -p1 -b .0-fix-gdm %patch1 -p1 -b .1-hotkey-help %patch2 -p1 -b .2-bz461373 @@ -151,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 2 2009 Jens Petersen - 0.4.16-1 +- update to 0.4.16 +- recreate scim-bridge-0.4.15-hotkey-help.patch + * Tue Mar 03 2009 Caol??n McNamara - 0.4.15.2-3 - use -1 instead of EOF for ret of getopt_long Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- sources 29 Jan 2009 08:47:36 -0000 1.32 +++ sources 1 May 2009 23:57:02 -0000 1.33 @@ -1 +1 @@ -9b401f68bbb6e4eb70cc043b52a75592 scim-bridge-0.4.15.2.tar.gz +0011b178c4a0d2b0de26e7a14545323c scim-bridge-0.4.16.tar.gz From petersen at fedoraproject.org Sat May 2 00:06:21 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Sat, 2 May 2009 00:06:21 +0000 (UTC) Subject: rpms/scim-input-pad/devel .cvsignore, 1.2, 1.3 scim-input-pad.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <20090502000621.8514A70120@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/scim-input-pad/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13459 Modified Files: .cvsignore scim-input-pad.spec sources Log Message: update to 0.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim-input-pad/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 12 Feb 2006 00:37:15 -0000 1.2 +++ .cvsignore 2 May 2009 00:05:51 -0000 1.3 @@ -1 +1 @@ -scim-input-pad-rpath.patch +scim-input-pad-0.1.2.tar.gz Index: scim-input-pad.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-input-pad/devel/scim-input-pad.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- scim-input-pad.spec 25 Feb 2009 23:10:52 -0000 1.12 +++ scim-input-pad.spec 2 May 2009 00:05:51 -0000 1.13 @@ -1,6 +1,6 @@ Name: scim-input-pad -Version: 0.1.1 -Release: 10%{?dist} +Version: 0.1.2 +Release: 1%{?dist} Summary: On-screen Input Pad for SCIM Group: System Environment/Libraries @@ -63,6 +63,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Sat May 2 2009 Jens Petersen - 0.1.2-1 +- update to 0.1.2 + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-input-pad/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 23 Dec 2005 10:19:52 -0000 1.3 +++ sources 2 May 2009 00:05:51 -0000 1.4 @@ -1 +1 @@ -45fc98fadcfdb8351478a2bc8e37b24f scim-input-pad-0.1.1.tar.gz +16d0b0373ec0d9c17d03e5605ad1a973 scim-input-pad-0.1.2.tar.gz From petersen at fedoraproject.org Sat May 2 00:15:15 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Sat, 2 May 2009 00:15:15 +0000 (UTC) Subject: rpms/scim-m17n/devel .cvsignore, 1.5, 1.6 scim-m17n.spec, 1.19, 1.20 sources, 1.5, 1.6 scim-m17n-0.2.2-gcc43.patch, 1.1, NONE Message-ID: <20090502001515.A56F670120@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/scim-m17n/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14939 Modified Files: .cvsignore scim-m17n.spec sources Removed Files: scim-m17n-0.2.2-gcc43.patch Log Message: - update to 0.2.3 - scim-m17n-0.2.2-gcc43.patch upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim-m17n/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 21 May 2007 04:57:37 -0000 1.5 +++ .cvsignore 2 May 2009 00:14:45 -0000 1.6 @@ -1 +1 @@ -scim-m17n-0.2.2.tar.gz +scim-m17n-0.2.3.tar.gz Index: scim-m17n.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-m17n/devel/scim-m17n.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- scim-m17n.spec 25 Feb 2009 23:11:50 -0000 1.19 +++ scim-m17n.spec 2 May 2009 00:14:45 -0000 1.20 @@ -1,13 +1,12 @@ Name: scim-m17n -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: SCIM IMEngine for m17n-lib Group: System Environment/Libraries License: GPLv2+ URL: http://www.scim-im.org/projects/imengines Source0: %{name}-%{version}.tar.gz -Patch0: scim-m17n-0.2.2-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: scim-devel, m17n-lib-devel Obsoletes: iiimf-le-unit <= 1:12.2 @@ -21,7 +20,6 @@ input of many languages using the input %prep %setup -q -%patch0 -p1 %patch1 -p1 -b .1-name-prefix @@ -49,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 2 2009 Jens Petersen - 0.2.3-1 +- update to 0.2.3 +- scim-m17n-0.2.2-gcc43.patch upstream + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-m17n/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 21 May 2007 04:57:37 -0000 1.5 +++ sources 2 May 2009 00:14:45 -0000 1.6 @@ -1 +1 @@ -17d43799d0df9838c1cd5886ea376105 scim-m17n-0.2.2.tar.gz +179a009b262e0aa0aba786f37e4345ed scim-m17n-0.2.3.tar.gz --- scim-m17n-0.2.2-gcc43.patch DELETED --- From petersen at fedoraproject.org Sat May 2 00:19:19 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Sat, 2 May 2009 00:19:19 +0000 (UTC) Subject: rpms/scim-tables/devel .cvsignore, 1.10, 1.11 scim-tables.spec, 1.49, 1.50 sources, 1.10, 1.11 scim-tables-0.5.8-1.gcc.patch, 1.1, NONE Message-ID: <20090502001919.35EB470120@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/scim-tables/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15353 Modified Files: .cvsignore scim-tables.spec sources Removed Files: scim-tables-0.5.8-1.gcc.patch Log Message: - update to 0.5.9 - scim-tables-0.5.8-1.gcc.patch upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim-tables/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 4 Sep 2008 04:27:17 -0000 1.10 +++ .cvsignore 2 May 2009 00:18:48 -0000 1.11 @@ -1,2 +1,2 @@ -scim-tables-0.5.8.tar.gz CangJie5.png +scim-tables-0.5.9.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-tables/devel/scim-tables.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- scim-tables.spec 25 Feb 2009 23:18:48 -0000 1.49 +++ scim-tables.spec 2 May 2009 00:18:48 -0000 1.50 @@ -5,8 +5,8 @@ %define indic_tables 0 Name: scim-tables -Version: 0.5.8 -Release: 8%{?dist} +Version: 0.5.9 +Release: 1%{?dist} Summary: SCIM Generic Table IMEngine License: GPLv2+ @@ -26,7 +26,6 @@ BuildRequires: scim-devel, gtk2-devel Requires: scim Patch1: scim-tables-0.5.7-2.bz217639.patch Patch2: scim-tables-0.5.7-5.bz232860.patch -Patch3: scim-tables-0.5.8-1.gcc.patch %description This package contains the Generic Table IMEngine for SCIM. @@ -217,7 +216,6 @@ This package contains some miscellaneous %patch1 -p1 -b .1-217639 %patch2 -p1 -b .2-232860 -%patch3 -p1 -b .3-gcc %build @@ -462,6 +460,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 2 2009 Jens Petersen - 0.5.9-1 +- update to 0.5.9 +- scim-tables-0.5.8-1.gcc.patch upstream + * Wed Feb 25 2009 Fedora Release Engineering - 0.5.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-tables/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 4 Sep 2008 04:27:17 -0000 1.10 +++ sources 2 May 2009 00:18:48 -0000 1.11 @@ -1,2 +1,2 @@ -53ba0d00a71e467b5d009954cf56cb07 scim-tables-0.5.8.tar.gz 8895b0b0cb89f877eb712890684e63ac CangJie5.png +ef7d54966d0b07b1db49358213558065 scim-tables-0.5.9.tar.gz --- scim-tables-0.5.8-1.gcc.patch DELETED --- From petersen at fedoraproject.org Sat May 2 00:26:19 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Sat, 2 May 2009 00:26:19 +0000 (UTC) Subject: rpms/scim-input-pad/devel scim-input-pad.spec,1.13,1.14 Message-ID: <20090502002619.23F9270120@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/scim-input-pad/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15951 Modified Files: scim-input-pad.spec Log Message: buildrequire libtool Index: scim-input-pad.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-input-pad/devel/scim-input-pad.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- scim-input-pad.spec 2 May 2009 00:05:51 -0000 1.13 +++ scim-input-pad.spec 2 May 2009 00:25:48 -0000 1.14 @@ -14,7 +14,7 @@ Patch1: scim-input-pad-libexecdi BuildRequires: scim-devel # patch1 touches configure.ac -BuildRequires: autoconf +BuildRequires: autoconf, libtool Requires: scim %description @@ -65,6 +65,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * Sat May 2 2009 Jens Petersen - 0.1.2-1 - update to 0.1.2 +- buildrequire libtool * Wed Feb 25 2009 Fedora Release Engineering - 0.1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mclasen at fedoraproject.org Sat May 2 01:07:20 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Sat, 2 May 2009 01:07:20 +0000 (UTC) Subject: rpms/gnome-media/F-11 gvc-cramped-balance.patch, NONE, 1.1 gnome-media.spec, 1.171, 1.172 Message-ID: <20090502010720.36EC170120@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-media/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20074 Modified Files: gnome-media.spec Added Files: gvc-cramped-balance.patch Log Message: fix cramped appearance of balance slider gvc-cramped-balance.patch: --- NEW FILE gvc-cramped-balance.patch --- diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.cramped-balance gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c --- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.cramped-balance 2009-05-01 20:58:47.219163613 -0400 +++ gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c 2009-05-01 20:58:53.984379877 -0400 @@ -96,7 +96,7 @@ _scale_box_new (GvcBalanceBar *bar) gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (sbox), priv->scale, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0); str = g_strdup_printf ("%s", C_("balance", "Left")); gtk_scale_add_mark (GTK_SCALE (priv->scale), adjustment->lower , Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -p -r1.171 -r1.172 --- gnome-media.spec 1 May 2009 16:23:40 -0000 1.171 +++ gnome-media.spec 2 May 2009 01:06:49 -0000 1.172 @@ -14,7 +14,7 @@ Summary: GNOME media programs Name: gnome-media Version: 2.26.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and GFDL Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2 @@ -27,6 +27,8 @@ Patch5: 0001-Don-t-show-debug-output-wh # http://bugzilla.gnome.org/show_bug.cgi?id=581024 # https://bugzilla.redhat.com/show_bug.cgi?id=489049 Patch6: gvc-set-default-output-instant.patch +# fixed upstream +Patch7: gvc-cramped-balance.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome @@ -89,6 +91,7 @@ popd %patch4 -p1 -b .fix-alignment-of-sliders %patch5 -p1 -b .debug %patch6 -p1 -b .move-streams +%patch7 -p1 -b .cramped-balance %build # try to work around a problem where gst-inspect does @@ -262,6 +265,9 @@ scrollkeeper-update -q || : %{_libdir}/pkgconfig/* %changelog +* Fri May 1 2009 Matthias Clasen 2.26.0-6 +- Fix cramped appearance of the balance slider + * Fri May 01 2009 Bastien Nocera 2.26.0-5 - Move streams straight away when changing the default sink (#489049) From nbecker at fedoraproject.org Sat May 2 01:37:02 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Sat, 2 May 2009 01:37:02 +0000 (UTC) Subject: rpms/igraph/F-11 .cvsignore, 1.5, 1.6 igraph.spec, 1.25, 1.26 sources, 1.6, 1.7 Message-ID: <20090502013702.C05B670120@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/igraph/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23070 Modified Files: .cvsignore igraph.spec sources Log Message: Update to 0.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/igraph/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 16 Nov 2008 15:10:55 -0000 1.5 +++ .cvsignore 2 May 2009 01:36:32 -0000 1.6 @@ -1 +1 @@ -igraph-0.5.1.tar.gz +igraph-0.5.2.tar.gz Index: igraph.spec =================================================================== RCS file: /cvs/pkgs/rpms/igraph/F-11/igraph.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- igraph.spec 26 Feb 2009 19:31:04 -0000 1.25 +++ igraph.spec 2 May 2009 01:36:32 -0000 1.26 @@ -1,6 +1,6 @@ Name: igraph -Version: 0.5.1 -Release: 6%{?dist} +Version: 0.5.2 +Release: 2%{?dist} Summary: Library for creating and manipulating graphs Group: System Environment/Libraries @@ -10,10 +10,10 @@ Source0: http://igraph.googlecode.com/fi #Patch1: igraph-cstdlib.patch #Patch2: igraph-test.patch # Needed for gcc-4.4 -Patch3: igraph-cstdio.patch +#Patch3: igraph-cstdio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel, gmp-devel Requires(post): /sbin/install-info Requires(postun): /sbin/install-info Provides: %{name}-%{version} @@ -41,7 +41,7 @@ documentation needed to develop applicat %setup -q #%patch1 -p1 #%patch2 -p1 -%patch3 -p1 +#%patch3 -p1 %build %configure @@ -95,6 +95,13 @@ fi make check %changelog +* Tue Apr 28 2009 Neal Becker - 0.5.2-2 +- Try enable gmp, graphml + +* Mon Apr 27 2009 Neal Becker - 0.5.2-1 +- Update to 0.5.2 +- Try not applying patch #3 + * Thu Feb 26 2009 Neal Becker - 0.5.1-6 - Make that 0.5.1-6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/igraph/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 16 Nov 2008 15:10:56 -0000 1.6 +++ sources 2 May 2009 01:36:32 -0000 1.7 @@ -1 +1 @@ -19f9c193fc7c8b88a0e8d98aef9f9bb5 igraph-0.5.1.tar.gz +092fcd018d35da599e250990e9b64e6f igraph-0.5.2.tar.gz From petersen at fedoraproject.org Sat May 2 02:45:33 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Sat, 2 May 2009 02:45:33 +0000 (UTC) Subject: rpms/scim-tables/devel scim-tables.spec,1.50,1.51 Message-ID: <20090502024533.E69DB70120@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/scim-tables/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31569 Modified Files: scim-tables.spec Log Message: add RussianTraditional table Index: scim-tables.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-tables/devel/scim-tables.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- scim-tables.spec 2 May 2009 00:18:48 -0000 1.50 +++ scim-tables.spec 2 May 2009 02:45:03 -0000 1.51 @@ -411,8 +411,10 @@ rm -rf $RPM_BUILD_ROOT %files russian %defattr(-, root, root, -) +%{_datadir}/scim/tables/RussianTraditional.bin %{_datadir}/scim/tables/Yawerty.bin %{_datadir}/scim/tables/Translit.bin +%{_datadir}/scim/icons/RussianTraditional.png %{_datadir}/scim/icons/Yawerty.png @@ -463,6 +465,7 @@ rm -rf $RPM_BUILD_ROOT * Sat May 2 2009 Jens Petersen - 0.5.9-1 - update to 0.5.9 - scim-tables-0.5.8-1.gcc.patch upstream +- new RussianTraditional table * Wed Feb 25 2009 Fedora Release Engineering - 0.5.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cweyl at fedoraproject.org Sat May 2 03:52:53 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 03:52:53 +0000 (UTC) Subject: rpms/perl-Archive-RPM/devel import.log, NONE, 1.1 perl-Archive-RPM.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502035253.74AD370120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Archive-RPM/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5252/devel Modified Files: .cvsignore sources Added Files: import.log perl-Archive-RPM.spec Log Message: Initial import. --- NEW FILE import.log --- perl-Archive-RPM-0_04-1_fc10:HEAD:perl-Archive-RPM-0.04-1.fc10.src.rpm:1241236332 --- NEW FILE perl-Archive-RPM.spec --- Name: perl-Archive-RPM Version: 0.04 Release: 1%{?dist} # lib/Archive/RPM.pm -> LGPLv2+ # lib/Archive/RPM/ChangeLogEntry.pm -> LGPLv2+ License: LGPLv2+ Group: Development/Libraries Summary: Work with an RPM Source: http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/Archive-RPM-%{version}.tar.gz Url: http://search.cpan.org/dist/Archive-RPM BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch # non-perl BuildRequires: rpm, cpio Requires: rpm, cpio BuildRequires: perl(DateTime) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Moose) BuildRequires: perl(MooseX::AttributeHelpers) BuildRequires: perl(MooseX::Types::DateTime) BuildRequires: perl(MooseX::Types::Path::Class) BuildRequires: perl(namespace::clean) BuildRequires: perl(Path::Class) BuildRequires: perl(RPM2) >= 0.67 BuildRequires: perl(Test::More) %description Archive::RPM provides a more complete method of accessing an RPM's meta- and actual data. We access this information by leveraging RPM2 where we can, and by "exploding" the rpm with rpm2cpio and cpio when we need information we can't get through RPM2. %prep %setup -q -n Archive-RPM-%{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 {} ';' 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 %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun Apr 26 2009 Chris Weyl 0.04-1 - update to 0.04 * Sun Mar 08 2009 Chris Weyl 0.03-1 - submission * Sun Mar 08 2009 Chris Weyl 0.03-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 29 Apr 2009 03:11:19 -0000 1.1 +++ .cvsignore 2 May 2009 03:52:22 -0000 1.2 @@ -0,0 +1 @@ +Archive-RPM-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 29 Apr 2009 03:11:19 -0000 1.1 +++ sources 2 May 2009 03:52:22 -0000 1.2 @@ -0,0 +1 @@ +76fc498b7bccd562de871274a3a50d86 Archive-RPM-0.04.tar.gz From cweyl at fedoraproject.org Sat May 2 04:00:30 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 04:00:30 +0000 (UTC) Subject: rpms/perl-Archive-RPM/devel import.log,1.1,1.2 Message-ID: <20090502040030.CB9A870120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Archive-RPM/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6301/devel Modified Files: import.log Log Message: initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 2 May 2009 03:52:22 -0000 1.1 +++ import.log 2 May 2009 04:00:00 -0000 1.2 @@ -1 +1,2 @@ perl-Archive-RPM-0_04-1_fc10:HEAD:perl-Archive-RPM-0.04-1.fc10.src.rpm:1241236332 +perl-Archive-RPM-0_04-1_fc10:HEAD:perl-Archive-RPM-0.04-1.fc10.src.rpm:1241236789 From cweyl at fedoraproject.org Sat May 2 04:00:54 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 04:00:54 +0000 (UTC) Subject: rpms/perl-MooseX-Role-XMLRPC-Client/devel import.log, NONE, 1.1 perl-MooseX-Role-XMLRPC-Client.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502040054.235C870120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6524/devel Modified Files: .cvsignore sources Added Files: import.log perl-MooseX-Role-XMLRPC-Client.spec Log Message: initial import --- NEW FILE import.log --- perl-MooseX-Role-XMLRPC-Client-0_04-1_fc10:HEAD:perl-MooseX-Role-XMLRPC-Client-0.04-1.fc10.src.rpm:1241236816 --- NEW FILE perl-MooseX-Role-XMLRPC-Client.spec --- Name: perl-MooseX-Role-XMLRPC-Client Version: 0.04 Release: 1%{?dist} # lib/MooseX/Role/XMLRPC/Client.pm -> LGPLv2+ License: LGPLv2+ Group: Development/Libraries Summary: Provide the needed bits to be a XML-RPC client Source: http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/MooseX-Role-XMLRPC-Client-%{version}.tar.gz Url: http://search.cpan.org/dist/MooseX-Role-XMLRPC-Client 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) >= 6.42 BuildRequires: perl(HTTP::Cookies) BuildRequires: perl(MooseX::Role::Parameterized) >= 0.02 BuildRequires: perl(MooseX::Types) BuildRequires: perl(MooseX::Types::Path::Class) BuildRequires: perl(MooseX::Types::URI) BuildRequires: perl(namespace::clean) BuildRequires: perl(RPC::XML::Client) # tests BuildRequires: perl(Test::More) BuildRequires: perl(Crypt::SSLeay) # see RT#44197 BuildRequires: perl(CPAN) %description This is a Moose role that provides the methods and attributes needed to enable a class to serve as an XML-RPC client. It is parameterized through MooseX::Role::Parameterized, so you can customize how it embeds in your class. You can even embed it multiple times with different paramaterization, if it strikes your fancy :-) %prep %setup -q -n MooseX-Role-XMLRPC-Client-%{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 {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check %{?!_with_network_tests: NO_NET_TESTS=1} make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri May 01 2009 Chris Weyl 0.04-1 - update to 0.04 * Mon Apr 27 2009 Chris Weyl 0.03-1 - update to 0.03 - skip network tests - br on Crypt::SSLeay and CPAN (see RT#44197) * Sat Apr 25 2009 Chris Weyl 0.02-1 - submission * Sat Apr 25 2009 Chris Weyl 0.02-0 - update to 0.02 * Mon Apr 13 2009 Chris Weyl 0.01-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 29 Apr 2009 03:20:22 -0000 1.1 +++ .cvsignore 2 May 2009 04:00:23 -0000 1.2 @@ -0,0 +1 @@ +MooseX-Role-XMLRPC-Client-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 29 Apr 2009 03:20:22 -0000 1.1 +++ sources 2 May 2009 04:00:23 -0000 1.2 @@ -0,0 +1 @@ +8d0544049075ef56d07947417bedf289 MooseX-Role-XMLRPC-Client-0.04.tar.gz From cweyl at fedoraproject.org Sat May 2 04:01:51 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 04:01:51 +0000 (UTC) Subject: rpms/perl-MooseX-Role-XMLRPC-Client/F-10 import.log, NONE, 1.1 perl-MooseX-Role-XMLRPC-Client.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502040151.9D0C770120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7018/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-MooseX-Role-XMLRPC-Client.spec Log Message: initial import --- NEW FILE import.log --- perl-MooseX-Role-XMLRPC-Client-0_04-1_fc10:F-10:perl-MooseX-Role-XMLRPC-Client-0.04-1.fc10.src.rpm:1241236869 --- NEW FILE perl-MooseX-Role-XMLRPC-Client.spec --- Name: perl-MooseX-Role-XMLRPC-Client Version: 0.04 Release: 1%{?dist} # lib/MooseX/Role/XMLRPC/Client.pm -> LGPLv2+ License: LGPLv2+ Group: Development/Libraries Summary: Provide the needed bits to be a XML-RPC client Source: http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/MooseX-Role-XMLRPC-Client-%{version}.tar.gz Url: http://search.cpan.org/dist/MooseX-Role-XMLRPC-Client 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) >= 6.42 BuildRequires: perl(HTTP::Cookies) BuildRequires: perl(MooseX::Role::Parameterized) >= 0.02 BuildRequires: perl(MooseX::Types) BuildRequires: perl(MooseX::Types::Path::Class) BuildRequires: perl(MooseX::Types::URI) BuildRequires: perl(namespace::clean) BuildRequires: perl(RPC::XML::Client) # tests BuildRequires: perl(Test::More) BuildRequires: perl(Crypt::SSLeay) # see RT#44197 BuildRequires: perl(CPAN) %description This is a Moose role that provides the methods and attributes needed to enable a class to serve as an XML-RPC client. It is parameterized through MooseX::Role::Parameterized, so you can customize how it embeds in your class. You can even embed it multiple times with different paramaterization, if it strikes your fancy :-) %prep %setup -q -n MooseX-Role-XMLRPC-Client-%{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 {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check %{?!_with_network_tests: NO_NET_TESTS=1} make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri May 01 2009 Chris Weyl 0.04-1 - update to 0.04 * Mon Apr 27 2009 Chris Weyl 0.03-1 - update to 0.03 - skip network tests - br on Crypt::SSLeay and CPAN (see RT#44197) * Sat Apr 25 2009 Chris Weyl 0.02-1 - submission * Sat Apr 25 2009 Chris Weyl 0.02-0 - update to 0.02 * Mon Apr 13 2009 Chris Weyl 0.01-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 29 Apr 2009 03:20:22 -0000 1.1 +++ .cvsignore 2 May 2009 04:01:21 -0000 1.2 @@ -0,0 +1 @@ +MooseX-Role-XMLRPC-Client-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 29 Apr 2009 03:20:22 -0000 1.1 +++ sources 2 May 2009 04:01:21 -0000 1.2 @@ -0,0 +1 @@ +8d0544049075ef56d07947417bedf289 MooseX-Role-XMLRPC-Client-0.04.tar.gz From cweyl at fedoraproject.org Sat May 2 04:01:52 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 04:01:52 +0000 (UTC) Subject: rpms/perl-Archive-RPM/F-10 import.log, NONE, 1.1 perl-Archive-RPM.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502040152.9EF4370120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Archive-RPM/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7040/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-Archive-RPM.spec Log Message: initial import --- NEW FILE import.log --- perl-Archive-RPM-0_04-1_fc10:F-10:perl-Archive-RPM-0.04-1.fc10.src.rpm:1241236870 --- NEW FILE perl-Archive-RPM.spec --- Name: perl-Archive-RPM Version: 0.04 Release: 1%{?dist} # lib/Archive/RPM.pm -> LGPLv2+ # lib/Archive/RPM/ChangeLogEntry.pm -> LGPLv2+ License: LGPLv2+ Group: Development/Libraries Summary: Work with an RPM Source: http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/Archive-RPM-%{version}.tar.gz Url: http://search.cpan.org/dist/Archive-RPM BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch # non-perl BuildRequires: rpm, cpio Requires: rpm, cpio BuildRequires: perl(DateTime) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Moose) BuildRequires: perl(MooseX::AttributeHelpers) BuildRequires: perl(MooseX::Types::DateTime) BuildRequires: perl(MooseX::Types::Path::Class) BuildRequires: perl(namespace::clean) BuildRequires: perl(Path::Class) BuildRequires: perl(RPM2) >= 0.67 BuildRequires: perl(Test::More) %description Archive::RPM provides a more complete method of accessing an RPM's meta- and actual data. We access this information by leveraging RPM2 where we can, and by "exploding" the rpm with rpm2cpio and cpio when we need information we can't get through RPM2. %prep %setup -q -n Archive-RPM-%{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 {} ';' 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 %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun Apr 26 2009 Chris Weyl 0.04-1 - update to 0.04 * Sun Mar 08 2009 Chris Weyl 0.03-1 - submission * Sun Mar 08 2009 Chris Weyl 0.03-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 29 Apr 2009 03:11:19 -0000 1.1 +++ .cvsignore 2 May 2009 04:01:22 -0000 1.2 @@ -0,0 +1 @@ +Archive-RPM-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 29 Apr 2009 03:11:19 -0000 1.1 +++ sources 2 May 2009 04:01:22 -0000 1.2 @@ -0,0 +1 @@ +76fc498b7bccd562de871274a3a50d86 Archive-RPM-0.04.tar.gz From cweyl at fedoraproject.org Sat May 2 04:02:46 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 04:02:46 +0000 (UTC) Subject: rpms/perl-MooseX-Role-XMLRPC-Client/F-9 import.log, NONE, 1.1 perl-MooseX-Role-XMLRPC-Client.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502040246.7F5DF70120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7477/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-MooseX-Role-XMLRPC-Client.spec Log Message: initial import --- NEW FILE import.log --- perl-MooseX-Role-XMLRPC-Client-0_04-1_fc10:F-9:perl-MooseX-Role-XMLRPC-Client-0.04-1.fc10.src.rpm:1241236925 --- NEW FILE perl-MooseX-Role-XMLRPC-Client.spec --- Name: perl-MooseX-Role-XMLRPC-Client Version: 0.04 Release: 1%{?dist} # lib/MooseX/Role/XMLRPC/Client.pm -> LGPLv2+ License: LGPLv2+ Group: Development/Libraries Summary: Provide the needed bits to be a XML-RPC client Source: http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/MooseX-Role-XMLRPC-Client-%{version}.tar.gz Url: http://search.cpan.org/dist/MooseX-Role-XMLRPC-Client 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) >= 6.42 BuildRequires: perl(HTTP::Cookies) BuildRequires: perl(MooseX::Role::Parameterized) >= 0.02 BuildRequires: perl(MooseX::Types) BuildRequires: perl(MooseX::Types::Path::Class) BuildRequires: perl(MooseX::Types::URI) BuildRequires: perl(namespace::clean) BuildRequires: perl(RPC::XML::Client) # tests BuildRequires: perl(Test::More) BuildRequires: perl(Crypt::SSLeay) # see RT#44197 BuildRequires: perl(CPAN) %description This is a Moose role that provides the methods and attributes needed to enable a class to serve as an XML-RPC client. It is parameterized through MooseX::Role::Parameterized, so you can customize how it embeds in your class. You can even embed it multiple times with different paramaterization, if it strikes your fancy :-) %prep %setup -q -n MooseX-Role-XMLRPC-Client-%{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 {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check %{?!_with_network_tests: NO_NET_TESTS=1} make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri May 01 2009 Chris Weyl 0.04-1 - update to 0.04 * Mon Apr 27 2009 Chris Weyl 0.03-1 - update to 0.03 - skip network tests - br on Crypt::SSLeay and CPAN (see RT#44197) * Sat Apr 25 2009 Chris Weyl 0.02-1 - submission * Sat Apr 25 2009 Chris Weyl 0.02-0 - update to 0.02 * Mon Apr 13 2009 Chris Weyl 0.01-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 29 Apr 2009 03:20:22 -0000 1.1 +++ .cvsignore 2 May 2009 04:02:16 -0000 1.2 @@ -0,0 +1 @@ +MooseX-Role-XMLRPC-Client-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 29 Apr 2009 03:20:22 -0000 1.1 +++ sources 2 May 2009 04:02:16 -0000 1.2 @@ -0,0 +1 @@ +8d0544049075ef56d07947417bedf289 MooseX-Role-XMLRPC-Client-0.04.tar.gz From cweyl at fedoraproject.org Sat May 2 04:02:47 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 04:02:47 +0000 (UTC) Subject: rpms/perl-Archive-RPM/F-9 import.log, NONE, 1.1 perl-Archive-RPM.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502040247.ECF2370120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Archive-RPM/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7516/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Archive-RPM.spec Log Message: initial import --- NEW FILE import.log --- perl-Archive-RPM-0_04-1_fc10:F-9:perl-Archive-RPM-0.04-1.fc10.src.rpm:1241236928 --- NEW FILE perl-Archive-RPM.spec --- Name: perl-Archive-RPM Version: 0.04 Release: 1%{?dist} # lib/Archive/RPM.pm -> LGPLv2+ # lib/Archive/RPM/ChangeLogEntry.pm -> LGPLv2+ License: LGPLv2+ Group: Development/Libraries Summary: Work with an RPM Source: http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/Archive-RPM-%{version}.tar.gz Url: http://search.cpan.org/dist/Archive-RPM BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch # non-perl BuildRequires: rpm, cpio Requires: rpm, cpio BuildRequires: perl(DateTime) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Moose) BuildRequires: perl(MooseX::AttributeHelpers) BuildRequires: perl(MooseX::Types::DateTime) BuildRequires: perl(MooseX::Types::Path::Class) BuildRequires: perl(namespace::clean) BuildRequires: perl(Path::Class) BuildRequires: perl(RPM2) >= 0.67 BuildRequires: perl(Test::More) %description Archive::RPM provides a more complete method of accessing an RPM's meta- and actual data. We access this information by leveraging RPM2 where we can, and by "exploding" the rpm with rpm2cpio and cpio when we need information we can't get through RPM2. %prep %setup -q -n Archive-RPM-%{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 {} ';' 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 %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun Apr 26 2009 Chris Weyl 0.04-1 - update to 0.04 * Sun Mar 08 2009 Chris Weyl 0.03-1 - submission * Sun Mar 08 2009 Chris Weyl 0.03-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 29 Apr 2009 03:11:19 -0000 1.1 +++ .cvsignore 2 May 2009 04:02:17 -0000 1.2 @@ -0,0 +1 @@ +Archive-RPM-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 29 Apr 2009 03:11:19 -0000 1.1 +++ sources 2 May 2009 04:02:17 -0000 1.2 @@ -0,0 +1 @@ +76fc498b7bccd562de871274a3a50d86 Archive-RPM-0.04.tar.gz From cweyl at fedoraproject.org Sat May 2 04:05:52 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 04:05:52 +0000 (UTC) Subject: rpms/perl-MooseX-Role-XMLRPC-Client/F-11 import.log, NONE, 1.1 perl-MooseX-Role-XMLRPC-Client.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502040552.7515770120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8175/F-11 Modified Files: .cvsignore sources Added Files: import.log perl-MooseX-Role-XMLRPC-Client.spec Log Message: initial import --- NEW FILE import.log --- perl-MooseX-Role-XMLRPC-Client-0_04-1_fc10:F-11:perl-MooseX-Role-XMLRPC-Client-0.04-1.fc10.src.rpm:1241237111 --- NEW FILE perl-MooseX-Role-XMLRPC-Client.spec --- Name: perl-MooseX-Role-XMLRPC-Client Version: 0.04 Release: 1%{?dist} # lib/MooseX/Role/XMLRPC/Client.pm -> LGPLv2+ License: LGPLv2+ Group: Development/Libraries Summary: Provide the needed bits to be a XML-RPC client Source: http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/MooseX-Role-XMLRPC-Client-%{version}.tar.gz Url: http://search.cpan.org/dist/MooseX-Role-XMLRPC-Client 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) >= 6.42 BuildRequires: perl(HTTP::Cookies) BuildRequires: perl(MooseX::Role::Parameterized) >= 0.02 BuildRequires: perl(MooseX::Types) BuildRequires: perl(MooseX::Types::Path::Class) BuildRequires: perl(MooseX::Types::URI) BuildRequires: perl(namespace::clean) BuildRequires: perl(RPC::XML::Client) # tests BuildRequires: perl(Test::More) BuildRequires: perl(Crypt::SSLeay) # see RT#44197 BuildRequires: perl(CPAN) %description This is a Moose role that provides the methods and attributes needed to enable a class to serve as an XML-RPC client. It is parameterized through MooseX::Role::Parameterized, so you can customize how it embeds in your class. You can even embed it multiple times with different paramaterization, if it strikes your fancy :-) %prep %setup -q -n MooseX-Role-XMLRPC-Client-%{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 {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check %{?!_with_network_tests: NO_NET_TESTS=1} make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri May 01 2009 Chris Weyl 0.04-1 - update to 0.04 * Mon Apr 27 2009 Chris Weyl 0.03-1 - update to 0.03 - skip network tests - br on Crypt::SSLeay and CPAN (see RT#44197) * Sat Apr 25 2009 Chris Weyl 0.02-1 - submission * Sat Apr 25 2009 Chris Weyl 0.02-0 - update to 0.02 * Mon Apr 13 2009 Chris Weyl 0.01-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 29 Apr 2009 03:20:22 -0000 1.1 +++ .cvsignore 2 May 2009 04:05:22 -0000 1.2 @@ -0,0 +1 @@ +MooseX-Role-XMLRPC-Client-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Role-XMLRPC-Client/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 29 Apr 2009 03:20:22 -0000 1.1 +++ sources 2 May 2009 04:05:22 -0000 1.2 @@ -0,0 +1 @@ +8d0544049075ef56d07947417bedf289 MooseX-Role-XMLRPC-Client-0.04.tar.gz From cweyl at fedoraproject.org Sat May 2 04:07:17 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 2 May 2009 04:07:17 +0000 (UTC) Subject: rpms/perl-Archive-RPM/F-11 import.log, NONE, 1.1 perl-Archive-RPM.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502040717.59FBE70120@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Archive-RPM/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8630/F-11 Modified Files: .cvsignore sources Added Files: import.log perl-Archive-RPM.spec Log Message: initial import --- NEW FILE import.log --- perl-Archive-RPM-0_04-1_fc10:F-11:perl-Archive-RPM-0.04-1.fc10.src.rpm:1241237195 --- NEW FILE perl-Archive-RPM.spec --- Name: perl-Archive-RPM Version: 0.04 Release: 1%{?dist} # lib/Archive/RPM.pm -> LGPLv2+ # lib/Archive/RPM/ChangeLogEntry.pm -> LGPLv2+ License: LGPLv2+ Group: Development/Libraries Summary: Work with an RPM Source: http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/Archive-RPM-%{version}.tar.gz Url: http://search.cpan.org/dist/Archive-RPM BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch # non-perl BuildRequires: rpm, cpio Requires: rpm, cpio BuildRequires: perl(DateTime) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Moose) BuildRequires: perl(MooseX::AttributeHelpers) BuildRequires: perl(MooseX::Types::DateTime) BuildRequires: perl(MooseX::Types::Path::Class) BuildRequires: perl(namespace::clean) BuildRequires: perl(Path::Class) BuildRequires: perl(RPM2) >= 0.67 BuildRequires: perl(Test::More) %description Archive::RPM provides a more complete method of accessing an RPM's meta- and actual data. We access this information by leveraging RPM2 where we can, and by "exploding" the rpm with rpm2cpio and cpio when we need information we can't get through RPM2. %prep %setup -q -n Archive-RPM-%{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 {} ';' 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 %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun Apr 26 2009 Chris Weyl 0.04-1 - update to 0.04 * Sun Mar 08 2009 Chris Weyl 0.03-1 - submission * Sun Mar 08 2009 Chris Weyl 0.03-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 29 Apr 2009 03:11:19 -0000 1.1 +++ .cvsignore 2 May 2009 04:06:47 -0000 1.2 @@ -0,0 +1 @@ +Archive-RPM-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-RPM/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 29 Apr 2009 03:11:19 -0000 1.1 +++ sources 2 May 2009 04:06:47 -0000 1.2 @@ -0,0 +1 @@ +76fc498b7bccd562de871274a3a50d86 Archive-RPM-0.04.tar.gz From kyle at fedoraproject.org Sat May 2 04:42:07 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Sat, 2 May 2009 04:42:07 +0000 (UTC) Subject: rpms/kernel/F-11 kernel.spec,1.1584,1.1585 Message-ID: <20090502044207.79F4970120@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13482 Modified Files: kernel.spec Log Message: * Sat May 02 2009 Kyle McMartin 2.6.29.2-123 - Build htmldocs single threaded. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1584 retrieving revision 1.1585 diff -u -p -r1.1584 -r1.1585 --- kernel.spec 1 May 2009 23:45:22 -0000 1.1584 +++ kernel.spec 2 May 2009 04:41:37 -0000 1.1585 @@ -1683,7 +1683,8 @@ BuildKernel vmlinux vmlinux kdump vmlinu %if %{with_doc} # Make the HTML and man pages. -make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail} +make htmldocs || %{doc_build_fail} +make %{?_smp_mflags} mandocs || %{doc_build_fail} # sometimes non-world-readable files sneak into the kernel source tree chmod -R a=rX Documentation @@ -1966,6 +1967,9 @@ fi # and build. %changelog +* Sat May 02 2009 Kyle McMartin 2.6.29.2-123 +- Build htmldocs single threaded. + * Sat May 02 2009 Ben Skeggs 2.6.29.2-122 - drm-nouveau.patch: nv50 connector grouping fixes - bios parser updates from ddx (nv50 panel mode from VBIOS table) From mclasen at fedoraproject.org Sat May 2 05:02:05 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Sat, 2 May 2009 05:02:05 +0000 (UTC) Subject: rpms/gvfs/F-11 gvfs-1.2.2-really-hide.patch, NONE, 1.1 gvfs.spec, 1.126, 1.127 Message-ID: <20090502050205.48F6570120@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gvfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16117 Modified Files: gvfs.spec Added Files: gvfs-1.2.2-really-hide.patch Log Message: Really hide drives that are supposed to be hidden gvfs-1.2.2-really-hide.patch: --- NEW FILE gvfs-1.2.2-really-hide.patch --- diff -up gvfs-1.2.2/monitor/gdu/ggduvolumemonitor.c.really-hide gvfs-1.2.2/monitor/gdu/ggduvolumemonitor.c --- gvfs-1.2.2/monitor/gdu/ggduvolumemonitor.c.really-hide 2009-05-02 00:56:23.201705660 -0400 +++ gvfs-1.2.2/monitor/gdu/ggduvolumemonitor.c 2009-05-02 00:57:36.652379965 -0400 @@ -834,7 +834,10 @@ should_drive_be_ignored (GduPool *pool, } if (gdu_device_get_presentation_hide (device)) - goto out; + { + ignored = TRUE; + goto out; + } has_volumes = FALSE; all_volumes_are_ignored = TRUE; Index: gvfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gvfs/F-11/gvfs.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- gvfs.spec 15 Apr 2009 19:25:46 -0000 1.126 +++ gvfs.spec 2 May 2009 05:01:34 -0000 1.127 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -65,6 +65,9 @@ Patch111: gdu-0011-Bug-576083-pre-unmoun Patch112: gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch Patch113: gdu-0013-pass-the-flush-mount-option-for-vfat.patch +# upstream fix +Patch120: gvfs-1.2.2-really-hide.patch + %description The gvfs package provides backend implementations for the gio framework in GLib. It includes ftp, sftp, cifs. @@ -164,6 +167,8 @@ media players (Media Transfer Protocol) %patch112 -p1 -b .gdu-unwanted-devices %patch113 -p1 -b .gdu-vfat-flush +%patch120 -p1 -b .really-hide + %build # Needed for gvfs-0.2.1-archive-integration.patch @@ -306,6 +311,9 @@ update-desktop-database &> /dev/null ||: %changelog +* Sat May 2 2009 Matthias Clasen - 1.2.2-4 +- Really hide drives that are supposed to be hidden (#498649) + * Wed Apr 15 2009 David Zeuthen - 1.2.2-3 - Sync with the gdu-volume-monitor branch From iarnell at fedoraproject.org Sat May 2 05:52:25 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sat, 2 May 2009 05:52:25 +0000 (UTC) Subject: rpms/perl-Devel-REPL/devel .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <20090502055225.F0E1470120@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Devel-REPL/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22249 Modified Files: .cvsignore sources Log Message: initial import Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-REPL/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:03:01 -0000 1.1 +++ .cvsignore 2 May 2009 05:51:55 -0000 1.2 @@ -0,0 +1 @@ +Devel-REPL-1.003006.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-REPL/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:03:01 -0000 1.1 +++ sources 2 May 2009 05:51:55 -0000 1.2 @@ -0,0 +1 @@ +e052cac4b6d55eee9a0ced5a76b5a7be Devel-REPL-1.003006.tar.gz From iarnell at fedoraproject.org Sat May 2 05:53:41 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sat, 2 May 2009 05:53:41 +0000 (UTC) Subject: rpms/perl-Devel-REPL/devel perl-Devel-REPL.spec,NONE,1.1 Message-ID: <20090502055341.66E5870120@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Devel-REPL/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22521 Added Files: perl-Devel-REPL.spec Log Message: * Sat May 02 2009 Iain Arnell 1.003006-2 - remove BR perl --- NEW FILE perl-Devel-REPL.spec --- Name: perl-Devel-REPL Version: 1.003006 Release: 2%{?dist} Summary: Modern perl interactive shell License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Devel-REPL/ Source0: http://www.cpan.org/authors/id/O/OL/OLIVER/Devel-REPL-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::HomeDir) BuildRequires: perl(Moose) >= 0.74 BuildRequires: perl(MooseX::AttributeHelpers) >= 0.16 BuildRequires: perl(MooseX::Getopt) >= 0.18 BuildRequires: perl(MooseX::Object::Pluggable) >= 0.0009 BuildRequires: perl(namespace::clean) BuildRequires: perl(Task::Weaken) BuildRequires: perl(Test::More) # necessary for optional modules BuildRequires: perl(PPI) BuildRequires: perl(Data::Dump::Streamer) BuildRequires: perl(File::Next) BuildRequires: perl(B::Keywords) BuildRequires: perl(Lexical::Persistence) BuildRequires: perl(App::Nopaste) BuildRequires: perl(Module::Refresh) # undetected requires Requires: perl(App::Nopaste) Requires: perl(MooseX::Getopt) >= 0.18 Requires: perl(MooseX::Object::Pluggable) >= 0.0009 Requires: perl(Task::Weaken) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is an interactive shell for Perl, commonly known as a REPL - Read, Evaluate, Print, Loop. The shell provides for rapid development or testing of code without the need to create a temporary source code file. %prep %setup -q -n Devel-REPL-%{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 examples %{perl_vendorlib}/* %{_bindir}/* %{_mandir}/man3/* %changelog * Sat May 02 2009 Iain Arnell 1.003006-2 - remove BR perl * Sun Apr 19 2009 Iain Arnell 1.003006-1 - Specfile autogenerated by cpanspec 1.77. - add requires for optional modules From remi at fedoraproject.org Sat May 2 06:18:24 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sat, 2 May 2009 06:18:24 +0000 (UTC) Subject: rpms/libmemcached/devel libmemcached-hsieh.patch, NONE, 1.1 libmemcached.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502061824.66D1370120@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/libmemcached/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25236 Modified Files: .cvsignore sources Added Files: libmemcached-hsieh.patch libmemcached.spec Log Message: new package libmemcached-hsieh.patch: --- NEW FILE libmemcached-hsieh.patch --- # HG changeset patch # User Eric Lambert # Date 1241145108 25200 # Node ID 0fc2011585180b2fc78cdaea965cd46926d62e59 # Parent 7cca934315994b66cbbf4c5cec1651112498e026 Disable hsieh algorithm by default Per a conversation with Brian earlier this week, there are some licensing issues with the hsieh hashing algorithm that make it 'desirable' for support of this algorithm to be a compile time option. This patch turns off support for hsieh by default but allows it to be used when '--enable-hsieh_hash' is passed into configure. --- a/configure.ac Thu Apr 30 11:27:26 2009 -0700 +++ b/configure.ac Thu Apr 30 19:31:48 2009 -0700 @@ -64,6 +64,7 @@ sinclude(config/protocol_binary.m4) sinclude(config/memcached.m4) sinclude(config/setsockopt.m4) +sinclude(config/hsieh.m4) # We only support GCC and Sun's forte at the moment if test "$GCC" = "yes" --- a/docs/memcached_behavior.pod Thu Apr 30 11:27:26 2009 -0700 +++ b/docs/memcached_behavior.pod Thu Apr 30 19:31:48 2009 -0700 @@ -84,6 +84,7 @@ Makes the default hashing algorithm for keys use MD5. The value can be set to either MEMCACHED_HASH_DEFAULT, MEMCACHED_HASH_MD5, MEMCACHED_HASH_CRC, MEMCACHED_HASH_FNV1_64, MEMCACHED_HASH_FNV1A_64, MEMCACHED_HASH_FNV1_32, MEMCACHED_HASH_FNV1A_32, MEMCACHED_HASH_JENKINS, MEMCACHED_HASH_HSIEH, and MEMCACHED_HASH_MURMUR. Each hash has it's advantages and it's weaknesses. If you dont know or dont care, just go with the default. +Support for MEMCACHED_HASH_HSIEH is a compile time option that is disabled by default. To enable support for this hashing algorithm, configure and build libmemcached with the --enable-hash_hsieh. =item MEMCACHED_BEHAVIOR_DISTRIBUTION --- a/libmemcached/Makefile.am Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/Makefile.am Thu Apr 30 19:31:48 2009 -0700 @@ -29,7 +29,6 @@ lib_LTLIBRARIES = libmemcached.la libmemcached_la_SOURCES = crc.c \ - hsieh_hash.c \ memcached.c \ memcached_auto.c \ memcached_analyze.c \ @@ -62,6 +61,10 @@ murmur_hash.c \ jenkins_hash.c +if INCLUDE_HSIEH_SRC +libmemcached_la_SOURCES += hsieh_hash.c +endif + if BUILD_BYTEORDER libmemcached_la_SOURCES += byteorder.c endif --- a/libmemcached/common.h Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/common.h Thu Apr 30 19:31:48 2009 -0700 @@ -84,7 +84,9 @@ void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result); uint32_t hash_crc32(const char *data, size_t data_len); +#ifdef HAVE_HSIEH_HASH uint32_t hsieh_hash(const char *key, size_t key_length); +#endif uint32_t murmur_hash(const char *key, size_t key_length); uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval); --- a/libmemcached/memcached_behavior.c Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/memcached_behavior.c Thu Apr 30 19:31:48 2009 -0700 @@ -100,6 +100,10 @@ break; } case MEMCACHED_BEHAVIOR_HASH: +#ifndef HAVE_HSIEH_HASH + if ((memcached_hash)(data) == MEMCACHED_HASH_HSIEH) + return MEMCACHED_FAILURE; +#endif ptr->hash= (memcached_hash)(data); break; case MEMCACHED_BEHAVIOR_KETAMA_HASH: --- a/libmemcached/memcached_hash.c Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/memcached_hash.c Thu Apr 30 19:31:48 2009 -0700 @@ -74,11 +74,13 @@ } } break; +#ifdef HAVE_HSIEH_HASH case MEMCACHED_HASH_HSIEH: { hash= hsieh_hash(key, key_length); break; } +#endif case MEMCACHED_HASH_MURMUR: { hash= murmur_hash(key, key_length); --- a/tests/function.c Thu Apr 30 11:27:26 2009 -0700 +++ b/tests/function.c Thu Apr 30 19:31:48 2009 -0700 @@ -2856,9 +2856,12 @@ static memcached_return pre_hsieh(memcached_st *memc) { +#ifdef HAVE_HSIEH_HASH memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH); - return MEMCACHED_SUCCESS; +#else + return MEMCACHED_FAILURE; +#endif } static memcached_return pre_hash_fnv1_64(memcached_st *memc) @@ -3069,7 +3072,8 @@ memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT; memcached_hash hash; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value); - pre_hsieh(memc); + if (pre_hsieh(memc) != MEMCACHED_SUCCESS) + return MEMCACHED_FAILURE; value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT); @@ -3624,6 +3628,18 @@ return TEST_SUCCESS; } +test_return hsieh_avaibility_test (memcached_st *memc) +{ + memcached_return expected_rc= MEMCACHED_FAILURE; +#ifdef HAVE_HSIEH_HASH + expected_rc= MEMCACHED_SUCCESS; +#endif + memcached_return rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, + (uint64_t)MEMCACHED_HASH_HSIEH); + assert(rc == expected_rc); + return TEST_SUCCESS; +} + test_st udp_setup_server_tests[] ={ {"set_udp_behavior_test", 0, set_udp_behavior_test}, {"add_tcp_server_udp_client_test", 0, add_tcp_server_udp_client_test}, @@ -3795,7 +3811,13 @@ {0, 0, 0} }; +test_st hsieh_availability[] ={ + {"hsieh_avaibility_test",0,hsieh_avaibility_test}, + {0, 0, 0} +}; + collection_st collection[] ={ + {"hsieh_availability",0,0,hsieh_availability}, {"udp_setup", init_udp, 0, udp_setup_server_tests}, {"udp_io", init_udp, 0, upd_io_tests}, {"udp_binary_io", binary_init_udp, 0, upd_io_tests}, --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/hsieh.m4 Thu Apr 30 19:31:48 2009 -0700 @@ -0,0 +1,22 @@ +dnl --------------------------------------------------------------------------- +dnl Macro: HSIEH_HASH +dnl --------------------------------------------------------------------------- +AC_ARG_ENABLE(hsieh_hash, + [ --enable-hsieh_hash build with support for hsieh hashing.], + [ + if test "x$enableval" != "xno"; then + ENABLE_HSIEH="true" + AC_DEFINE([HAVE_HSIEH_HASH], [1], [Enables hsieh hashing support]) + else + ENABLE_HSIEH="false" + fi + ], + [ + ENABLE_HSIEH="false" + ] +) + +AM_CONDITIONAL([INCLUDE_HSIEH_SRC], [test "x$ENABLE_HSIEH" = "xtrue"]) +dnl --------------------------------------------------------------------------- +dnl End Macro: HSIEH_HASH +dnl --------------------------------------------------------------------------- --- NEW FILE libmemcached.spec --- Name: libmemcached Summary: Client library and command line tools for memcached server Version: 0.28 Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://tangent.org/552/libmemcached.html Source0: http://download.tangent.org/libmemcached-%{version}.tar.gz # Patch from upstream to disable hsieh hash (non free) # http://hg.tangent.org/libmemcached/rev/0fc201158518 Patch0: %{name}-hsieh.patch # Temporary for above patch BuildRequires: libtool # checked during configure (for test suite) BuildRequires: memcached BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description libmemcached is a C client library to the memcached server (http://danga.com/memcached). It has been designed to be light on memory usage, and provide full access to server side methods. It also implements several command line tools: memcat - Copy the value of a key to standard output. memflush - Flush the contents of your servers. memrm - Remove a key(s) from the server. memstat - Dump the stats of your servers to standard output. memslap - Generate testing loads on a memcached cluster. memcp - Copy files to memcached servers. memerror - Creates human readable messages from libmemcached error codes. %package devel Summary: Header files and development libraries for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the header files and development libraries for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q %patch0 -p1 %{__rm} -f libmemcached/hsieh_hash.c %{__mkdir} examples %{__cp} -p tests/*.{c,cpp,h} examples/ # Temporary because of patched .m4 files libtoolize --force aclocal automake --add-missing -Wno-portability autoconf autoheader %build %configure %{__make} %{_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS="" %check # For documentation only: # test suite cannot run in mock (same port use for memcache servers on all arch) # All tests completed successfully # diff output.res output.cmp fails but result depend on server version #%{__make} test %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr (-,root,root,-) %doc AUTHORS COPYING README THANKS TODO ChangeLog %{_bindir}/mem* %exclude %{_libdir}/libmemcached.a %exclude %{_libdir}/libmemcached.la %{_libdir}/libmemcached.so.* %{_mandir}/man1/mem* %files devel %defattr (-,root,root,-) %doc examples %{_includedir}/libmemcached %{_libdir}/libmemcached.so %{_libdir}/pkgconfig/libmemcached.pc %{_libdir}/libmemcached.so %{_mandir}/man3/libmemcached*.3.gz %{_mandir}/man3/memcached_*.3.gz %changelog * Fri May 01 2009 Remi Collet - 0.28-2 - add upstream patch to disable nonfree hsieh hash method * Sat Apr 25 2009 Remi Collet - 0.28-1 - Initial RPM from Brian Aker spec - create -devel subpackage - add %%post %%postun %%check section Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmemcached/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:58:20 -0000 1.1 +++ .cvsignore 2 May 2009 06:17:53 -0000 1.2 @@ -0,0 +1 @@ +libmemcached-0.28.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmemcached/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:58:20 -0000 1.1 +++ sources 2 May 2009 06:17:53 -0000 1.2 @@ -0,0 +1 @@ +7224e49fd4b0606f35b149ebb8c34e08 libmemcached-0.28.tar.gz From remi at fedoraproject.org Sat May 2 06:27:36 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sat, 2 May 2009 06:27:36 +0000 (UTC) Subject: rpms/libmemcached/F-11 libmemcached-hsieh.patch, NONE, 1.1 libmemcached.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090502062736.63F7F70120@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/libmemcached/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27138 Modified Files: sources Added Files: libmemcached-hsieh.patch libmemcached.spec Log Message: new package libmemcached-hsieh.patch: --- NEW FILE libmemcached-hsieh.patch --- # HG changeset patch # User Eric Lambert # Date 1241145108 25200 # Node ID 0fc2011585180b2fc78cdaea965cd46926d62e59 # Parent 7cca934315994b66cbbf4c5cec1651112498e026 Disable hsieh algorithm by default Per a conversation with Brian earlier this week, there are some licensing issues with the hsieh hashing algorithm that make it 'desirable' for support of this algorithm to be a compile time option. This patch turns off support for hsieh by default but allows it to be used when '--enable-hsieh_hash' is passed into configure. --- a/configure.ac Thu Apr 30 11:27:26 2009 -0700 +++ b/configure.ac Thu Apr 30 19:31:48 2009 -0700 @@ -64,6 +64,7 @@ sinclude(config/protocol_binary.m4) sinclude(config/memcached.m4) sinclude(config/setsockopt.m4) +sinclude(config/hsieh.m4) # We only support GCC and Sun's forte at the moment if test "$GCC" = "yes" --- a/docs/memcached_behavior.pod Thu Apr 30 11:27:26 2009 -0700 +++ b/docs/memcached_behavior.pod Thu Apr 30 19:31:48 2009 -0700 @@ -84,6 +84,7 @@ Makes the default hashing algorithm for keys use MD5. The value can be set to either MEMCACHED_HASH_DEFAULT, MEMCACHED_HASH_MD5, MEMCACHED_HASH_CRC, MEMCACHED_HASH_FNV1_64, MEMCACHED_HASH_FNV1A_64, MEMCACHED_HASH_FNV1_32, MEMCACHED_HASH_FNV1A_32, MEMCACHED_HASH_JENKINS, MEMCACHED_HASH_HSIEH, and MEMCACHED_HASH_MURMUR. Each hash has it's advantages and it's weaknesses. If you dont know or dont care, just go with the default. +Support for MEMCACHED_HASH_HSIEH is a compile time option that is disabled by default. To enable support for this hashing algorithm, configure and build libmemcached with the --enable-hash_hsieh. =item MEMCACHED_BEHAVIOR_DISTRIBUTION --- a/libmemcached/Makefile.am Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/Makefile.am Thu Apr 30 19:31:48 2009 -0700 @@ -29,7 +29,6 @@ lib_LTLIBRARIES = libmemcached.la libmemcached_la_SOURCES = crc.c \ - hsieh_hash.c \ memcached.c \ memcached_auto.c \ memcached_analyze.c \ @@ -62,6 +61,10 @@ murmur_hash.c \ jenkins_hash.c +if INCLUDE_HSIEH_SRC +libmemcached_la_SOURCES += hsieh_hash.c +endif + if BUILD_BYTEORDER libmemcached_la_SOURCES += byteorder.c endif --- a/libmemcached/common.h Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/common.h Thu Apr 30 19:31:48 2009 -0700 @@ -84,7 +84,9 @@ void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result); uint32_t hash_crc32(const char *data, size_t data_len); +#ifdef HAVE_HSIEH_HASH uint32_t hsieh_hash(const char *key, size_t key_length); +#endif uint32_t murmur_hash(const char *key, size_t key_length); uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval); --- a/libmemcached/memcached_behavior.c Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/memcached_behavior.c Thu Apr 30 19:31:48 2009 -0700 @@ -100,6 +100,10 @@ break; } case MEMCACHED_BEHAVIOR_HASH: +#ifndef HAVE_HSIEH_HASH + if ((memcached_hash)(data) == MEMCACHED_HASH_HSIEH) + return MEMCACHED_FAILURE; +#endif ptr->hash= (memcached_hash)(data); break; case MEMCACHED_BEHAVIOR_KETAMA_HASH: --- a/libmemcached/memcached_hash.c Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/memcached_hash.c Thu Apr 30 19:31:48 2009 -0700 @@ -74,11 +74,13 @@ } } break; +#ifdef HAVE_HSIEH_HASH case MEMCACHED_HASH_HSIEH: { hash= hsieh_hash(key, key_length); break; } +#endif case MEMCACHED_HASH_MURMUR: { hash= murmur_hash(key, key_length); --- a/tests/function.c Thu Apr 30 11:27:26 2009 -0700 +++ b/tests/function.c Thu Apr 30 19:31:48 2009 -0700 @@ -2856,9 +2856,12 @@ static memcached_return pre_hsieh(memcached_st *memc) { +#ifdef HAVE_HSIEH_HASH memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH); - return MEMCACHED_SUCCESS; +#else + return MEMCACHED_FAILURE; +#endif } static memcached_return pre_hash_fnv1_64(memcached_st *memc) @@ -3069,7 +3072,8 @@ memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT; memcached_hash hash; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value); - pre_hsieh(memc); + if (pre_hsieh(memc) != MEMCACHED_SUCCESS) + return MEMCACHED_FAILURE; value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT); @@ -3624,6 +3628,18 @@ return TEST_SUCCESS; } +test_return hsieh_avaibility_test (memcached_st *memc) +{ + memcached_return expected_rc= MEMCACHED_FAILURE; +#ifdef HAVE_HSIEH_HASH + expected_rc= MEMCACHED_SUCCESS; +#endif + memcached_return rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, + (uint64_t)MEMCACHED_HASH_HSIEH); + assert(rc == expected_rc); + return TEST_SUCCESS; +} + test_st udp_setup_server_tests[] ={ {"set_udp_behavior_test", 0, set_udp_behavior_test}, {"add_tcp_server_udp_client_test", 0, add_tcp_server_udp_client_test}, @@ -3795,7 +3811,13 @@ {0, 0, 0} }; +test_st hsieh_availability[] ={ + {"hsieh_avaibility_test",0,hsieh_avaibility_test}, + {0, 0, 0} +}; + collection_st collection[] ={ + {"hsieh_availability",0,0,hsieh_availability}, {"udp_setup", init_udp, 0, udp_setup_server_tests}, {"udp_io", init_udp, 0, upd_io_tests}, {"udp_binary_io", binary_init_udp, 0, upd_io_tests}, --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/hsieh.m4 Thu Apr 30 19:31:48 2009 -0700 @@ -0,0 +1,22 @@ +dnl --------------------------------------------------------------------------- +dnl Macro: HSIEH_HASH +dnl --------------------------------------------------------------------------- +AC_ARG_ENABLE(hsieh_hash, + [ --enable-hsieh_hash build with support for hsieh hashing.], + [ + if test "x$enableval" != "xno"; then + ENABLE_HSIEH="true" + AC_DEFINE([HAVE_HSIEH_HASH], [1], [Enables hsieh hashing support]) + else + ENABLE_HSIEH="false" + fi + ], + [ + ENABLE_HSIEH="false" + ] +) + +AM_CONDITIONAL([INCLUDE_HSIEH_SRC], [test "x$ENABLE_HSIEH" = "xtrue"]) +dnl --------------------------------------------------------------------------- +dnl End Macro: HSIEH_HASH +dnl --------------------------------------------------------------------------- --- NEW FILE libmemcached.spec --- Name: libmemcached Summary: Client library and command line tools for memcached server Version: 0.28 Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://tangent.org/552/libmemcached.html Source0: http://download.tangent.org/libmemcached-%{version}.tar.gz # Patch from upstream to disable hsieh hash (non free) # http://hg.tangent.org/libmemcached/rev/0fc201158518 Patch0: %{name}-hsieh.patch # Temporary for above patch BuildRequires: libtool # checked during configure (for test suite) BuildRequires: memcached BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description libmemcached is a C client library to the memcached server (http://danga.com/memcached). It has been designed to be light on memory usage, and provide full access to server side methods. It also implements several command line tools: memcat - Copy the value of a key to standard output. memflush - Flush the contents of your servers. memrm - Remove a key(s) from the server. memstat - Dump the stats of your servers to standard output. memslap - Generate testing loads on a memcached cluster. memcp - Copy files to memcached servers. memerror - Creates human readable messages from libmemcached error codes. %package devel Summary: Header files and development libraries for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the header files and development libraries for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q %patch0 -p1 %{__rm} -f libmemcached/hsieh_hash.c %{__mkdir} examples %{__cp} -p tests/*.{c,cpp,h} examples/ # Temporary because of patched .m4 files libtoolize --force aclocal automake --add-missing -Wno-portability autoconf autoheader %build %configure %{__make} %{_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS="" %check # For documentation only: # test suite cannot run in mock (same port use for memcache servers on all arch) # All tests completed successfully # diff output.res output.cmp fails but result depend on server version #%{__make} test %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr (-,root,root,-) %doc AUTHORS COPYING README THANKS TODO ChangeLog %{_bindir}/mem* %exclude %{_libdir}/libmemcached.a %exclude %{_libdir}/libmemcached.la %{_libdir}/libmemcached.so.* %{_mandir}/man1/mem* %files devel %defattr (-,root,root,-) %doc examples %{_includedir}/libmemcached %{_libdir}/libmemcached.so %{_libdir}/pkgconfig/libmemcached.pc %{_libdir}/libmemcached.so %{_mandir}/man3/libmemcached*.3.gz %{_mandir}/man3/memcached_*.3.gz %changelog * Fri May 01 2009 Remi Collet - 0.28-2 - add upstream patch to disable nonfree hsieh hash method * Sat Apr 25 2009 Remi Collet - 0.28-1 - Initial RPM from Brian Aker spec - create -devel subpackage - add %%post %%postun %%check section Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmemcached/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:58:20 -0000 1.1 +++ sources 2 May 2009 06:27:06 -0000 1.2 @@ -0,0 +1 @@ +7224e49fd4b0606f35b149ebb8c34e08 libmemcached-0.28.tar.gz From remi at fedoraproject.org Sat May 2 06:34:59 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sat, 2 May 2009 06:34:59 +0000 (UTC) Subject: rpms/libmemcached/F-10 libmemcached-hsieh.patch, NONE, 1.1 libmemcached.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090502063459.851F870120@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/libmemcached/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28119 Modified Files: sources Added Files: libmemcached-hsieh.patch libmemcached.spec Log Message: new package libmemcached-hsieh.patch: --- NEW FILE libmemcached-hsieh.patch --- # HG changeset patch # User Eric Lambert # Date 1241145108 25200 # Node ID 0fc2011585180b2fc78cdaea965cd46926d62e59 # Parent 7cca934315994b66cbbf4c5cec1651112498e026 Disable hsieh algorithm by default Per a conversation with Brian earlier this week, there are some licensing issues with the hsieh hashing algorithm that make it 'desirable' for support of this algorithm to be a compile time option. This patch turns off support for hsieh by default but allows it to be used when '--enable-hsieh_hash' is passed into configure. --- a/configure.ac Thu Apr 30 11:27:26 2009 -0700 +++ b/configure.ac Thu Apr 30 19:31:48 2009 -0700 @@ -64,6 +64,7 @@ sinclude(config/protocol_binary.m4) sinclude(config/memcached.m4) sinclude(config/setsockopt.m4) +sinclude(config/hsieh.m4) # We only support GCC and Sun's forte at the moment if test "$GCC" = "yes" --- a/docs/memcached_behavior.pod Thu Apr 30 11:27:26 2009 -0700 +++ b/docs/memcached_behavior.pod Thu Apr 30 19:31:48 2009 -0700 @@ -84,6 +84,7 @@ Makes the default hashing algorithm for keys use MD5. The value can be set to either MEMCACHED_HASH_DEFAULT, MEMCACHED_HASH_MD5, MEMCACHED_HASH_CRC, MEMCACHED_HASH_FNV1_64, MEMCACHED_HASH_FNV1A_64, MEMCACHED_HASH_FNV1_32, MEMCACHED_HASH_FNV1A_32, MEMCACHED_HASH_JENKINS, MEMCACHED_HASH_HSIEH, and MEMCACHED_HASH_MURMUR. Each hash has it's advantages and it's weaknesses. If you dont know or dont care, just go with the default. +Support for MEMCACHED_HASH_HSIEH is a compile time option that is disabled by default. To enable support for this hashing algorithm, configure and build libmemcached with the --enable-hash_hsieh. =item MEMCACHED_BEHAVIOR_DISTRIBUTION --- a/libmemcached/Makefile.am Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/Makefile.am Thu Apr 30 19:31:48 2009 -0700 @@ -29,7 +29,6 @@ lib_LTLIBRARIES = libmemcached.la libmemcached_la_SOURCES = crc.c \ - hsieh_hash.c \ memcached.c \ memcached_auto.c \ memcached_analyze.c \ @@ -62,6 +61,10 @@ murmur_hash.c \ jenkins_hash.c +if INCLUDE_HSIEH_SRC +libmemcached_la_SOURCES += hsieh_hash.c +endif + if BUILD_BYTEORDER libmemcached_la_SOURCES += byteorder.c endif --- a/libmemcached/common.h Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/common.h Thu Apr 30 19:31:48 2009 -0700 @@ -84,7 +84,9 @@ void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result); uint32_t hash_crc32(const char *data, size_t data_len); +#ifdef HAVE_HSIEH_HASH uint32_t hsieh_hash(const char *key, size_t key_length); +#endif uint32_t murmur_hash(const char *key, size_t key_length); uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval); --- a/libmemcached/memcached_behavior.c Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/memcached_behavior.c Thu Apr 30 19:31:48 2009 -0700 @@ -100,6 +100,10 @@ break; } case MEMCACHED_BEHAVIOR_HASH: +#ifndef HAVE_HSIEH_HASH + if ((memcached_hash)(data) == MEMCACHED_HASH_HSIEH) + return MEMCACHED_FAILURE; +#endif ptr->hash= (memcached_hash)(data); break; case MEMCACHED_BEHAVIOR_KETAMA_HASH: --- a/libmemcached/memcached_hash.c Thu Apr 30 11:27:26 2009 -0700 +++ b/libmemcached/memcached_hash.c Thu Apr 30 19:31:48 2009 -0700 @@ -74,11 +74,13 @@ } } break; +#ifdef HAVE_HSIEH_HASH case MEMCACHED_HASH_HSIEH: { hash= hsieh_hash(key, key_length); break; } +#endif case MEMCACHED_HASH_MURMUR: { hash= murmur_hash(key, key_length); --- a/tests/function.c Thu Apr 30 11:27:26 2009 -0700 +++ b/tests/function.c Thu Apr 30 19:31:48 2009 -0700 @@ -2856,9 +2856,12 @@ static memcached_return pre_hsieh(memcached_st *memc) { +#ifdef HAVE_HSIEH_HASH memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH); - return MEMCACHED_SUCCESS; +#else + return MEMCACHED_FAILURE; +#endif } static memcached_return pre_hash_fnv1_64(memcached_st *memc) @@ -3069,7 +3072,8 @@ memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT; memcached_hash hash; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value); - pre_hsieh(memc); + if (pre_hsieh(memc) != MEMCACHED_SUCCESS) + return MEMCACHED_FAILURE; value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT); @@ -3624,6 +3628,18 @@ return TEST_SUCCESS; } +test_return hsieh_avaibility_test (memcached_st *memc) +{ + memcached_return expected_rc= MEMCACHED_FAILURE; +#ifdef HAVE_HSIEH_HASH + expected_rc= MEMCACHED_SUCCESS; +#endif + memcached_return rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, + (uint64_t)MEMCACHED_HASH_HSIEH); + assert(rc == expected_rc); + return TEST_SUCCESS; +} + test_st udp_setup_server_tests[] ={ {"set_udp_behavior_test", 0, set_udp_behavior_test}, {"add_tcp_server_udp_client_test", 0, add_tcp_server_udp_client_test}, @@ -3795,7 +3811,13 @@ {0, 0, 0} }; +test_st hsieh_availability[] ={ + {"hsieh_avaibility_test",0,hsieh_avaibility_test}, + {0, 0, 0} +}; + collection_st collection[] ={ + {"hsieh_availability",0,0,hsieh_availability}, {"udp_setup", init_udp, 0, udp_setup_server_tests}, {"udp_io", init_udp, 0, upd_io_tests}, {"udp_binary_io", binary_init_udp, 0, upd_io_tests}, --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/hsieh.m4 Thu Apr 30 19:31:48 2009 -0700 @@ -0,0 +1,22 @@ +dnl --------------------------------------------------------------------------- +dnl Macro: HSIEH_HASH +dnl --------------------------------------------------------------------------- +AC_ARG_ENABLE(hsieh_hash, + [ --enable-hsieh_hash build with support for hsieh hashing.], + [ + if test "x$enableval" != "xno"; then + ENABLE_HSIEH="true" + AC_DEFINE([HAVE_HSIEH_HASH], [1], [Enables hsieh hashing support]) + else + ENABLE_HSIEH="false" + fi + ], + [ + ENABLE_HSIEH="false" + ] +) + +AM_CONDITIONAL([INCLUDE_HSIEH_SRC], [test "x$ENABLE_HSIEH" = "xtrue"]) +dnl --------------------------------------------------------------------------- +dnl End Macro: HSIEH_HASH +dnl --------------------------------------------------------------------------- --- NEW FILE libmemcached.spec --- Name: libmemcached Summary: Client library and command line tools for memcached server Version: 0.28 Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://tangent.org/552/libmemcached.html Source0: http://download.tangent.org/libmemcached-%{version}.tar.gz # Patch from upstream to disable hsieh hash (non free) # http://hg.tangent.org/libmemcached/rev/0fc201158518 Patch0: %{name}-hsieh.patch # Temporary for above patch BuildRequires: libtool # checked during configure (for test suite) BuildRequires: memcached BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description libmemcached is a C client library to the memcached server (http://danga.com/memcached). It has been designed to be light on memory usage, and provide full access to server side methods. It also implements several command line tools: memcat - Copy the value of a key to standard output. memflush - Flush the contents of your servers. memrm - Remove a key(s) from the server. memstat - Dump the stats of your servers to standard output. memslap - Generate testing loads on a memcached cluster. memcp - Copy files to memcached servers. memerror - Creates human readable messages from libmemcached error codes. %package devel Summary: Header files and development libraries for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the header files and development libraries for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q %patch0 -p1 %{__rm} -f libmemcached/hsieh_hash.c %{__mkdir} examples %{__cp} -p tests/*.{c,cpp,h} examples/ # Temporary because of patched .m4 files libtoolize --force aclocal automake --add-missing -Wno-portability autoconf autoheader %build %configure %{__make} %{_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS="" %check # For documentation only: # test suite cannot run in mock (same port use for memcache servers on all arch) # All tests completed successfully # diff output.res output.cmp fails but result depend on server version #%{__make} test %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr (-,root,root,-) %doc AUTHORS COPYING README THANKS TODO ChangeLog %{_bindir}/mem* %exclude %{_libdir}/libmemcached.a %exclude %{_libdir}/libmemcached.la %{_libdir}/libmemcached.so.* %{_mandir}/man1/mem* %files devel %defattr (-,root,root,-) %doc examples %{_includedir}/libmemcached %{_libdir}/libmemcached.so %{_libdir}/pkgconfig/libmemcached.pc %{_libdir}/libmemcached.so %{_mandir}/man3/libmemcached*.3.gz %{_mandir}/man3/memcached_*.3.gz %changelog * Fri May 01 2009 Remi Collet - 0.28-2 - add upstream patch to disable nonfree hsieh hash method * Sat Apr 25 2009 Remi Collet - 0.28-1 - Initial RPM from Brian Aker spec - create -devel subpackage - add %%post %%postun %%check section Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmemcached/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:58:20 -0000 1.1 +++ sources 2 May 2009 06:34:29 -0000 1.2 @@ -0,0 +1 @@ +7224e49fd4b0606f35b149ebb8c34e08 libmemcached-0.28.tar.gz From sharkcz at fedoraproject.org Sat May 2 06:38:20 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Sat, 2 May 2009 06:38:20 +0000 (UTC) Subject: rpms/libica/F-11 libica.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502063820.6C18C70120@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/libica/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28629 Modified Files: .cvsignore sources Added Files: libica.spec Log Message: Initial import --- NEW FILE libica.spec --- Summary: Library for accessing ICA hardware crypto on IBM zSeries Name: libica Version: 2.0.1 Release: 1%{?dist} License: CPL Group: System Environment/Libraries URL: http://sourceforge.net/projects/opencryptoki/ Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel BuildRequires: autoconf automake libtool ExclusiveArch: s390 s390x %description A library of functions for accessing ICA hardware crypto on IBM zSeries. %package devel Summary: Development tools for programs to access ICA hardware crypto on IBM zSeries Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: openssl-devel %description devel The libica-devel package contains the header files and static libraries necessary for developing programs accessing ICA hardware crypto on IBM zSeries. %package utils Summary: Utility programs to access ICA hardware crypto on IBM zSeries Group: System Environment/Base %description utils Utility programs to access ICA hardware crypto on IBM zSeries. %prep %setup -q -n %{name} # fix EOLs sed -i -e 's/\r//g' LICENSE sh ./bootstrap.sh %build %configure --disable-static # paralell make doesn't work make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libica.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS LICENSE %{_libdir}/libica-%{version}.so %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/libica.so %files utils %defattr(-,root,root,-) %{_bindir}/icainfo %{_bindir}/icastats %changelog * Wed Apr 1 2009 Dan Horak - 2.0.1-1 - update to 2.0.1 * Mon Mar 23 2009 Dan Horak - 2.0-1 - update to 2.0 - spec file cleanup before submitting to Fedora * Sun Sep 14 2008 Phil Knirsch - 1.3.7-8.el5 - Added the icainfo tool to libica (#439484) * Tue Apr 01 2008 Phil Knirsch - 1.3.7-7.el5 - Fixed build of libica with latest AES & SHA feature (#439390) * Tue Jan 15 2008 Phil Knirsch - 1.3.7-6.el5 - Added Software Support for CP Assist Instructions AES & SHA (#318971) * Thu Nov 23 2006 Phil Knirsch - 1.3.7-5.el5 - Fixed requires bug where devel packages would get wrong arch lib (#215908) * Fri Oct 13 2006 Phil Knirsch - 1.3.7-4 - Fixed bug where libica fails to initialize when no crypto hardware is available (#210504) - Only build libica for s390(x), really only needed there. * Fri Sep 08 2006 Phil Knirsch - 1.3.7-3 - Build for other archs as well due to openCryptoki requirement (#184631) * Fri Jul 14 2006 Tim Powers - 1.3.7-2 - rebuild * Tue Jun 13 2006 Phil Knirsch - 1.3.7-1 - Update to libica-1.3.7 final - Fixed build on latest devel tree * Tue Apr 04 2006 Phil Knirsch - 1.3.6-rc3-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libica/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:51:42 -0000 1.1 +++ .cvsignore 2 May 2009 06:37:49 -0000 1.2 @@ -0,0 +1 @@ +libica-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libica/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:51:42 -0000 1.1 +++ sources 2 May 2009 06:37:50 -0000 1.2 @@ -0,0 +1 @@ +c00fef46735c918dec3c081a8afc86ae libica-2.0.1.tar.gz From sharkcz at fedoraproject.org Sat May 2 06:40:36 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Sat, 2 May 2009 06:40:36 +0000 (UTC) Subject: rpms/libica/devel libica.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502064036.DC98670120@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/libica/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28951 Modified Files: .cvsignore sources Added Files: libica.spec Log Message: Initial import --- NEW FILE libica.spec --- Summary: Library for accessing ICA hardware crypto on IBM zSeries Name: libica Version: 2.0.1 Release: 1%{?dist} License: CPL Group: System Environment/Libraries URL: http://sourceforge.net/projects/opencryptoki/ Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel BuildRequires: autoconf automake libtool ExclusiveArch: s390 s390x %description A library of functions for accessing ICA hardware crypto on IBM zSeries. %package devel Summary: Development tools for programs to access ICA hardware crypto on IBM zSeries Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: openssl-devel %description devel The libica-devel package contains the header files and static libraries necessary for developing programs accessing ICA hardware crypto on IBM zSeries. %package utils Summary: Utility programs to access ICA hardware crypto on IBM zSeries Group: System Environment/Base %description utils Utility programs to access ICA hardware crypto on IBM zSeries. %prep %setup -q -n %{name} # fix EOLs sed -i -e 's/\r//g' LICENSE sh ./bootstrap.sh %build %configure --disable-static # paralell make doesn't work make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libica.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS LICENSE %{_libdir}/libica-%{version}.so %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/libica.so %files utils %defattr(-,root,root,-) %{_bindir}/icainfo %{_bindir}/icastats %changelog * Wed Apr 1 2009 Dan Horak - 2.0.1-1 - update to 2.0.1 * Mon Mar 23 2009 Dan Horak - 2.0-1 - update to 2.0 - spec file cleanup before submitting to Fedora * Sun Sep 14 2008 Phil Knirsch - 1.3.7-8.el5 - Added the icainfo tool to libica (#439484) * Tue Apr 01 2008 Phil Knirsch - 1.3.7-7.el5 - Fixed build of libica with latest AES & SHA feature (#439390) * Tue Jan 15 2008 Phil Knirsch - 1.3.7-6.el5 - Added Software Support for CP Assist Instructions AES & SHA (#318971) * Thu Nov 23 2006 Phil Knirsch - 1.3.7-5.el5 - Fixed requires bug where devel packages would get wrong arch lib (#215908) * Fri Oct 13 2006 Phil Knirsch - 1.3.7-4 - Fixed bug where libica fails to initialize when no crypto hardware is available (#210504) - Only build libica for s390(x), really only needed there. * Fri Sep 08 2006 Phil Knirsch - 1.3.7-3 - Build for other archs as well due to openCryptoki requirement (#184631) * Fri Jul 14 2006 Tim Powers - 1.3.7-2 - rebuild * Tue Jun 13 2006 Phil Knirsch - 1.3.7-1 - Update to libica-1.3.7 final - Fixed build on latest devel tree * Tue Apr 04 2006 Phil Knirsch - 1.3.6-rc3-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libica/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:51:42 -0000 1.1 +++ .cvsignore 2 May 2009 06:40:06 -0000 1.2 @@ -0,0 +1 @@ +libica-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libica/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:51:42 -0000 1.1 +++ sources 2 May 2009 06:40:06 -0000 1.2 @@ -0,0 +1 @@ +c00fef46735c918dec3c081a8afc86ae libica-2.0.1.tar.gz From sharkcz at fedoraproject.org Sat May 2 06:43:16 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Sat, 2 May 2009 06:43:16 +0000 (UTC) Subject: rpms/podofo/devel podofo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502064316.A24F570120@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/podofo/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29441 Modified Files: .cvsignore sources Added Files: podofo.spec Log Message: Initial import --- NEW FILE podofo.spec --- Name: podofo Version: 0.7.0 Release: 2%{?dist} Summary: Tools and libraries to work with the PDF file format Group: Applications/Publishing License: GPLv2+ URL: http://podofo.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake zlib-devel libjpeg-devel libtiff-devel freetype-devel fontconfig-devel BuildRequires: cppunit-devel lua-devel doxygen %description PoDoFo is a library to work with the PDF file format. The name comes from the first letter of PDF (Portable Document Format). A few tools to work with PDF files are already included in the PoDoFo package. The PoDoFo library is a free, portable C++ library which includes classes to parse PDF files and modify their contents into memory. The changes can be written back to disk easily. The parser can also be used to extract information from a PDF file (for example the parser could be used in a PDF viewer). Besides parsing PoDoFo includes also very simple classes to create your own PDF files. All classes are documented so it is easy to start writing your own application using PoDoFo. %package libs Summary: Runtime library for %{name} Group: System Environment/Libraries License: LGPLv2+ %description libs Runtime library for %{name}. %package devel Summary: Development files for %{name} library Group: Development/Libraries License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} %description devel Development files and documentation for the %{name} library. %prep %setup -q %build %cmake -DPODOFO_BUILD_SHARED=1 \ %ifarch x86_64 ppc64 s390x sparc64 -DWANT_LIB64=1 \ %endif . make %{?_smp_mflags} # build the docs doxygen %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/%{name}* %files libs %defattr(-,root,root,-) %doc AUTHORS COPYING.LIB ChangeLog FAQ.html README.html TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_includedir}/%{name} %{_libdir}/*.so %changelog * Thu Apr 30 2009 Dan Hor??k 0.7.0-2 - remove BR: openssl-devel, it could be required in the future (but then an exception clause will be added to the licenses) - add missing doc files * Sun Mar 29 2009 Dan Hor??k 0.7.0-1 - initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/podofo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:52:31 -0000 1.1 +++ .cvsignore 2 May 2009 06:42:46 -0000 1.2 @@ -0,0 +1 @@ +podofo-0.7.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/podofo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:52:31 -0000 1.1 +++ sources 2 May 2009 06:42:46 -0000 1.2 @@ -0,0 +1 @@ +b9623fd9279fca49f7cdd5c1fed182b1 podofo-0.7.0.tar.gz From sharkcz at fedoraproject.org Sat May 2 06:46:13 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Sat, 2 May 2009 06:46:13 +0000 (UTC) Subject: rpms/podofo/F-11 podofo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502064613.6816A70120@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/podofo/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29877 Modified Files: .cvsignore sources Added Files: podofo.spec Log Message: Initial import --- NEW FILE podofo.spec --- Name: podofo Version: 0.7.0 Release: 2%{?dist} Summary: Tools and libraries to work with the PDF file format Group: Applications/Publishing License: GPLv2+ URL: http://podofo.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake zlib-devel libjpeg-devel libtiff-devel freetype-devel fontconfig-devel BuildRequires: cppunit-devel lua-devel doxygen %description PoDoFo is a library to work with the PDF file format. The name comes from the first letter of PDF (Portable Document Format). A few tools to work with PDF files are already included in the PoDoFo package. The PoDoFo library is a free, portable C++ library which includes classes to parse PDF files and modify their contents into memory. The changes can be written back to disk easily. The parser can also be used to extract information from a PDF file (for example the parser could be used in a PDF viewer). Besides parsing PoDoFo includes also very simple classes to create your own PDF files. All classes are documented so it is easy to start writing your own application using PoDoFo. %package libs Summary: Runtime library for %{name} Group: System Environment/Libraries License: LGPLv2+ %description libs Runtime library for %{name}. %package devel Summary: Development files for %{name} library Group: Development/Libraries License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} %description devel Development files and documentation for the %{name} library. %prep %setup -q %build %cmake -DPODOFO_BUILD_SHARED=1 \ %ifarch x86_64 ppc64 s390x sparc64 -DWANT_LIB64=1 \ %endif . make %{?_smp_mflags} # build the docs doxygen %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/%{name}* %files libs %defattr(-,root,root,-) %doc AUTHORS COPYING.LIB ChangeLog FAQ.html README.html TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_includedir}/%{name} %{_libdir}/*.so %changelog * Thu Apr 30 2009 Dan Hor??k 0.7.0-2 - remove BR: openssl-devel, it could be required in the future (but then an exception clause will be added to the licenses) - add missing doc files * Sun Mar 29 2009 Dan Hor??k 0.7.0-1 - initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/podofo/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:52:31 -0000 1.1 +++ .cvsignore 2 May 2009 06:45:42 -0000 1.2 @@ -0,0 +1 @@ +podofo-0.7.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/podofo/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:52:31 -0000 1.1 +++ sources 2 May 2009 06:45:43 -0000 1.2 @@ -0,0 +1 @@ +b9623fd9279fca49f7cdd5c1fed182b1 podofo-0.7.0.tar.gz From sharkcz at fedoraproject.org Sat May 2 06:47:57 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Sat, 2 May 2009 06:47:57 +0000 (UTC) Subject: rpms/podofo/F-10 podofo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502064757.8F4E170120@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/podofo/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30144 Modified Files: .cvsignore sources Added Files: podofo.spec Log Message: Initial import --- NEW FILE podofo.spec --- Name: podofo Version: 0.7.0 Release: 2%{?dist} Summary: Tools and libraries to work with the PDF file format Group: Applications/Publishing License: GPLv2+ URL: http://podofo.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake zlib-devel libjpeg-devel libtiff-devel freetype-devel fontconfig-devel BuildRequires: cppunit-devel lua-devel doxygen %description PoDoFo is a library to work with the PDF file format. The name comes from the first letter of PDF (Portable Document Format). A few tools to work with PDF files are already included in the PoDoFo package. The PoDoFo library is a free, portable C++ library which includes classes to parse PDF files and modify their contents into memory. The changes can be written back to disk easily. The parser can also be used to extract information from a PDF file (for example the parser could be used in a PDF viewer). Besides parsing PoDoFo includes also very simple classes to create your own PDF files. All classes are documented so it is easy to start writing your own application using PoDoFo. %package libs Summary: Runtime library for %{name} Group: System Environment/Libraries License: LGPLv2+ %description libs Runtime library for %{name}. %package devel Summary: Development files for %{name} library Group: Development/Libraries License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} %description devel Development files and documentation for the %{name} library. %prep %setup -q %build %cmake -DPODOFO_BUILD_SHARED=1 \ %ifarch x86_64 ppc64 s390x sparc64 -DWANT_LIB64=1 \ %endif . make %{?_smp_mflags} # build the docs doxygen %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/%{name}* %files libs %defattr(-,root,root,-) %doc AUTHORS COPYING.LIB ChangeLog FAQ.html README.html TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_includedir}/%{name} %{_libdir}/*.so %changelog * Thu Apr 30 2009 Dan Hor??k 0.7.0-2 - remove BR: openssl-devel, it could be required in the future (but then an exception clause will be added to the licenses) - add missing doc files * Sun Mar 29 2009 Dan Hor??k 0.7.0-1 - initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/podofo/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:52:31 -0000 1.1 +++ .cvsignore 2 May 2009 06:47:27 -0000 1.2 @@ -0,0 +1 @@ +podofo-0.7.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/podofo/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:52:31 -0000 1.1 +++ sources 2 May 2009 06:47:27 -0000 1.2 @@ -0,0 +1 @@ +b9623fd9279fca49f7cdd5c1fed182b1 podofo-0.7.0.tar.gz From hno at fedoraproject.org Sat May 2 06:53:29 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Sat, 2 May 2009 06:53:29 +0000 (UTC) Subject: rpms/bzr/devel .cvsignore, 1.40, 1.41 bzr.spec, 1.58, 1.59 sources, 1.40, 1.41 Message-ID: <20090502065329.6DA7B70120@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31533 Modified Files: .cvsignore bzr.spec sources Log Message: 1.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- .cvsignore 30 Apr 2009 11:43:40 -0000 1.40 +++ .cvsignore 2 May 2009 06:52:58 -0000 1.41 @@ -1 +1 @@ -bzr-1.14.tar.gz +bzr-1.14.1.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- bzr.spec 30 Apr 2009 11:43:40 -0000 1.58 +++ bzr.spec 2 May 2009 06:52:58 -0000 1.59 @@ -13,7 +13,7 @@ %define subrelease %{?bzrrc:.}%{?bzrrc} Name: bzr -Version: %{bzrver} +Version: %{bzrver}.1 Release: %{release}%{?subrelease}%{?dist} Summary: Friendly distributed version control system @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat May 02 2009 Henrik Nordstrom - 1.14.1-1 +- Uptade to 1.14.1 + * Wed Apr 29 2009 Henrik Nordstrom - 1.14-1 - Update to 1.14 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- sources 30 Apr 2009 11:43:40 -0000 1.40 +++ sources 2 May 2009 06:52:59 -0000 1.41 @@ -1 +1 @@ -1180a563b525e196ac1cb89110d05432 bzr-1.14.tar.gz +198a66c4ecc4aeebf6f6ac8b1e68c064 bzr-1.14.1.tar.gz From sharkcz at fedoraproject.org Sat May 2 06:54:01 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Sat, 2 May 2009 06:54:01 +0000 (UTC) Subject: rpms/podofo/EL-5 podofo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502065401.F26E470120@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/podofo/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31622 Modified Files: .cvsignore sources Added Files: podofo.spec Log Message: Initial import --- NEW FILE podofo.spec --- Name: podofo Version: 0.7.0 Release: 2%{?dist} Summary: Tools and libraries to work with the PDF file format Group: Applications/Publishing License: GPLv2+ URL: http://podofo.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake zlib-devel libjpeg-devel libtiff-devel freetype-devel fontconfig-devel BuildRequires: cppunit-devel lua-devel doxygen %description PoDoFo is a library to work with the PDF file format. The name comes from the first letter of PDF (Portable Document Format). A few tools to work with PDF files are already included in the PoDoFo package. The PoDoFo library is a free, portable C++ library which includes classes to parse PDF files and modify their contents into memory. The changes can be written back to disk easily. The parser can also be used to extract information from a PDF file (for example the parser could be used in a PDF viewer). Besides parsing PoDoFo includes also very simple classes to create your own PDF files. All classes are documented so it is easy to start writing your own application using PoDoFo. %package libs Summary: Runtime library for %{name} Group: System Environment/Libraries License: LGPLv2+ %description libs Runtime library for %{name}. %package devel Summary: Development files for %{name} library Group: Development/Libraries License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} %description devel Development files and documentation for the %{name} library. %prep %setup -q %build %cmake -DPODOFO_BUILD_SHARED=1 \ %ifarch x86_64 ppc64 s390x sparc64 -DWANT_LIB64=1 \ %endif . make %{?_smp_mflags} # build the docs doxygen %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/%{name}* %files libs %defattr(-,root,root,-) %doc AUTHORS COPYING.LIB ChangeLog FAQ.html README.html TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_includedir}/%{name} %{_libdir}/*.so %changelog * Thu Apr 30 2009 Dan Hor??k 0.7.0-2 - remove BR: openssl-devel, it could be required in the future (but then an exception clause will be added to the licenses) - add missing doc files * Sun Mar 29 2009 Dan Hor??k 0.7.0-1 - initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/podofo/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:52:31 -0000 1.1 +++ .cvsignore 2 May 2009 06:53:31 -0000 1.2 @@ -0,0 +1 @@ +podofo-0.7.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/podofo/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:52:31 -0000 1.1 +++ sources 2 May 2009 06:53:31 -0000 1.2 @@ -0,0 +1 @@ +b9623fd9279fca49f7cdd5c1fed182b1 podofo-0.7.0.tar.gz From hno at fedoraproject.org Sat May 2 06:57:02 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Sat, 2 May 2009 06:57:02 +0000 (UTC) Subject: rpms/bzr/F-11 .cvsignore, 1.38, 1.39 bzr.spec, 1.56, 1.57 sources, 1.38, 1.39 Message-ID: <20090502065702.E5B7570120@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzr/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32208 Modified Files: .cvsignore bzr.spec sources Log Message: 1.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-11/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- .cvsignore 9 Apr 2009 00:26:37 -0000 1.38 +++ .cvsignore 2 May 2009 06:56:32 -0000 1.39 @@ -1 +1 @@ -bzr-1.14rc1.tar.gz +bzr-1.14.1.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-11/bzr.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -p -r1.56 -r1.57 --- bzr.spec 11 Apr 2009 20:40:00 -0000 1.56 +++ bzr.spec 2 May 2009 06:56:32 -0000 1.57 @@ -1,26 +1,17 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# All package versioning is found here: -# the actual version is composed from these below, including leading 0 for release candidates -# bzrver: main bzr version -# bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %). -# release: rpm subrelease (0.N for rc candidates, N for stable releases) +# bzr major versions uses two digits. Specify subreleases if any in Version: %define bzrver 1.14 -%define bzrrc rc1 -%define release 0.2 - -# Magics to get the dots in Release string correct per the above -%define subrelease %{?bzrrc:.}%{?bzrrc} Name: bzr -Version: %{bzrver} -Release: %{release}%{?subrelease}%{?dist} +Version: %{bzrver}.1 +Release: 1%{?dist} Summary: Friendly distributed version control system Group: Development/Tools License: GPLv2+ URL: http://www.bazaar-vcs.org/ -Source0: https://launchpad.net/%{name}/%{bzrver}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz +Source0: https://launchpad.net/%{name}/%{bzrver}/%{version}/+download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel zlib-devel @@ -45,7 +36,7 @@ a user-friendly reimplementation of GNU %prep -%setup -q -n %{name}-%{version}%{?bzrrc} +%setup -q -n %{name}-%{version} sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py @@ -89,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat May 02 2009 Henrik Nordstrom - 1.14.1-1 +- Update to 1.14.1 + * Sat Apr 11 2009 Henrik Nordstrom - 1.14-0.2.rc1 - Correct build dependencies Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-11/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- sources 9 Apr 2009 00:26:37 -0000 1.38 +++ sources 2 May 2009 06:56:32 -0000 1.39 @@ -1 +1 @@ -a488eb6f01a693148d02e4e71d75b7b5 bzr-1.14rc1.tar.gz +198a66c4ecc4aeebf6f6ac8b1e68c064 bzr-1.14.1.tar.gz From petersen at fedoraproject.org Sat May 2 06:57:54 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Sat, 2 May 2009 06:57:54 +0000 (UTC) Subject: rpms/ghc/devel ghc.spec,1.86,1.87 Message-ID: <20090502065754.9936970120@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32311 Modified Files: ghc.spec Log Message: try unregisterised ppc to see if that stops the segfaulting with runghc Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -p -r1.86 -r1.87 --- ghc.spec 29 Apr 2009 07:33:54 -0000 1.86 +++ ghc.spec 2 May 2009 06:57:24 -0000 1.87 @@ -22,7 +22,7 @@ Name: ghc Version: 6.10.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Glasgow Haskell Compilation system # fedora ghc has only been bootstrapped on the following archs: ExclusiveArch: %{ix86} x86_64 ppc alpha @@ -119,6 +119,12 @@ popd exit 0 %endif +%ifarch ppc +echo "GhcUnregisterised=YES" >> mk/build.mk +echo "GhcWithNativeCodeGen=NO" >> mk/build.mk +echo "SplitObjs=NO" >> mk/build.mk +%endif + %if %{without prof} echo "GhcLibWays=%{?with_shared:dyn}" >> mk/build.mk %endif @@ -277,6 +283,9 @@ fi %endif %changelog +* Sat May 2 2009 Jens Petersen - 6.10.2-5 +- try unregisterised ppc to see if that stops the segfaulting with runghc + * Tue Apr 28 2009 Jens Petersen - 6.10.2-4 - add experimental bcond hscolour - add experimental support for building shared libraries (for ghc-6.11) From hno at fedoraproject.org Sat May 2 07:02:30 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Sat, 2 May 2009 07:02:30 +0000 (UTC) Subject: rpms/bzr/devel bzr.spec,1.59,1.60 Message-ID: <20090502070230.3671A70120@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv385 Modified Files: bzr.spec Log Message: Clean up spec version variables slightly Index: bzr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- bzr.spec 2 May 2009 06:52:58 -0000 1.59 +++ bzr.spec 2 May 2009 07:01:59 -0000 1.60 @@ -2,10 +2,12 @@ # All package versioning is found here: # the actual version is composed from these below, including leading 0 for release candidates -# bzrver: main bzr version +# bzrmajor: main bzr version +# bzrver: bzr version, add subrelease version here # bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %). # release: rpm subrelease (0.N for rc candidates, N for stable releases) -%define bzrver 1.14 +%define bzrmajor 1.14 +%define bzrver %{bzrmajor}.1 #define bzrrc rc2 %define release 1 @@ -13,14 +15,14 @@ %define subrelease %{?bzrrc:.}%{?bzrrc} Name: bzr -Version: %{bzrver}.1 +Version: %{bzrver} Release: %{release}%{?subrelease}%{?dist} Summary: Friendly distributed version control system Group: Development/Tools License: GPLv2+ URL: http://www.bazaar-vcs.org/ -Source0: https://launchpad.net/%{name}/%{bzrver}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz +Source0: https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel zlib-devel From hno at fedoraproject.org Sat May 2 07:04:36 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Sat, 2 May 2009 07:04:36 +0000 (UTC) Subject: rpms/bzr/F-10 .cvsignore, 1.35, 1.36 bzr.spec, 1.50, 1.51 sources, 1.36, 1.37 Message-ID: <20090502070436.C954870120@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzr/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv662 Modified Files: .cvsignore bzr.spec sources Log Message: 1.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-10/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- .cvsignore 29 Apr 2009 02:31:20 -0000 1.35 +++ .cvsignore 2 May 2009 07:04:06 -0000 1.36 @@ -1 +1 @@ -bzr-1.13.2.tar.gz +bzr-1.14.1.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-10/bzr.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- bzr.spec 29 Apr 2009 02:40:10 -0000 1.50 +++ bzr.spec 2 May 2009 07:04:06 -0000 1.51 @@ -1,10 +1,10 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} # bzr major versions uses two digits. Specify subreleases if any in Version: -%define bzrver 1.13 +%define bzrver 1.14 Name: bzr -Version: %{bzrver}.2 +Version: %{bzrver}.1 Release: 1%{?dist} Summary: Friendly distributed version control system @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat May 02 2009 Henrik Nordstrom 1.14.1-1 +- Update to 1.14.1 + * Wed Apr 29 2009 Henrik Nordstrom - 1.13.2-1 - Update to 1.13.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-10/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- sources 29 Apr 2009 02:31:20 -0000 1.36 +++ sources 2 May 2009 07:04:06 -0000 1.37 @@ -1 +1 @@ -7f7d81dfc3b88caf193841ab9fe53574 bzr-1.13.2.tar.gz +198a66c4ecc4aeebf6f6ac8b1e68c064 bzr-1.14.1.tar.gz From hno at fedoraproject.org Sat May 2 07:09:05 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Sat, 2 May 2009 07:09:05 +0000 (UTC) Subject: rpms/bzrtools/F-10 .cvsignore, 1.26, 1.27 bzrtools.spec, 1.39, 1.40 sources, 1.28, 1.29 Message-ID: <20090502070905.AD75470120@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzrtools/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1393 Modified Files: .cvsignore bzrtools.spec sources Log Message: 1.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/F-10/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- .cvsignore 16 Mar 2009 15:26:01 -0000 1.26 +++ .cvsignore 2 May 2009 07:08:35 -0000 1.27 @@ -1 +1 @@ -bzrtools-1.13.0.tar.gz +bzrtools-1.14.0.tar.gz Index: bzrtools.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/F-10/bzrtools.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- bzrtools.spec 16 Mar 2009 15:26:01 -0000 1.39 +++ bzrtools.spec 2 May 2009 07:08:35 -0000 1.40 @@ -5,8 +5,8 @@ # (bzrlib is arch dependent. Thus bzrlib plugins are also arch dependent.) %define debug_package %{nil} -%define bzrver 1.13 -%define bzrnextver 1.14 +%define bzrver 1.14 +%define bzrnextver 1.15 Name: bzrtools Version: %{bzrver}.0 @@ -16,7 +16,7 @@ Summary: A collection of utilitie Group: Development/Tools License: GPLv2+ URL: http://bazaar-vcs.org/BzrTools -Source0: https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz +Source0: https://launchpad.net/bzrtools/stable/%{bzrver}/+download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat May 02 2009 Henrik Nordstrom 1.14.0-1 +- Update to 1.14.0 + * Mon Mar 16 2009 Henrik Nordstrom - 1.13.0-1 - Update to 1.13.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/F-10/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- sources 16 Mar 2009 15:26:01 -0000 1.28 +++ sources 2 May 2009 07:08:35 -0000 1.29 @@ -1 +1 @@ -dda51994e233c67175d7f9fb3f2bdc14 bzrtools-1.13.0.tar.gz +f5b46f1c18301ce9264112375175e51f bzrtools-1.14.0.tar.gz From remi at fedoraproject.org Sat May 2 07:32:29 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sat, 2 May 2009 07:32:29 +0000 (UTC) Subject: rpms/php-pear-PHPUnit/devel .cvsignore, 1.12, 1.13 php-pear-PHPUnit.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <20090502073229.F382270120@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-PHPUnit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4915 Modified Files: .cvsignore php-pear-PHPUnit.spec sources Log Message: update to 3.3.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 8 Nov 2008 18:36:30 -0000 1.12 +++ .cvsignore 2 May 2009 07:31:59 -0000 1.13 @@ -1 +1 @@ -PHPUnit-3.3.4.tgz +PHPUnit-3.3.16.tgz Index: php-pear-PHPUnit.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/php-pear-PHPUnit.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- php-pear-PHPUnit.spec 26 Feb 2009 22:05:04 -0000 1.15 +++ php-pear-PHPUnit.spec 2 May 2009 07:31:59 -0000 1.16 @@ -1,10 +1,10 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%define pear_name PHPUnit -%define channel pear.phpunit.de +%global pear_name PHPUnit +%global channel pear.phpunit.de Name: php-pear-PHPUnit -Version: 3.3.4 -Release: 2%{?dist} +Version: 3.3.16 +Release: 1%{?dist} Summary: Regression testing framework for unit tests Group: Development/Libraries @@ -14,19 +14,21 @@ Source0: http://pear.phpunit.de/g BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php-pear >= 1:1.4.9-1.2 -BuildRequires: php-channel-phpunit -Requires: php >= 5.1.4 php-pear(PEAR) >= 1.5.0 -Requires: php-channel-phpunit php-xml - -Requires(hint): php-pear(Image_GraphViz) >= 1.2.1 -Requires(hint): php-pear(Log) -#Requires(hint): php-pear(Testing_Selenium) >= 0.2.0 -Requires(hint): php-json -Requires(hint): php-pecl(Xdebug) >= 2.0.0 +BuildRequires: php-pear(PEAR) >= 1.7.1 +BuildRequires: php-channel(pear.phpunit.de) + +Requires: php-common >= 5.1.4 php-xml +Requires: php-pear(PEAR) >= 1.7.1 +Requires: php-channel(pear.phpunit.de) Requires(post): %{__pear} Requires(postun): %{__pear} +# Optionnal dependencies +Requires: php-pear(Image_GraphViz) >= 1.2.1 +Requires: php-pear(Log) +Requires: php-json php-pdo +Requires: php-pecl(Xdebug) >= 2.0.0 + Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description @@ -39,8 +41,8 @@ for the creation, execution and analysis %prep %setup -qc -[ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +# package.xml is V2 +mv package.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} @@ -54,7 +56,7 @@ cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir # Install Package -%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml +%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Move documentation mkdir -p docdir @@ -65,7 +67,7 @@ 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} +install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean @@ -80,7 +82,7 @@ if [ $1 -gt 1 ] ; then fi %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then @@ -92,13 +94,18 @@ fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/%{pear_name}/* -%{pear_xmldir}/%{pear_name}.xml +%{pear_xmldir}/%{name}.xml %{pear_testdir}/%{pear_name} %{pear_phpdir}/%{pear_name} %{_bindir}/phpunit %changelog +* Sat May 02 2009 Remi Collet - 3.3.16-1 +- Upstream sync +- Fix requires (remove hint) and raise PEAR version to 1.7.1 +- rename %%{pear_name}.xml to %%{name}.xml + * Thu Feb 26 2009 Fedora Release Engineering - 3.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 8 Nov 2008 18:36:30 -0000 1.12 +++ sources 2 May 2009 07:31:59 -0000 1.13 @@ -1 +1 @@ -973eb6ba8b5158ca597ce10b7b511216 PHPUnit-3.3.4.tgz +1bafa52c00d773c84931d43e37532729 PHPUnit-3.3.16.tgz From lkundrak at fedoraproject.org Sat May 2 09:54:30 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sat, 2 May 2009 09:54:30 +0000 (UTC) Subject: rpms/libical/EL-5 libical-0.43-cflags.patch, NONE, 1.1 libical-0.43-implicit-pointer-conversion.patch, NONE, 1.1 libical-0.43-makefile.patch, NONE, 1.1 libical.spec, 1.9, 1.10 libical-0.32-makefile.patch, 1.1, NONE Message-ID: <20090502095430.8176670120@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/libical/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32560 Modified Files: libical.spec Added Files: libical-0.43-cflags.patch libical-0.43-implicit-pointer-conversion.patch libical-0.43-makefile.patch Removed Files: libical-0.32-makefile.patch Log Message: Merge from devel (#498688) libical-0.43-cflags.patch: --- NEW FILE libical-0.43-cflags.patch --- diff -urNp libical-0.43.orig/libical.pc.in libical-0.43/libical.pc.in --- libical-0.43.orig/libical.pc.in 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/libical.pc.in 2009-03-15 22:11:13.000000000 +0530 @@ -7,5 +7,5 @@ Name: libical Description: An implementation of basic iCAL protocols Version: @VERSION@ Libs: -L${libdir} -lical -licalss -licalvcal -Cflags: -I${includedir}/libical +Cflags: -I${includedir} diff -urNp libical-0.43.orig/src/libical/icaltz-util.c libical-0.43/src/libical/icaltz-util.c --- libical-0.43.orig/src/libical/icaltz-util.c 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libical/icaltz-util.c 2009-03-15 22:08:03.000000000 +0530 @@ -81,8 +81,8 @@ #ifdef HAVE_UNISTD_H #include #endif -#include -#include +#include "icalerror.h" +#include "icaltz-util.h" typedef struct { diff -urNp libical-0.43.orig/src/libicalcap/icalcap.h libical-0.43/src/libicalcap/icalcap.h --- libical-0.43.orig/src/libicalcap/icalcap.h 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libicalcap/icalcap.h 2009-03-15 22:08:48.000000000 +0530 @@ -1,7 +1,7 @@ #ifndef __ICALCAP_H__ #define __ICALCAP_H__ -#include +#include /* * Opaque objects diff -urNp libical-0.43.orig/src/libicalcap/icalcap_message_impl.h libical-0.43/src/libicalcap/icalcap_message_impl.h --- libical-0.43.orig/src/libicalcap/icalcap_message_impl.h 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libicalcap/icalcap_message_impl.h 2009-03-15 22:09:16.000000000 +0530 @@ -3,7 +3,7 @@ #ifdef WITH_RR -#include +#include #include #define ICALCAP_MESSAGE_CMD 1 diff -urNp libical-0.43.orig/src/libicalss/icalcalendar.h libical-0.43/src/libicalss/icalcalendar.h --- libical-0.43.orig/src/libicalss/icalcalendar.h 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libicalss/icalcalendar.h 2009-03-15 22:02:47.000000000 +0530 @@ -30,7 +30,7 @@ #define ICALCALENDAR_H #include -#include +#include "icalset.h" /* icalcalendar * Routines for storing calendar data in a file system. The calendar diff -urNp libical-0.43.orig/src/libicalss/icalclassify.h libical-0.43/src/libicalss/icalclassify.h --- libical-0.43.orig/src/libicalss/icalclassify.h 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libicalss/icalclassify.h 2009-03-15 22:03:39.000000000 +0530 @@ -28,8 +28,8 @@ #define ICALCLASSIFY_H #include -#include -#include +#include "icalset.h" +#include "icalcomponent.h" icalproperty_xlicclass icalclassify(icalcomponent* c,icalcomponent* match, const char* user); diff -urNp libical-0.43.orig/src/libicalss/icalcluster.h libical-0.43/src/libicalss/icalcluster.h --- libical-0.43.orig/src/libicalss/icalcluster.h 2009-03-15 21:58:48.000000000 +0530 +++ libical-0.43/src/libicalss/icalcluster.h 2009-03-15 22:01:36.000000000 +0530 @@ -30,7 +30,7 @@ #define ICALCLUSTER_H #include -#include +#include "icalset.h" typedef struct icalcluster_impl icalcluster; diff -urNp libical-0.43.orig/src/libicalss/icaldirset.h libical-0.43/src/libicalss/icaldirset.h --- libical-0.43.orig/src/libicalss/icaldirset.h 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libicalss/icaldirset.h 2009-03-15 22:04:53.000000000 +0530 @@ -30,9 +30,9 @@ #define ICALDIRSET_H #include -#include -#include -#include +#include "icalset.h" +#include "icalcluster.h" +#include "icalgauge.h" /* icaldirset Routines for storing, fetching, and searching for ical * objects in a database */ diff -urNp libical-0.43.orig/src/libicalss/icalfileset.h libical-0.43/src/libicalss/icalfileset.h --- libical-0.43.orig/src/libicalss/icalfileset.h 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libicalss/icalfileset.h 2009-03-15 22:03:13.000000000 +0530 @@ -30,9 +30,9 @@ #define ICALFILESET_H #include -#include -#include -#include +#include "icalset.h" +#include "icalcluster.h" +#include "icalgauge.h" #include /* For open() flags and mode */ #include /* For open() flags and mode */ #include /* For open() flags and mode */ diff -urNp libical-0.43.orig/src/libicalss/icalgauge.h libical-0.43/src/libicalss/icalgauge.h --- libical-0.43.orig/src/libicalss/icalgauge.h 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libicalss/icalgauge.h 2009-03-15 22:04:12.000000000 +0530 @@ -29,7 +29,7 @@ #ifndef ICALGAUGE_H #define ICALGAUGE_H -#include +#include "icalcomponent.h" /** @file icalgauge.h * @brief Routines implementing a filter for ical components diff -urNp libical-0.43.orig/src/libicalss/icalset.h libical-0.43/src/libicalss/icalset.h --- libical-0.43.orig/src/libicalss/icalset.h 2009-03-15 21:58:49.000000000 +0530 +++ libical-0.43/src/libicalss/icalset.h 2009-03-15 22:04:29.000000000 +0530 @@ -41,7 +41,7 @@ #include /* For PATH_MAX */ #include -#include +#include "icalgauge.h" #ifdef PATH_MAX #define ICAL_PATH_MAX PATH_MAX diff -urNp libical-0.43.orig/src/libicalss/icalspanlist.h libical-0.43/src/libicalss/icalspanlist.h --- libical-0.43.orig/src/libicalss/icalspanlist.h 2009-03-15 21:58:48.000000000 +0530 +++ libical-0.43/src/libicalss/icalspanlist.h 2009-03-15 22:02:29.000000000 +0530 @@ -26,7 +26,7 @@ #define ICALSPANLIST_H #include -#include +#include "icalset.h" /** @file icalspanlist.h * @brief Code that supports collections of free/busy spans of time libical-0.43-implicit-pointer-conversion.patch: --- NEW FILE libical-0.43-implicit-pointer-conversion.patch --- diff -urNp libical-0.43.orig/src/test/regression.c libical-0.43/src/test/regression.c --- libical-0.43.orig/src/test/regression.c 2009-01-13 09:34:39.000000000 +0530 +++ libical-0.43/src/test/regression.c 2009-01-13 09:54:37.000000000 +0530 @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include "regression.h" libical-0.43-makefile.patch: --- NEW FILE libical-0.43-makefile.patch --- diff -urNp libical-0.43.orig/src/libicalss/Makefile.in libical-0.43/src/libicalss/Makefile.in --- libical-0.43.orig/src/libicalss/Makefile.in 2009-01-13 09:34:39.000000000 +0530 +++ libical-0.43/src/libicalss/Makefile.in 2009-01-13 09:52:10.000000000 +0530 @@ -308,7 +308,7 @@ INCLUDES = \ $(BDB_INCLUDE) libicalss_la_LDFLAGS = -version-info 43:0:43 -libicalss_la_LIBADD = $(BDB_LIBFILES) +libicalss_la_LIBADD = $(BDB_LIBFILES) ../libical/libical.la @DEV_FALSE at libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c @DEV_TRUE at libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y libicalss_la_SOURCES = \ Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/EL-5/libical.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- libical.spec 2 Sep 2008 22:18:02 -0000 1.9 +++ libical.spec 2 May 2009 09:54:00 -0000 1.10 @@ -1,6 +1,6 @@ Name: libical -Version: 0.32 -Release: 1%{?dist} +Version: 0.43 +Release: 4%{?dist} Summary: Reference implementation of the iCalendar data type and serialization format Summary(pl): Implementacja formatu iCalendar @@ -9,10 +9,16 @@ License: LGPLv2 or MPLv1.1 URL: http://freeassociation.sourceforge.net/ Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-makefile.patch +# http://bugs.debian.org/511598 +Patch0: %{name}-%{version}-implicit-pointer-conversion.patch +Patch1: %{name}-%{version}-makefile.patch +# https://bugzilla.redhat.com/484091 +Patch2: %{name}-%{version}-cflags.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Requires: tzdata + BuildRequires: bison BuildRequires: byacc BuildRequires: flex @@ -30,6 +36,7 @@ Summary: Development files for libical Summary(pl): Pliki deweloperskie dla libical Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel The libical-devel package contains libraries and header files for developing @@ -42,12 +49,11 @@ korzystaj??cych z libical. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -%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 +%configure --disable-static --enable-reentrant --with-backtrace make %{?_smp_mflags} @@ -70,7 +76,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS %doc ChangeLog %doc COPYING %doc LICENSE @@ -79,9 +84,7 @@ rm -rf $RPM_BUILD_ROOT %doc THANKS %doc TODO %{_libdir}/%{name}.so.* -%{_libdir}/%{name}_cxx.so.* %{_libdir}/libicalss.so.* -%{_libdir}/libicalss_cxx.so.* %{_libdir}/libicalvcal.so.* %files devel @@ -89,27 +92,54 @@ rm -rf $RPM_BUILD_ROOT %doc doc/UsingLibical.txt %{_includedir}/ical.h %{_libdir}/%{name}.so -%{_libdir}/%{name}_cxx.so %{_libdir}/libicalss.so -%{_libdir}/libicalss_cxx.so %{_libdir}/libicalvcal.so +%{_libdir}/pkgconfig/libical.pc %dir %{_includedir}/%{name} -%{_includedir}/%{name}/ical.h %{_includedir}/%{name}/ical*.h -%{_includedir}/%{name}/icptrholder.h %{_includedir}/%{name}/pvl.h %{_includedir}/%{name}/sspm.h -%{_includedir}/%{name}/vcomponent.h -%dir %{_includedir}/libicalvcal -%{_includedir}/libicalvcal/icalvcal.h -%{_includedir}/libicalvcal/port.h -%{_includedir}/libicalvcal/vcaltmp.h -%{_includedir}/libicalvcal/vcc.h -%{_includedir}/libicalvcal/vobject.h +%{_includedir}/%{name}/port.h +%{_includedir}/%{name}/vcaltmp.h +%{_includedir}/%{name}/vcc.h +%{_includedir}/%{name}/vobject.h %changelog +* Sun Mar 15 2009 Debarshi Ray - 0.43-4 +- Updated patch to fix #includes in the headers to work with + 'pkg-config --cflags libical'. (Red Hat Bugzilla #484091) + +* Wed Feb 25 2009 Release Engineering - 0.43-3 +- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 17 2009 Debarshi Ray - 0.43-2 +- Added patch to fix CFLAGS in libical.pc. (Red Hat Bugzilla #484091) + +* Tue Jan 13 2009 Debarshi Ray - 0.43-1 +- Version bump to 0.43. +- Added patch to fix implicit pointer conversion from Debian. (Debian BTS + #511598) +- Upstream has switched off ICAL_ERRORS_ARE_FATAL by default. This behaviour + is being retained across all distributions, including Fedora 11. +- Added 'Requires: tzdata'. +- Enabled backtrace dumps in the syslog. + +* Thu Jan 08 2009 Debarshi Ray - 0.41-2 +- Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11. + (Red Hat Bugzilla #478331) + +* Sun Nov 23 2008 Debarshi Ray - 0.41-1 +- Version bump to 0.41. (Red Hat Bugzilla #469252) +- Disabled C++ bindings. + +* Tue Oct 28 2008 Kevin Kofler - 0.40-1 +- Version bump to 0.40. (Red Hat Bugzilla #466359) +- Add patch from upstream to fix crash in icalvalue.c. +- Update makefile patch, remove the test part (already applied). +- Package libical.pc, add Requires: pkgconfig to -devel. + * Tue Sep 03 2008 Debarshi Ray - 0.32-1 - Version bump to 0.32. - Parallel build problems fixed. --- libical-0.32-makefile.patch DELETED --- From lkundrak at fedoraproject.org Sat May 2 10:00:32 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sat, 2 May 2009 10:00:32 +0000 (UTC) Subject: rpms/libical/EL-5 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <20090502100032.C769570120@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/libical/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2055 Modified Files: .cvsignore sources Log Message: Fix up the sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libical/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 2 Sep 2008 22:18:02 -0000 1.5 +++ .cvsignore 2 May 2009 10:00:02 -0000 1.6 @@ -1 +1 @@ -libical-0.32.tar.gz +libical-0.43.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libical/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 2 Sep 2008 22:18:02 -0000 1.5 +++ sources 2 May 2009 10:00:02 -0000 1.6 @@ -1 +1 @@ -7e38be0c75769e62b7f76c5b6f373db9 libical-0.32.tar.gz +5f0a1feb60894d0be537aefea5647474 libical-0.43.tar.gz From llaumgui at fedoraproject.org Sat May 2 10:41:05 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Sat, 2 May 2009 10:41:05 +0000 (UTC) Subject: rpms/php-ezc-Archive/devel import.log, NONE, 1.1 php-ezc-Archive.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502104106.05B0370120@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Archive/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10635/devel Modified Files: .cvsignore sources Added Files: import.log php-ezc-Archive.spec Log Message: Initial import branch devel --- NEW FILE import.log --- php-ezc-Archive-1_3_3-1_fc10:HEAD:php-ezc-Archive-1.3.3-1.fc10.src.rpm:1241260773 --- NEW FILE php-ezc-Archive.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Archive %define channel components.ez.no Name: php-ezc-Archive Version: 1.3.3 Release: 1%{?dist} Summary: Create, modify, and extract archive files of various formats Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-posix Requires: php-pear(%{channel}/Base) >= 1.6.1 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description The component allows you to create, modify, and extract archive files of various formats. The currently supported archives formats are Tar (with the flavours: ustar, v7, pax, and gnu) and Zip. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/archive_autoload.php %changelog * Mon Mar 30 2009 Guillaume Kulakowski - 1.3.3-1 - Update to 1.3.3 * Sun Mar 22 2009 Guillaume Kulakowski - 1.3.2-2 - Add php-posix in requires * Sun Feb 08 2009 Guillaume Kulakowski - 1.3.2-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Archive/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:48:09 -0000 1.1 +++ .cvsignore 2 May 2009 10:40:35 -0000 1.2 @@ -0,0 +1 @@ +Archive-1.3.3.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Archive/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:48:09 -0000 1.1 +++ sources 2 May 2009 10:40:35 -0000 1.2 @@ -0,0 +1 @@ +0400c9d03f8a3bba4ec3093428e7ef2a Archive-1.3.3.tgz From llaumgui at fedoraproject.org Sat May 2 10:41:07 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Sat, 2 May 2009 10:41:07 +0000 (UTC) Subject: rpms/php-ezc-Archive/F-9 import.log, NONE, 1.1 php-ezc-Archive.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502104107.A583070120@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Archive/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10656/F-9 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Archive.spec Log Message: Initial import branch F-9 --- NEW FILE import.log --- php-ezc-Archive-1_3_3-1_fc10:F-9:php-ezc-Archive-1.3.3-1.fc10.src.rpm:1241260778 --- NEW FILE php-ezc-Archive.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Archive %define channel components.ez.no Name: php-ezc-Archive Version: 1.3.3 Release: 1%{?dist} Summary: Create, modify, and extract archive files of various formats Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-posix Requires: php-pear(%{channel}/Base) >= 1.6.1 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description The component allows you to create, modify, and extract archive files of various formats. The currently supported archives formats are Tar (with the flavours: ustar, v7, pax, and gnu) and Zip. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/archive_autoload.php %changelog * Mon Mar 30 2009 Guillaume Kulakowski - 1.3.3-1 - Update to 1.3.3 * Sun Mar 22 2009 Guillaume Kulakowski - 1.3.2-2 - Add php-posix in requires * Sun Feb 08 2009 Guillaume Kulakowski - 1.3.2-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:48:09 -0000 1.1 +++ .cvsignore 2 May 2009 10:40:36 -0000 1.2 @@ -0,0 +1 @@ +Archive-1.3.3.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:48:09 -0000 1.1 +++ sources 2 May 2009 10:40:36 -0000 1.2 @@ -0,0 +1 @@ +0400c9d03f8a3bba4ec3093428e7ef2a Archive-1.3.3.tgz From llaumgui at fedoraproject.org Sat May 2 10:41:11 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Sat, 2 May 2009 10:41:11 +0000 (UTC) Subject: rpms/php-ezc-Archive/F-11 import.log, NONE, 1.1 php-ezc-Archive.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502104111.1588070120@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Archive/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10705/F-11 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Archive.spec Log Message: Initial import branch F-11 --- NEW FILE import.log --- php-ezc-Archive-1_3_3-1_fc10:F-11:php-ezc-Archive-1.3.3-1.fc10.src.rpm:1241260778 --- NEW FILE php-ezc-Archive.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Archive %define channel components.ez.no Name: php-ezc-Archive Version: 1.3.3 Release: 1%{?dist} Summary: Create, modify, and extract archive files of various formats Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-posix Requires: php-pear(%{channel}/Base) >= 1.6.1 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description The component allows you to create, modify, and extract archive files of various formats. The currently supported archives formats are Tar (with the flavours: ustar, v7, pax, and gnu) and Zip. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/archive_autoload.php %changelog * Mon Mar 30 2009 Guillaume Kulakowski - 1.3.3-1 - Update to 1.3.3 * Sun Mar 22 2009 Guillaume Kulakowski - 1.3.2-2 - Add php-posix in requires * Sun Feb 08 2009 Guillaume Kulakowski - 1.3.2-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:48:09 -0000 1.1 +++ .cvsignore 2 May 2009 10:40:40 -0000 1.2 @@ -0,0 +1 @@ +Archive-1.3.3.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:48:09 -0000 1.1 +++ sources 2 May 2009 10:40:40 -0000 1.2 @@ -0,0 +1 @@ +0400c9d03f8a3bba4ec3093428e7ef2a Archive-1.3.3.tgz From llaumgui at fedoraproject.org Sat May 2 10:41:08 2009 From: llaumgui at fedoraproject.org (Guillaume Kulakowski) Date: Sat, 2 May 2009 10:41:08 +0000 (UTC) Subject: rpms/php-ezc-Archive/F-10 import.log, NONE, 1.1 php-ezc-Archive.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502104108.E80A570120@cvs1.fedora.phx.redhat.com> Author: llaumgui Update of /cvs/pkgs/rpms/php-ezc-Archive/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10676/F-10 Modified Files: .cvsignore sources Added Files: import.log php-ezc-Archive.spec Log Message: Initial import branch F-10 --- NEW FILE import.log --- php-ezc-Archive-1_3_3-1_fc10:F-10:php-ezc-Archive-1.3.3-1.fc10.src.rpm:1241260781 --- NEW FILE php-ezc-Archive.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Archive %define channel components.ez.no Name: php-ezc-Archive Version: 1.3.3 Release: 1%{?dist} Summary: Create, modify, and extract archive files of various formats Group: Development/Libraries License: BSD URL: http://ezcomponents.org/ Source0: http://components.ez.no/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 BuildRequires: php-channel(%{channel}) Requires: php-common >= 5.2.1 Requires: php-posix Requires: php-pear(%{channel}/Base) >= 1.6.1 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description The component allows you to create, modify, and extract archive files of various formats. The currently supported archives formats are Tar (with the flavours: ustar, v7, pax, and gnu) and Zip. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{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 %{buildroot} docdir %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Move documentation mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir rm -rf %{buildroot}%{pear_docdir} # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{name}.xml %{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/archive_autoload.php %changelog * Mon Mar 30 2009 Guillaume Kulakowski - 1.3.3-1 - Update to 1.3.3 * Sun Mar 22 2009 Guillaume Kulakowski - 1.3.2-2 - Add php-posix in requires * Sun Feb 08 2009 Guillaume Kulakowski - 1.3.2-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:48:09 -0000 1.1 +++ .cvsignore 2 May 2009 10:40:38 -0000 1.2 @@ -0,0 +1 @@ +Archive-1.3.3.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:48:09 -0000 1.1 +++ sources 2 May 2009 10:40:38 -0000 1.2 @@ -0,0 +1 @@ +0400c9d03f8a3bba4ec3093428e7ef2a Archive-1.3.3.tgz From vpv at fedoraproject.org Sat May 2 10:51:39 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sat, 2 May 2009 10:51:39 +0000 (UTC) Subject: rpms/openoffice.org-voikko/devel openoffice.org-voikko.spec, 1.20, 1.21 Message-ID: <20090502105139.C985770120@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12906 Modified Files: openoffice.org-voikko.spec Log Message: note: 3.1rc2 equals 3.1 Index: openoffice.org-voikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- openoffice.org-voikko.spec 13 Apr 2009 12:34:44 -0000 1.20 +++ openoffice.org-voikko.spec 2 May 2009 10:51:09 -0000 1.21 @@ -1,3 +1,6 @@ +# Note: openoffice.org-voikko 3.1 rc2 was released as stable, there is no need +# to do an update to openoffice.org-voikko 3.1, even the cheksums in the +# tarballs match. Name: openoffice.org-voikko Version: 3.1 Release: 0.2.rc2%{?dist} From vpv at fedoraproject.org Sat May 2 10:52:45 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sat, 2 May 2009 10:52:45 +0000 (UTC) Subject: rpms/openoffice.org-voikko/F-11 openoffice.org-voikko.spec, 1.20, 1.21 Message-ID: <20090502105245.8D86170120@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/openoffice.org-voikko/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13165 Modified Files: openoffice.org-voikko.spec Log Message: note: 3.1rc2 equals 3.1 Index: openoffice.org-voikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/F-11/openoffice.org-voikko.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- openoffice.org-voikko.spec 13 Apr 2009 12:34:44 -0000 1.20 +++ openoffice.org-voikko.spec 2 May 2009 10:52:15 -0000 1.21 @@ -1,3 +1,6 @@ +# Note: openoffice.org-voikko 3.1 rc2 was released as stable, there is no need +# to do an update to openoffice.org-voikko 3.1, even the cheksums in the +# tarballs match. Name: openoffice.org-voikko Version: 3.1 Release: 0.2.rc2%{?dist} From vpv at fedoraproject.org Sat May 2 11:42:42 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sat, 2 May 2009 11:42:42 +0000 (UTC) Subject: rpms/mozvoikko/devel mozvoikko.spec,1.9,1.10 Message-ID: <20090502114242.2F69770120@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/mozvoikko/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24741 Modified Files: mozvoikko.spec Log Message: note: 0.9.7rc1 practically equals 1.0 Index: mozvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- mozvoikko.spec 28 Apr 2009 03:29:57 -0000 1.9 +++ mozvoikko.spec 2 May 2009 11:42:10 -0000 1.10 @@ -1,3 +1,9 @@ +# Note: The newest stable upstream release of mozvoikko is 1.0, but there were +# no code changes compared to 0.9.7rc1, only changes to the application +# version limits in install.rdf. For this packaged xulrunner-based version +# the Makefile.xulrunner edits the maxVersions to *, so there is no reason to +# update this package to 1.0. + # For the xulrunner unstable requires %define gecko_ver 1.9.1 # These come from install.rdf From vpv at fedoraproject.org Sat May 2 11:43:24 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sat, 2 May 2009 11:43:24 +0000 (UTC) Subject: rpms/mozvoikko/F-11 mozvoikko.spec,1.9,1.10 Message-ID: <20090502114324.E359470120@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/mozvoikko/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24882 Modified Files: mozvoikko.spec Log Message: note: 0.9.7rc1 practically equals 1.0 Index: mozvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/F-11/mozvoikko.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- mozvoikko.spec 27 Apr 2009 23:10:20 -0000 1.9 +++ mozvoikko.spec 2 May 2009 11:42:54 -0000 1.10 @@ -1,3 +1,9 @@ +# Note: The newest stable upstream release of mozvoikko is 1.0, but there were +# no code changes compared to 0.9.7rc1, only changes to the application +# version limits in install.rdf. For this packaged xulrunner-based version +# the Makefile.xulrunner edits the maxVersions to *, so there is no reason to +# update this package to 1.0. + # For the xulrunner unstable requires %define gecko_ver 1.9.1 # These come from install.rdf From dwalsh at fedoraproject.org Sat May 2 11:52:44 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Sat, 2 May 2009 11:52:44 +0000 (UTC) Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.126, 1.127 policy-20090105.patch, 1.106, 1.107 selinux-policy.spec, 1.843, 1.844 Message-ID: <20090502115244.43FA470120@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26422 Modified Files: modules-targeted.conf policy-20090105.patch selinux-policy.spec Log Message: * Fri May 1 2009 Dan Walsh 3.6.12-27 - Fix /sbin/ip6tables-save context Index: modules-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- modules-targeted.conf 30 Apr 2009 22:21:59 -0000 1.126 +++ modules-targeted.conf 2 May 2009 11:52:11 -0000 1.127 @@ -994,7 +994,7 @@ portmap = module # postfix = module -o# Layer: services +# Layer: services # Module: postgrey # # email scanner policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.106 retrieving revision 1.107 diff -u -p -r1.106 -r1.107 --- policy-20090105.patch 30 Apr 2009 22:21:59 -0000 1.106 +++ policy-20090105.patch 2 May 2009 11:52:11 -0000 1.107 @@ -4479,6 +4479,41 @@ diff -b -B --ignore-all-space --exclude- +') + +permissive sambagui_t; +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.6.12/policy/modules/apps/screen.fc +--- nsaserefpolicy/policy/modules/apps/screen.fc 2008-11-11 16:13:42.000000000 -0500 ++++ serefpolicy-3.6.12/policy/modules/apps/screen.fc 2009-05-02 07:46:25.000000000 -0400 +@@ -13,3 +13,4 @@ + # + /var/run/screens?/S-[^/]+ -d gen_context(system_u:object_r:screen_dir_t,s0) + /var/run/screens?/S-[^/]+/.* <> ++/var/run/screen(/.*)? gen_context(system_u:object_r:screen_var_run_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.6.12/policy/modules/apps/screen.if +--- nsaserefpolicy/policy/modules/apps/screen.if 2009-01-19 11:03:28.000000000 -0500 ++++ serefpolicy-3.6.12/policy/modules/apps/screen.if 2009-05-02 07:49:38.000000000 -0400 +@@ -165,3 +165,23 @@ + nscd_socket_use($1_screen_t) + ') + ') ++ ++######################################## ++## ++## Manage screen var_run files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`screen_manage_var_run',` ++ gen_require(` ++ type screen_var_run_t; ++ ') ++ ++ manage_dirs_pattern($1,screen_var_run_t,screen_var_run_t) ++ manage_files_pattern($1,screen_var_run_t,screen_var_run_t) ++ manage_lnk_files_pattern($1,screen_var_run_t,screen_var_run_t) ++') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.te serefpolicy-3.6.12/policy/modules/apps/uml.te --- nsaserefpolicy/policy/modules/apps/uml.te 2009-01-19 11:03:28.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/apps/uml.te 2009-04-28 11:42:33.000000000 -0400 @@ -6039,7 +6074,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.6.12/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2009-02-03 22:50:50.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/kernel.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/kernel.te 2009-05-01 13:41:10.000000000 -0400 @@ -63,6 +63,15 @@ genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0) @@ -6056,7 +6091,15 @@ diff -b -B --ignore-all-space --exclude- # kvmFS # -@@ -120,6 +129,10 @@ +@@ -100,6 +109,7 @@ + genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) + + type proc_xen_t, proc_type; ++files_mountpoint(proc_xen_t) + genfscon proc /xen gen_context(system_u:object_r:proc_xen_t,s0) + + # +@@ -120,6 +130,10 @@ type sysctl_rpc_t, sysctl_type; genfscon proc /net/rpc gen_context(system_u:object_r:sysctl_rpc_t,s0) @@ -6067,7 +6110,7 @@ diff -b -B --ignore-all-space --exclude- # /proc/sys/fs directory and files type sysctl_fs_t, sysctl_type; files_mountpoint(sysctl_fs_t) -@@ -160,6 +173,7 @@ +@@ -160,6 +174,7 @@ # type unlabeled_t; sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) @@ -6075,7 +6118,7 @@ diff -b -B --ignore-all-space --exclude- # These initial sids are no longer used, and can be removed: sid any_socket gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) -@@ -198,6 +212,8 @@ +@@ -198,6 +213,8 @@ allow kernel_t self:sock_file read_sock_file_perms; allow kernel_t self:fd use; @@ -6084,7 +6127,7 @@ diff -b -B --ignore-all-space --exclude- allow kernel_t proc_t:dir list_dir_perms; allow kernel_t proc_t:file read_file_perms; allow kernel_t proc_t:lnk_file read_lnk_file_perms; -@@ -248,7 +264,8 @@ +@@ -248,7 +265,8 @@ selinux_load_policy(kernel_t) @@ -6094,7 +6137,7 @@ diff -b -B --ignore-all-space --exclude- corecmd_exec_shell(kernel_t) corecmd_list_bin(kernel_t) -@@ -262,6 +279,8 @@ +@@ -262,6 +280,8 @@ files_list_etc(kernel_t) files_list_home(kernel_t) files_read_usr_files(kernel_t) @@ -6103,7 +6146,7 @@ diff -b -B --ignore-all-space --exclude- mcs_process_set_categories(kernel_t) -@@ -269,12 +288,18 @@ +@@ -269,12 +289,18 @@ mls_process_write_down(kernel_t) mls_file_write_all_levels(kernel_t) mls_file_read_all_levels(kernel_t) @@ -6122,7 +6165,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`read_default_t',` files_list_default(kernel_t) files_read_default_files(kernel_t) -@@ -356,7 +381,11 @@ +@@ -356,7 +382,11 @@ ') optional_policy(` @@ -6135,7 +6178,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -388,3 +417,7 @@ +@@ -388,3 +418,7 @@ allow kern_unconfined unlabeled_t:association *; allow kern_unconfined unlabeled_t:packet *; allow kern_unconfined unlabeled_t:process ~{ transition dyntransition execmem execstack execheap }; @@ -6257,48 +6300,46 @@ diff -b -B --ignore-all-space --exclude- +gen_user(guest_u, user, guest_r, s0, s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.6.12/policy/modules/roles/staff.te --- nsaserefpolicy/policy/modules/roles/staff.te 2008-11-11 16:13:47.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/roles/staff.te 2009-04-23 09:44:57.000000000 -0400 -@@ -15,156 +15,90 @@ ++++ serefpolicy-3.6.12/policy/modules/roles/staff.te 2009-05-02 07:50:07.000000000 -0400 +@@ -15,156 +15,95 @@ # Local policy # -optional_policy(` - apache_role(staff_r, staff_t) -') -- --optional_policy(` -- auth_role(staff_r, staff_t) --') -- --optional_policy(` -- auditadm_role_change(staff_r) --') +kernel_read_ring_buffer(staff_t) +kernel_getattr_core_if(staff_t) +kernel_getattr_message_if(staff_t) +kernel_read_software_raid_state(staff_t) -optional_policy(` -- bluetooth_role(staff_r, staff_t) +- auth_role(staff_r, staff_t) -') +auth_domtrans_pam_console(staff_t) -optional_policy(` -- cdrecord_role(staff_r, staff_t) +- auditadm_role_change(staff_r) -') +libs_manage_shared_libs(staff_t) -optional_policy(` +- bluetooth_role(staff_r, staff_t) +-') +- +-optional_policy(` +- cdrecord_role(staff_r, staff_t) +-') +- +-optional_policy(` - cron_role(staff_r, staff_t) -') - -optional_policy(` - dbus_role_template(staff, staff_r, staff_t) -') -+seutil_run_newrole(staff_t, staff_r) -+netutils_run_ping(staff_t, staff_r) - - optional_policy(` +- +-optional_policy(` - ethereal_role(staff_r, staff_t) -') - @@ -6317,8 +6358,10 @@ diff -b -B --ignore-all-space --exclude- -optional_policy(` - gnome_role(staff_r, staff_t) -') -- --optional_policy(` ++seutil_run_newrole(staff_t, staff_r) ++netutils_run_ping(staff_t, staff_r) + + optional_policy(` - gpg_role(staff_r, staff_t) -') - @@ -6332,122 +6375,123 @@ diff -b -B --ignore-all-space --exclude- - -optional_policy(` - lockdev_role(staff_r, staff_t) --') -- --optional_policy(` -- lpd_role(staff_r, staff_t) --') -- --optional_policy(` -- mozilla_role(staff_r, staff_t) + sudo_role_template(staff, staff_r, staff_t) ') optional_policy(` -- mplayer_role(staff_r, staff_t) +- lpd_role(staff_r, staff_t) + auditadm_role_change(staff_r) ') optional_policy(` -- mta_role(staff_r, staff_t) +- mozilla_role(staff_r, staff_t) + kerneloops_manage_tmp_files(staff_t) ') optional_policy(` -- oident_manage_user_content(staff_t) -- oident_relabel_user_content(staff_t) +- mplayer_role(staff_r, staff_t) + logadm_role_change(staff_r) ') optional_policy(` -- pyzor_role(staff_r, staff_t) +- mta_role(staff_r, staff_t) + secadm_role_change(staff_r) ') optional_policy(` -- razor_role(staff_r, staff_t) +- oident_manage_user_content(staff_t) +- oident_relabel_user_content(staff_t) + ssh_role_template(staff, staff_r, staff_t) ') optional_policy(` -- rssh_role(staff_r, staff_t) +- pyzor_role(staff_r, staff_t) + sysadm_role_change(staff_r) ') optional_policy(` -- screen_role_template(staff, staff_r, staff_t) +- razor_role(staff_r, staff_t) + usernetctl_run(staff_t, staff_r) ') optional_policy(` -- secadm_role_change(staff_r) +- rssh_role(staff_r, staff_t) + unconfined_role_change(staff_r) ') optional_policy(` -- spamassassin_role(staff_r, staff_t) +- screen_role_template(staff, staff_r, staff_t) + webadm_role_change(staff_r) ') -optional_policy(` -- ssh_role_template(staff, staff_r, staff_t) +- secadm_role_change(staff_r) -') +domain_read_all_domains_state(staff_t) +domain_getattr_all_domains(staff_t) +domain_obj_id_change_exemption(staff_t) -optional_policy(` -- su_role_template(staff, staff_r, staff_t) +- spamassassin_role(staff_r, staff_t) -') +files_read_kernel_modules(staff_t) -optional_policy(` -- sudo_role_template(staff, staff_r, staff_t) +- ssh_role_template(staff, staff_r, staff_t) -') +kernel_read_fs_sysctls(staff_t) -optional_policy(` -- sysadm_role_change(staff_r) -- userdom_dontaudit_use_user_terminals(staff_t) +- su_role_template(staff, staff_r, staff_t) -') +modutils_read_module_config(staff_t) +modutils_read_module_deps(staff_t) -optional_policy(` -- thunderbird_role(staff_r, staff_t) +- sudo_role_template(staff, staff_r, staff_t) -') +miscfiles_read_hwdata(staff_t) -optional_policy(` -- tvtime_role(staff_r, staff_t) +- sysadm_role_change(staff_r) +- userdom_dontaudit_use_user_terminals(staff_t) -') +term_use_unallocated_ttys(staff_t) optional_policy(` -- uml_role(staff_r, staff_t) +- thunderbird_role(staff_r, staff_t) + gnomeclock_dbus_chat(staff_t) ') optional_policy(` -- userhelper_role_template(staff, staff_r, staff_t) +- tvtime_role(staff_r, staff_t) + kerneloops_dbus_chat(staff_t) ') optional_policy(` -- vmware_role(staff_r, staff_t) +- uml_role(staff_r, staff_t) + rpm_dbus_chat(staff_usertype) ') optional_policy(` -- wireshark_role(staff_r, staff_t) +- userhelper_role_template(staff, staff_r, staff_t) ++ screen_manage_var_run(staff_t) + ') + + optional_policy(` +- vmware_role(staff_r, staff_t) + setroubleshoot_stream_connect(staff_t) + setroubleshoot_dbus_chat(staff_t) ') optional_policy(` -- xserver_role(staff_r, staff_t) +- wireshark_role(staff_r, staff_t) + virt_stream_connect(staff_t) ') + +-optional_policy(` +- xserver_role(staff_r, staff_t) +-') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.if serefpolicy-3.6.12/policy/modules/roles/sysadm.if --- nsaserefpolicy/policy/modules/roles/sysadm.if 2009-01-19 11:07:34.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/roles/sysadm.if 2009-04-23 09:44:57.000000000 -0400 @@ -12280,7 +12324,7 @@ diff -b -B --ignore-all-space --exclude- +/var/run/DeviceKit-disk(/.*)? gen_context(system_u:object_r:devicekit_var_run_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.6.12/policy/modules/services/devicekit.if --- nsaserefpolicy/policy/modules/services/devicekit.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/devicekit.if 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/devicekit.if 2009-05-02 07:48:49.000000000 -0400 @@ -0,0 +1,197 @@ + +## policy for devicekit @@ -13432,8 +13476,8 @@ diff -b -B --ignore-all-space --exclude- +/usr/libexec/fprintd -- gen_context(system_u:object_r:fprintd_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.if serefpolicy-3.6.12/policy/modules/services/fprintd.if --- nsaserefpolicy/policy/modules/services/fprintd.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/fprintd.if 2009-04-28 15:26:38.000000000 -0400 -@@ -0,0 +1,22 @@ ++++ serefpolicy-3.6.12/policy/modules/services/fprintd.if 2009-05-01 09:45:48.000000000 -0400 +@@ -0,0 +1,42 @@ + +## policy for fprintd + @@ -13456,6 +13500,26 @@ diff -b -B --ignore-all-space --exclude- + domtrans_pattern($1,fprintd_exec_t,fprintd_t) +') + ++######################################## ++## ++## Send and receive messages from ++## fprintd over dbus. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fprintd_dbus_chat',` ++ gen_require(` ++ type fprintd_t; ++ class dbus send_msg; ++ ') ++ ++ allow $1 fprintd_t:dbus send_msg; ++ allow fprintd_t $1:dbus send_msg; ++') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.12/policy/modules/services/fprintd.te --- nsaserefpolicy/policy/modules/services/fprintd.te 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/services/fprintd.te 2009-04-29 10:10:42.000000000 -0400 @@ -14625,7 +14689,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.6.12/policy/modules/services/kerneloops.te --- nsaserefpolicy/policy/modules/services/kerneloops.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/kerneloops.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/kerneloops.te 2009-05-01 13:21:26.000000000 -0400 @@ -13,6 +13,9 @@ type kerneloops_initrc_exec_t; init_script_file(kerneloops_initrc_exec_t) @@ -14636,13 +14700,15 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # kerneloops local policy -@@ -23,8 +26,13 @@ +@@ -21,10 +24,14 @@ + allow kerneloops_t self:capability sys_nice; + allow kerneloops_t self:process { setsched getsched signal }; allow kerneloops_t self:fifo_file rw_file_perms; - allow kerneloops_t self:netlink_route_socket r_netlink_socket_perms; - +-allow kerneloops_t self:netlink_route_socket r_netlink_socket_perms; ++ +manage_files_pattern(kerneloops_t, kerneloops_tmp_t, kerneloops_tmp_t) +files_tmp_filetrans(kerneloops_t,kerneloops_tmp_t,file) -+ + kernel_read_ring_buffer(kerneloops_t) +fs_list_inotifyfs(kerneloops_t) @@ -14650,9 +14716,19 @@ diff -b -B --ignore-all-space --exclude- # Init script handling domain_use_interactive_fds(kerneloops_t) -@@ -46,6 +54,5 @@ - sysnet_dns_name_resolve(kerneloops_t) +@@ -38,14 +45,13 @@ + + files_read_etc_files(kerneloops_t) + ++auth_use_nsswitch(kerneloops_t) ++ + logging_send_syslog_msg(kerneloops_t) + logging_read_generic_logs(kerneloops_t) + + miscfiles_read_localization(kerneloops_t) +-sysnet_dns_name_resolve(kerneloops_t) +- optional_policy(` - dbus_system_bus_client(kerneloops_t) - dbus_connect_system_bus(kerneloops_t) @@ -25914,7 +25990,7 @@ diff -b -B --ignore-all-space --exclude- +/var/cache/coolkey(/.*)? gen_context(system_u:object_r:auth_cache_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.12/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/authlogin.if 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/authlogin.if 2009-05-01 09:46:46.000000000 -0400 @@ -43,20 +43,38 @@ interface(`auth_login_pgm_domain',` gen_require(` @@ -25962,7 +26038,7 @@ diff -b -B --ignore-all-space --exclude- init_rw_utmp($1) -@@ -100,11 +119,40 @@ +@@ -100,9 +119,42 @@ seutil_read_config($1) seutil_read_default_contexts($1) @@ -25975,16 +26051,16 @@ diff -b -B --ignore-all-space --exclude- + + optional_policy(` + afs_rw_udp_sockets($1) -+ ') + ') + + optional_policy(` + dbus_system_bus_client($1) + optional_policy(` + oddjob_dbus_chat($1) + oddjob_domtrans_mkhomedir($1) - ') - ') - ++ ') ++') ++ + optional_policy(` + corecmd_exec_bin($1) + storage_getattr_fixed_disk_dev($1) @@ -25992,6 +26068,10 @@ diff -b -B --ignore-all-space --exclude- + ') + + optional_policy(` ++ fprintd_dbus_chat($1) ++ ') ++ ++ optional_policy(` + nis_authenticate($1) + ') + @@ -26000,12 +26080,10 @@ diff -b -B --ignore-all-space --exclude- + userdom_read_user_home_content_files($1) + ') + -+') -+ + ') + ######################################## - ## - ## Use the login program as an entry point program. -@@ -197,8 +245,11 @@ +@@ -197,8 +249,11 @@ interface(`auth_domtrans_chk_passwd',` gen_require(` type chkpwd_t, chkpwd_exec_t, shadow_t; @@ -26017,7 +26095,7 @@ diff -b -B --ignore-all-space --exclude- corecmd_search_bin($1) domtrans_pattern($1, chkpwd_exec_t, chkpwd_t) -@@ -207,19 +258,16 @@ +@@ -207,19 +262,16 @@ dev_read_rand($1) dev_read_urand($1) @@ -26042,7 +26120,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -230,6 +278,29 @@ +@@ -230,6 +282,29 @@ optional_policy(` samba_stream_connect_winbind($1) ') @@ -26072,7 +26150,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -254,6 +325,7 @@ +@@ -254,6 +329,7 @@ auth_domtrans_chk_passwd($1) role $2 types chkpwd_t; @@ -26080,7 +26158,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -650,7 +722,7 @@ +@@ -650,7 +726,7 @@ ######################################## ## @@ -26089,7 +26167,7 @@ diff -b -B --ignore-all-space --exclude- ## ## ## -@@ -1031,6 +1103,32 @@ +@@ -1031,6 +1107,32 @@ ######################################## ## @@ -26122,7 +26200,7 @@ diff -b -B --ignore-all-space --exclude- ## Manage all files on the filesystem, except ## the shadow passwords and listed exceptions. ## -@@ -1297,6 +1395,14 @@ +@@ -1297,6 +1399,14 @@ ') optional_policy(` @@ -26137,7 +26215,7 @@ diff -b -B --ignore-all-space --exclude- nis_use_ypbind($1) ') -@@ -1305,8 +1411,13 @@ +@@ -1305,8 +1415,13 @@ ') optional_policy(` @@ -26151,7 +26229,7 @@ diff -b -B --ignore-all-space --exclude- ') ') -@@ -1341,3 +1452,99 @@ +@@ -1341,3 +1456,99 @@ typeattribute $1 can_write_shadow_passwords; typeattribute $1 can_relabelto_shadow_passwords; ') @@ -27102,9 +27180,9 @@ diff -b -B --ignore-all-space --exclude- dev_read_urand(racoon_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.6.12/policy/modules/system/iptables.fc --- nsaserefpolicy/policy/modules/system/iptables.fc 2009-04-06 12:42:08.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/system/iptables.fc 2009-04-30 08:29:56.000000000 -0400 -@@ -1,9 +1,11 @@ - /sbin/ip6tables.* -- gen_context(system_u:object_r:iptables_exec_t,s0) ++++ serefpolicy-3.6.12/policy/modules/system/iptables.fc 2009-04-30 18:57:54.000000000 -0400 +@@ -1,9 +1,10 @@ +-/sbin/ip6tables.* -- gen_context(system_u:object_r:iptables_exec_t,s0) /sbin/ipchains.* -- gen_context(system_u:object_r:iptables_exec_t,s0) -/sbin/iptables.* -- gen_context(system_u:object_r:iptables_exec_t,s0) +/sbin/ip6?tables -- gen_context(system_u:object_r:iptables_exec_t,s0) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.843 retrieving revision 1.844 diff -u -p -r1.843 -r1.844 --- selinux-policy.spec 30 Apr 2009 22:22:00 -0000 1.843 +++ selinux-policy.spec 2 May 2009 11:52:13 -0000 1.844 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.12 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -480,6 +480,9 @@ exit 0 %endif %changelog +* Fri May 1 2009 Dan Walsh 3.6.12-27 +- Fix /sbin/ip6tables-save context + * Thu Apr 30 2009 Dan Walsh 3.6.12-26 - Add shorewall policy From rishi at fedoraproject.org Sat May 2 11:52:41 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Sat, 2 May 2009 11:52:41 +0000 (UTC) Subject: rpms/gajim/F-11 gajim.spec,1.31,1.32 Message-ID: <20090502115242.1E7B070120@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26484 Modified Files: gajim.spec Log Message: * Sat May 02 2009 Debarshi Ray - 0.12.1-3 - Added 'Requires: gnome-python2-bonobo'. (Red Hat Bugzilla #470181) Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/F-11/gajim.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- gajim.spec 24 Feb 2009 19:38:51 -0000 1.31 +++ gajim.spec 2 May 2009 11:52:10 -0000 1.32 @@ -3,7 +3,7 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ @@ -20,6 +20,7 @@ Requires: dbus-python Requires: gnome-python2-gnome %endif +Requires: gnome-python2-bonobo Requires: gnome-python2-canvas Requires: notify-python Requires: pygtk2-libglade @@ -102,6 +103,9 @@ rm -rf %{buildroot} %{python_sitearch}/%{name}/trayicon.so %changelog +* Sat May 02 2009 Debarshi Ray - 0.12.1-3 +- Added 'Requires: gnome-python2-bonobo'. (Red Hat Bugzilla #470181) + * Tue Feb 24 2009 Release Engineering - 0.12.1-2 - Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -115,8 +119,8 @@ rm -rf %{buildroot} - Added 'Requires: notify-python python-kerberos'. * Sun Nov 30 2008 Debarshi Ray - 0.12-0.1.beta1 -- Version bump to 0.12 beta1. Closes Red Hat Bugzilla bug #471295. -- Added 'Requires: pyOpenSSL'. Addresses Red Hat Bugzilla bug #467523. +- Version bump to 0.12 beta1. (Red Hat Bugzilla #471295) +- Added 'Requires: pyOpenSSL'. (Red Hat Bugzilla #467523) - Added 'Requires: python-sexy'. * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.11.4-7 @@ -124,7 +128,7 @@ rm -rf %{buildroot} * Sun Nov 09 2008 Debarshi Ray - 0.11.4-6 - Added 'Requires: gnome-python2-gnome' on all distributions starting from - Fedora 10. Closes Red Hat Bugzilla bug #470181. + Fedora 10. (Red Hat Bugzilla #470181) * Tue Oct 28 2008 Debarshi Ray - 0.11.4-5 - Added 'Requires: avahi-tools'. @@ -134,7 +138,7 @@ rm -rf %{buildroot} * 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. +- Added 'Requires: gnome-python2-canvas'. (Red Hat Bugzilla #454622) - Removed 'BuildRequires: pkgconfig' and dropped version from 'BuildRequires: pygtk2-devel'. - Fixed docdir and removed empty README. From rishi at fedoraproject.org Sat May 2 11:53:46 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Sat, 2 May 2009 11:53:46 +0000 (UTC) Subject: rpms/gajim/devel gajim.spec,1.31,1.32 Message-ID: <20090502115346.EE3C170120@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26856 Modified Files: gajim.spec Log Message: * Sat May 02 2009 Debarshi Ray - 0.12.1-3 - Added 'Requires: gnome-python2-bonobo'. (Red Hat Bugzilla #470181) Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/devel/gajim.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- gajim.spec 24 Feb 2009 19:38:51 -0000 1.31 +++ gajim.spec 2 May 2009 11:53:16 -0000 1.32 @@ -3,7 +3,7 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ @@ -20,6 +20,7 @@ Requires: dbus-python Requires: gnome-python2-gnome %endif +Requires: gnome-python2-bonobo Requires: gnome-python2-canvas Requires: notify-python Requires: pygtk2-libglade @@ -102,6 +103,9 @@ rm -rf %{buildroot} %{python_sitearch}/%{name}/trayicon.so %changelog +* Sat May 02 2009 Debarshi Ray - 0.12.1-3 +- Added 'Requires: gnome-python2-bonobo'. (Red Hat Bugzilla #470181) + * Tue Feb 24 2009 Release Engineering - 0.12.1-2 - Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -115,8 +119,8 @@ rm -rf %{buildroot} - Added 'Requires: notify-python python-kerberos'. * Sun Nov 30 2008 Debarshi Ray - 0.12-0.1.beta1 -- Version bump to 0.12 beta1. Closes Red Hat Bugzilla bug #471295. -- Added 'Requires: pyOpenSSL'. Addresses Red Hat Bugzilla bug #467523. +- Version bump to 0.12 beta1. (Red Hat Bugzilla #471295) +- Added 'Requires: pyOpenSSL'. (Red Hat Bugzilla #467523) - Added 'Requires: python-sexy'. * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.11.4-7 @@ -124,7 +128,7 @@ rm -rf %{buildroot} * Sun Nov 09 2008 Debarshi Ray - 0.11.4-6 - Added 'Requires: gnome-python2-gnome' on all distributions starting from - Fedora 10. Closes Red Hat Bugzilla bug #470181. + Fedora 10. (Red Hat Bugzilla #470181) * Tue Oct 28 2008 Debarshi Ray - 0.11.4-5 - Added 'Requires: avahi-tools'. @@ -134,7 +138,7 @@ rm -rf %{buildroot} * 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. +- Added 'Requires: gnome-python2-canvas'. (Red Hat Bugzilla #454622) - Removed 'BuildRequires: pkgconfig' and dropped version from 'BuildRequires: pygtk2-devel'. - Fixed docdir and removed empty README. From rishi at fedoraproject.org Sat May 2 11:55:54 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Sat, 2 May 2009 11:55:54 +0000 (UTC) Subject: rpms/gajim/F-9 gajim.spec,1.27,1.28 Message-ID: <20090502115554.DD91B70120@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27358 Modified Files: gajim.spec Log Message: * Sat May 02 2009 Debarshi Ray - 0.12.1-3 - Added 'Requires: gnome-python2-bonobo'. (Red Hat Bugzilla #470181) Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/F-9/gajim.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- gajim.spec 23 Dec 2008 19:56:06 -0000 1.27 +++ gajim.spec 2 May 2009 11:55:24 -0000 1.28 @@ -3,7 +3,7 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.12.1 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ @@ -20,6 +20,7 @@ Requires: dbus-python Requires: gnome-python2-gnome %endif +Requires: gnome-python2-bonobo Requires: gnome-python2-canvas Requires: notify-python Requires: pygtk2-libglade @@ -102,6 +103,12 @@ rm -rf %{buildroot} %{python_sitearch}/%{name}/trayicon.so %changelog +* Sat May 02 2009 Debarshi Ray - 0.12.1-3 +- Added 'Requires: gnome-python2-bonobo'. (Red Hat Bugzilla #470181) + +* Tue Feb 24 2009 Release Engineering - 0.12.1-2 +- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Dec 23 2008 Debarshi Ray - 0.12.1-1 - Version bump to 0.12.1. - /usr/share/gajim/src/gajim-{remote}.py need not contain shebangs nor have the @@ -112,8 +119,8 @@ rm -rf %{buildroot} - Added 'Requires: notify-python python-kerberos'. * Sun Nov 30 2008 Debarshi Ray - 0.12-0.1.beta1 -- Version bump to 0.12 beta1. Closes Red Hat Bugzilla bug #471295. -- Added 'Requires: pyOpenSSL'. Addresses Red Hat Bugzilla bug #467523. +- Version bump to 0.12 beta1. (Red Hat Bugzilla #471295) +- Added 'Requires: pyOpenSSL'. (Red Hat Bugzilla #467523) - Added 'Requires: python-sexy'. * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.11.4-7 @@ -121,7 +128,7 @@ rm -rf %{buildroot} * Sun Nov 09 2008 Debarshi Ray - 0.11.4-6 - Added 'Requires: gnome-python2-gnome' on all distributions starting from - Fedora 10. Closes Red Hat Bugzilla bug #470181. + Fedora 10. (Red Hat Bugzilla #470181) * Tue Oct 28 2008 Debarshi Ray - 0.11.4-5 - Added 'Requires: avahi-tools'. @@ -131,7 +138,7 @@ rm -rf %{buildroot} * 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. +- Added 'Requires: gnome-python2-canvas'. (Red Hat Bugzilla #454622) - Removed 'BuildRequires: pkgconfig' and dropped version from 'BuildRequires: pygtk2-devel'. - Fixed docdir and removed empty README. From andriy at fedoraproject.org Sat May 2 12:00:06 2009 From: andriy at fedoraproject.org (Andy Shevchenko) Date: Sat, 2 May 2009 12:00:06 +0000 (UTC) Subject: rpms/uniconvertor/devel UniConvertor-1.1.3-wmfsaver-fix.patch, NONE, 1.1 uniconvertor.spec, 1.16, 1.17 Message-ID: <20090502120006.BBC1070120@cvs1.fedora.phx.redhat.com> Author: andriy Update of /cvs/extras/rpms/uniconvertor/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4149 Modified Files: uniconvertor.spec Added Files: UniConvertor-1.1.3-wmfsaver-fix.patch Log Message: Fix WMF saver UniConvertor-1.1.3-wmfsaver-fix.patch: --- NEW FILE UniConvertor-1.1.3-wmfsaver-fix.patch --- diff -up UniConvertor-1.1.3/src/app/plugins/Filters/wmfsaver.py.orig UniConvertor-1.1.3/src/app/plugins/Filters/wmfsaver.py --- UniConvertor-1.1.3/src/app/plugins/Filters/wmfsaver.py.orig 2008-02-11 00:51:40.000000000 +0200 +++ UniConvertor-1.1.3/src/app/plugins/Filters/wmfsaver.py 2009-05-02 14:51:41.000000000 +0300 @@ -457,6 +457,7 @@ class WMFSaver: #end def save(document, file, filename, options = {}): + file = open(filename, 'wb') saver = WMFSaver(file, filename, options) saver.SaveDocument(document) saver.close() Index: uniconvertor.spec =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/devel/uniconvertor.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- uniconvertor.spec 25 Feb 2009 23:00:29 -0000 1.16 +++ uniconvertor.spec 2 May 2009 11:59:35 -0000 1.17 @@ -2,7 +2,7 @@ Name: uniconvertor Version: 1.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal vector graphics translator Group: Applications/Multimedia @@ -16,6 +16,8 @@ Patch1: UniConvertor-1.1.1-renam Patch2: UniConvertor-1.1.1-use-exec.patch # Upstream notified via forum: http://sk1project.org/forum/topic.php?forum=2&topic=62 Patch3: UniConvertor-1.1.3-cover_by_func.patch +# Fix issue, patch published here: http://sk1project.org/forum/topic.php?forum=2&topic=63 +Patch4: UniConvertor-1.1.3-wmfsaver-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -34,6 +36,7 @@ It uses sK1 engine to convert one format %patch1 -p1 -b .rename-in-help %patch2 -p1 -b .use-exec %patch3 -p1 -b .cover_by_func +%patch4 -p1 -b .wmfsaver-fix # Prepare for inclusion into documentation part install -p -m644 src/COPYRIGHTS COPYRIGHTS @@ -80,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 02 2009 Andy Shevchenko - 1.1.3-6 +- Fix WMF saver + * Wed Feb 25 2009 Fedora Release Engineering - 1.1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rishi at fedoraproject.org Sat May 2 12:01:44 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Sat, 2 May 2009 12:01:44 +0000 (UTC) Subject: rpms/gajim/F-10 gajim.spec,1.28,1.29 Message-ID: <20090502120144.3C81070120@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10398 Modified Files: gajim.spec Log Message: * Sat May 02 2009 Debarshi Ray - 0.12.1-3 - Added 'Requires: gnome-python2-bonobo'. (Red Hat Bugzilla #470181) Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/F-10/gajim.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- gajim.spec 23 Dec 2008 20:00:28 -0000 1.28 +++ gajim.spec 2 May 2009 12:01:13 -0000 1.29 @@ -3,7 +3,7 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.12.1 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ @@ -20,6 +20,7 @@ Requires: dbus-python Requires: gnome-python2-gnome %endif +Requires: gnome-python2-bonobo Requires: gnome-python2-canvas Requires: notify-python Requires: pygtk2-libglade @@ -102,6 +103,12 @@ rm -rf %{buildroot} %{python_sitearch}/%{name}/trayicon.so %changelog +* Sat May 02 2009 Debarshi Ray - 0.12.1-3 +- Added 'Requires: gnome-python2-bonobo'. (Red Hat Bugzilla #470181) + +* Tue Feb 24 2009 Release Engineering - 0.12.1-2 +- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Dec 23 2008 Debarshi Ray - 0.12.1-1 - Version bump to 0.12.1. - /usr/share/gajim/src/gajim-{remote}.py need not contain shebangs nor have the @@ -112,8 +119,8 @@ rm -rf %{buildroot} - Added 'Requires: notify-python python-kerberos'. * Sun Nov 30 2008 Debarshi Ray - 0.12-0.1.beta1 -- Version bump to 0.12 beta1. Closes Red Hat Bugzilla bug #471295. -- Added 'Requires: pyOpenSSL'. Addresses Red Hat Bugzilla bug #467523. +- Version bump to 0.12 beta1. (Red Hat Bugzilla #471295) +- Added 'Requires: pyOpenSSL'. (Red Hat Bugzilla #467523) - Added 'Requires: python-sexy'. * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.11.4-7 @@ -121,7 +128,7 @@ rm -rf %{buildroot} * Sun Nov 09 2008 Debarshi Ray - 0.11.4-6 - Added 'Requires: gnome-python2-gnome' on all distributions starting from - Fedora 10. Closes Red Hat Bugzilla bug #470181. + Fedora 10. (Red Hat Bugzilla #470181) * Tue Oct 28 2008 Debarshi Ray - 0.11.4-5 - Added 'Requires: avahi-tools'. @@ -131,7 +138,7 @@ rm -rf %{buildroot} * 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. +- Added 'Requires: gnome-python2-canvas'. (Red Hat Bugzilla #454622) - Removed 'BuildRequires: pkgconfig' and dropped version from 'BuildRequires: pygtk2-devel'. - Fixed docdir and removed empty README. From eseyman at fedoraproject.org Sat May 2 12:10:07 2009 From: eseyman at fedoraproject.org (Emmanuel Seyman) Date: Sat, 2 May 2009 12:10:07 +0000 (UTC) Subject: rpms/perl-JSON-RPC/devel import.log, NONE, 1.1 perl-JSON-RPC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502121007.66A0970120@cvs1.fedora.phx.redhat.com> Author: eseyman Update of /cvs/pkgs/rpms/perl-JSON-RPC/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17746/devel Modified Files: .cvsignore sources Added Files: import.log perl-JSON-RPC.spec Log Message: Initial import --- NEW FILE import.log --- perl-JSON-RPC-0_96-2_fc10:HEAD:perl-JSON-RPC-0.96-2.fc10.src.rpm:1241266143 --- NEW FILE perl-JSON-RPC.spec --- Name: perl-JSON-RPC Version: 0.96 Release: 2%{?dist} Summary: Perl implementation of JSON-RPC 1.1 protocol License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JSON-RPC/ Source0: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-RPC-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(CGI) >= 2.92 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTTP::Request) BuildRequires: perl(HTTP::Response) BuildRequires: perl(JSON) >= 2 BuildRequires: perl(LWP::UserAgent) >= 2.001 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description JSON-RPC is a stateless and light-weight remote procedure call (RPC) protocol for inter-networking applications over HTTP. It uses JSON as the data format for of all facets of a remote procedure call, including all application data carried in parameters. %prep %setup -q -n JSON-RPC-%{version} # Get rid of non-UNIX end-of-lines sed -i 's/\r//' ex/jsonrpc.conf %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm ex/MyApp.pm 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 ex README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Apr 28 2009 Emmanuel Seyman 0.96-2 - Remove unneeded Requires * Tue Apr 14 2009 Emmanuel Seyman 0.96-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:57:37 -0000 1.1 +++ .cvsignore 2 May 2009 12:09:36 -0000 1.2 @@ -0,0 +1 @@ +JSON-RPC-0.96.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:57:37 -0000 1.1 +++ sources 2 May 2009 12:09:36 -0000 1.2 @@ -0,0 +1 @@ +3912464c3cf59b60131fd2b15400192a JSON-RPC-0.96.tar.gz From petersen at fedoraproject.org Sat May 2 12:10:28 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Sat, 2 May 2009 12:10:28 +0000 (UTC) Subject: rpms/ghc/F-11 ghc-mk-pkg-install-inplace.patch, NONE, 1.1 ghc-rpm-macros.ghc, 1.13, 1.14 ghc.spec, 1.80, 1.81 Message-ID: <20090502121028.E27E670120@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17143 Modified Files: ghc-rpm-macros.ghc ghc.spec Added Files: ghc-mk-pkg-install-inplace.patch Log Message: Backport latest ghc from devel: * Sat May 2 2009 Jens Petersen - 6.10.2-5 - try unregisterised ppc to see if that stops the segfaulting with runghc * Tue Apr 28 2009 Jens Petersen - 6.10.2-4 - add experimental bcond hscolour - add experimental support for building shared libraries (for ghc-6.11) - add libs subpackage for shared libraries - create a ld.conf.d file for libghc*.so - BR libffi-devel - drop redundant setting of GhcLibWays in build.mk for no prof - drop redundant setting of HADDOCK_DOCS - simplify filelist names - add a check section based on tests from debian's package - be more careful about doc files in filelist * Fri Apr 24 2009 Jens Petersen - 6.10.2-3 - define ghc_version in macros.ghc * Sun Apr 19 2009 Jens Petersen - 6.10.2-2 - update macros.ghc: - pkg_libdir and pkg_docdir obsoleted in packages and replaced by ghcpkgdir and ghcdocdir inside macros.ghc - make filelist also for docs ghc-mk-pkg-install-inplace.patch: --- NEW FILE ghc-mk-pkg-install-inplace.patch --- diff -up ghc-6.11.20090421/mk/cabal-flags.mk~ ghc-6.11.20090421/mk/cabal-flags.mk --- ghc-6.11.20090421/mk/cabal-flags.mk~ 2009-04-22 03:15:57.000000000 +1000 +++ ghc-6.11.20090421/mk/cabal-flags.mk 2009-04-26 12:06:06.000000000 +1000 @@ -3,7 +3,7 @@ nothing= space=$(nothing) $(nothing) comma=, -GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg +GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-inplace/build/ghc-pkg/ghc-pkg LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries UTILS_ABS = $(FPTOOLS_TOP_ABS)/utils diff -up ghc-6.11.20090421/mk/package.mk~ ghc-6.11.20090421/mk/package.mk --- ghc-6.11.20090421/mk/package.mk~ 2009-04-22 03:15:55.000000000 +1000 +++ ghc-6.11.20090421/mk/package.mk 2009-04-26 10:52:55.000000000 +1000 @@ -86,7 +86,7 @@ install:: | sed -e 's/""//g' -e 's/:[ ]*,/: /g' \ | $(GHC_PKG_INSTALL_PROG) --global-conf $(DESTDIR)$(datadir)/package.conf update - --force -GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg +GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-inplace/build/ghc-pkg/ghc-pkg # we could be more accurate here and add a dependency on # driver/package.conf, but that doesn't work too well because of Index: ghc-rpm-macros.ghc =================================================================== RCS file: /cvs/pkgs/rpms/ghc/F-11/ghc-rpm-macros.ghc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ghc-rpm-macros.ghc 27 Feb 2009 01:05:09 -0000 1.13 +++ ghc-rpm-macros.ghc 2 May 2009 12:09:58 -0000 1.14 @@ -1,7 +1,7 @@ %cabal %{_bindir}/runghc Setup %cabal_configure \ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --libsubdir='$compiler/$pkgid' +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{ghcdocdir} --libsubdir='$compiler/$pkgid' %cabal_makefile \ %cabal makefile -f cabal-rpm.mk \ @@ -10,22 +10,29 @@ make -f cabal-rpm.mk %{_smp_mflags} \ %cabal_install %cabal copy --destdir=${RPM_BUILD_ROOT} -v +%ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}-%{version} +%ghcpkgdir %{_libdir}/ghc-%(ghc --numeric-version)/%{?pkg_name}%{!?pkg_name:%name}-%{version} + %ghc_gen_filelists() \ -rm -f %1-devel.files %1-prof.files \ +rm -f %1-devel.files %1-prof.files %1-doc.files \ echo '%defattr(-,root,root,-)' > %1-devel.files \ -find ${RPM_BUILD_ROOT}%{pkg_libdir} -type d | sed 's/^/%dir /' >> %1-devel.files \ -find ${RPM_BUILD_ROOT}%{pkg_libdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1-devel.files \ +find ${RPM_BUILD_ROOT}%{ghcpkgdir} -type d | sed 's/^/%dir /' >> %1-devel.files \ +find ${RPM_BUILD_ROOT}%{ghcpkgdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1-devel.files \ echo '%defattr(-,root,root,-)' > %1-prof.files \ -find ${RPM_BUILD_ROOT}%{pkg_libdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \ +find ${RPM_BUILD_ROOT}%{ghcpkgdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \ sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1-devel.files %1-prof.files \ +echo '%defattr(-,root,root,-)' > %1-doc.files \ +echo '%{ghcdocdir}' >> %1-doc.files \ %{nil} %ghc_gen_scripts %cabal register --gen-script ; %cabal unregister --gen-script -%ghc_install_scripts install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir} +%ghc_install_scripts install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{ghcpkgdir} -%ghc_register_pkg %{pkg_libdir}/register.sh >/dev/null || : +%ghc_register_pkg %{ghcpkgdir}/register.sh >/dev/null || : -%ghc_unregister_pkg %{pkg_libdir}/unregister.sh >/dev/null || : +%ghc_unregister_pkg %{ghcpkgdir}/unregister.sh >/dev/null || : %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || : + +%ghc_version %(ghc --numeric-version) Index: ghc.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghc/F-11/ghc.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- ghc.spec 8 Apr 2009 21:39:16 -0000 1.80 +++ ghc.spec 2 May 2009 12:09:58 -0000 1.81 @@ -1,7 +1,13 @@ -# test builds can made faster by disabling profiled libraries +# test builds can made faster and smaller by disabling profiled libraries %bcond_without prof +# build users_guide, etc %bcond_without doc +# experimental +## shared libraries support available in ghc >= 6.11 +%bcond_with shared +%bcond_with hscolour + # Fixing packaging problems can be a tremendous pain because it # generally requires a complete rebuild, which takes hours. To offset # the misery, do a complete build once using "rpmbuild -bc", then copy @@ -16,7 +22,7 @@ Name: ghc Version: 6.10.2 -Release: 1%{?dist} +Release: 5%{?dist} Summary: Glasgow Haskell Compilation system # fedora ghc has only been bootstrapped on the following archs: ExclusiveArch: %{ix86} x86_64 ppc alpha @@ -24,6 +30,7 @@ License: BSD Group: Development/Languages Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2 Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2 +# /etc/rpm/macros.ghc Source2: ghc-rpm-macros.ghc URL: http://haskell.org/ghc/ # libedit-devel > 2.11-2 correctly requires ncurses-devel @@ -31,13 +38,21 @@ Requires: gcc, gmp-devel, libedit-devel Requires(post): policycoreutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0, haddock09 -# introduced for f11 and to be removed for f13: +# introduced for f11 and can be removed for f13: Provides: haddock = 2.3.0 BuildRequires: ghc, happy, sed BuildRequires: gmp-devel, libedit-devel > 2.11-2 +%if %{with shared} +# not sure if this is actually needed +BuildRequires: libffi-devel +%endif %if %{with doc} BuildRequires: libxslt, docbook-style-xsl +%if %{with hscolour} +BuildRequires: hscolour +%endif %endif +Patch1: ghc-mk-pkg-install-inplace.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -74,11 +89,25 @@ Preformatted documentation for the Glori Compilation System (GHC) and its libraries. It should be installed if you like to have local access to the documentation in HTML format. +%if %{with shared} +%package libs +Summary: Shared libraries for GHC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description libs +Shared libraries for Glorious Glasgow Haskell Compilation System +(GHC). They should be installed to build standalone programs. +%endif + # the debuginfo subpackage is currently empty anyway, so don't generate it %global debug_package %{nil} %prep %setup -q -n %{name}-%{version} -b1 +%if %{with shared} +%patch1 -p1 -b .orig-dist-install +%endif %build # hack for building a local test package quickly from a prebuilt tree @@ -90,24 +119,29 @@ popd exit 0 %endif -%if !%{with prof} -echo "GhcLibWays=" >> mk/build.mk -echo "GhcRTSWays=thr debug" >> mk/build.mk +%ifarch ppc +echo "GhcUnregisterised=YES" >> mk/build.mk +echo "GhcWithNativeCodeGen=NO" >> mk/build.mk +echo "SplitObjs=NO" >> mk/build.mk +%endif + +%if %{without prof} +echo "GhcLibWays=%{?with_shared:dyn}" >> mk/build.mk %endif %if %{with doc} echo "XMLDocWays = html" >> mk/build.mk -echo "HADDOCK_DOCS = YES" >> mk/build.mk %endif ./configure --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} + --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ + %{?with_shared:--enable-shared} make %{_smp_mflags} -make %{_smp_mflags} -C libraries +#make %{_smp_mflags} -C libraries %if %{with doc} make %{_smp_mflags} html @@ -122,24 +156,26 @@ make DESTDIR=${RPM_BUILD_ROOT} install make DESTDIR=${RPM_BUILD_ROOT} install-docs %endif +%if %{with shared} +mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d +echo %{_libdir}/%{name}-%{version} > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf +%endif + # install rpm macros mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc SRC_TOP=$PWD -rm -f rpm-*-filelist rpm-*.files +rm -f rpm-*.files ( cd $RPM_BUILD_ROOT find .%{_libdir}/%{name}-%{version} \( -type d -fprintf $SRC_TOP/rpm-dir.files "%%%%dir %%p\n" \) -o \( -type f \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( -not -name 'package.conf*' -fprint $SRC_TOP/rpm-lib.files \) - find .%{_docdir}/%{name}/* -type d ! -name libraries > $SRC_TOP/rpm-doc-dir.files + find .%{_docdir}/%{name}/* -type d ! -name libraries %{?with_hscolour:! -name src} > $SRC_TOP/rpm-doc-dir.files ) # make paths absolute (filter "./usr" to "/usr") sed -i -e "s|\.%{_prefix}|%{_prefix}|" rpm-*.files -cat rpm-dir.files rpm-lib.files > rpm-base-filelist -%if %{with prof} -cat rpm-prof.files > rpm-prof-filelist -%endif +cat rpm-dir.files rpm-lib.files > rpm-base.files # these are handled as alternatives for i in hsc2hs runhaskell; do @@ -150,6 +186,20 @@ for i in hsc2hs runhaskell; do fi done +%check +# stolen from ghc6/debian/rules: +# Do some very simple tests that the compiler actually works +rm -rf testghc +mkdir testghc +echo 'main = putStrLn "Foo"' > testghc/foo.hs +ghc/stage2-inplace/ghc testghc/foo.hs -o testghc/foo +[ "$(testghc/foo)" = "Foo" ] +rm testghc/* +echo 'main = putStrLn "Foo"' > testghc/foo.hs +ghc/stage2-inplace/ghc testghc/foo.hs -o testghc/foo -O2 +[ "$(testghc/foo)" = "Foo" ] +rm testghc/* + %clean rm -rf $RPM_BUILD_ROOT @@ -174,9 +224,9 @@ update-alternatives --install %{_bindir} update-alternatives --install %{_bindir}/hsc2hs hsc2hs \ %{_bindir}/hsc2hs-ghc 500 -# posttrans to make sure any old documentation has been removed first -%posttrans doc -( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || : +%if %{with shared} +%post libs -p /sbin/ldconfig +%endif %preun if [ "$1" = 0 ]; then @@ -184,25 +234,31 @@ if [ "$1" = 0 ]; then update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc fi -%files -f rpm-base-filelist +%if %{with shared} +%postun libs -p /sbin/ldconfig +%endif + +%posttrans doc +# (posttrans to make sure any old documentation has been removed first) +( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || : + +%files -f rpm-base.files %defattr(-,root,root,-) %doc ANNOUNCE HACKING LICENSE README -%doc %{_mandir}/man1/ghc.* %{_bindir}/* +%if %{with doc} +%{_mandir}/man1/ghc.* +%endif %{_sysconfdir}/rpm/macros.ghc %config(noreplace) %{_libdir}/ghc-%{version}/package.conf -%if %{with prof} -%files prof -f rpm-prof-filelist -%defattr(-,root,root,-) -%endif - -%if %{with doc} %files doc -f rpm-doc-dir.files %defattr(-,root,root,-) %dir %{_docdir}/%{name} %{_docdir}/%{name}/LICENSE +%if %{with doc} %{_docdir}/%{name}/index.html +%endif %{_docdir}/%{name}/libraries/gen_contents_index %{_docdir}/%{name}/libraries/prologue.txt %dir %{_docdir}/%{name}/libraries @@ -213,9 +269,48 @@ fi %ghost %{_docdir}/%{name}/libraries/index.html %ghost %{_docdir}/%{name}/libraries/minus.gif %ghost %{_docdir}/%{name}/libraries/plus.gif + +%if %{with shared} +%files libs +%defattr(-,root,root,-) +%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf +%{_libdir}/libHS*-ghc%{version}.so +%endif + +%if %{with prof} +%files prof -f rpm-prof.files +%defattr(-,root,root,-) %endif %changelog +* Sat May 2 2009 Jens Petersen - 6.10.2-5 +- try unregisterised ppc to see if that stops the segfaulting with runghc + +* Tue Apr 28 2009 Jens Petersen - 6.10.2-4 +- add experimental bcond hscolour +- add experimental support for building shared libraries (for ghc-6.11) + - add libs subpackage for shared libraries + - create a ld.conf.d file for libghc*.so + - BR libffi-devel +- drop redundant setting of GhcLibWays in build.mk for no prof +- drop redundant setting of HADDOCK_DOCS +- simplify filelist names +- add a check section based on tests from debian's package +- be more careful about doc files in filelist + +* Fri Apr 24 2009 Jens Petersen - 6.10.2-3 +- define ghc_version in macros.ghc in place of ghcrequires +- drop ghc-requires script for now + +* Sun Apr 19 2009 Jens Petersen - 6.10.2-2 +- add ghc-requires rpm script to generate ghc version dependencies + (thanks to Till Maas) +- update macros.ghc: + - add %%ghcrequires to call above script + - pkg_libdir and pkg_docdir obsoleted in packages and replaced + by ghcpkgdir and ghcdocdir inside macros.ghc + - make filelist also for docs + * Wed Apr 08 2009 Bryan O'Sullivan - 6.10.2-1 - Update to 6.10.2 From eseyman at fedoraproject.org Sat May 2 12:57:03 2009 From: eseyman at fedoraproject.org (Emmanuel Seyman) Date: Sat, 2 May 2009 12:57:03 +0000 (UTC) Subject: rpms/perl-JSON-RPC/F-11 import.log, NONE, 1.1 perl-JSON-RPC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502125703.78B2970120@cvs1.fedora.phx.redhat.com> Author: eseyman Update of /cvs/pkgs/rpms/perl-JSON-RPC/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25874/F-11 Modified Files: .cvsignore sources Added Files: import.log perl-JSON-RPC.spec Log Message: Initial Import --- NEW FILE import.log --- perl-JSON-RPC-0_96-2_fc10:F-11:perl-JSON-RPC-0.96-2.fc10.src.rpm:1241268963 --- NEW FILE perl-JSON-RPC.spec --- Name: perl-JSON-RPC Version: 0.96 Release: 2%{?dist} Summary: Perl implementation of JSON-RPC 1.1 protocol License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JSON-RPC/ Source0: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-RPC-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(CGI) >= 2.92 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTTP::Request) BuildRequires: perl(HTTP::Response) BuildRequires: perl(JSON) >= 2 BuildRequires: perl(LWP::UserAgent) >= 2.001 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description JSON-RPC is a stateless and light-weight remote procedure call (RPC) protocol for inter-networking applications over HTTP. It uses JSON as the data format for of all facets of a remote procedure call, including all application data carried in parameters. %prep %setup -q -n JSON-RPC-%{version} # Get rid of non-UNIX end-of-lines sed -i 's/\r//' ex/jsonrpc.conf %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm ex/MyApp.pm 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 ex README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Apr 28 2009 Emmanuel Seyman 0.96-2 - Remove unneeded Requires * Tue Apr 14 2009 Emmanuel Seyman 0.96-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:57:37 -0000 1.1 +++ .cvsignore 2 May 2009 12:56:33 -0000 1.2 @@ -0,0 +1 @@ +JSON-RPC-0.96.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:57:37 -0000 1.1 +++ sources 2 May 2009 12:56:33 -0000 1.2 @@ -0,0 +1 @@ +3912464c3cf59b60131fd2b15400192a JSON-RPC-0.96.tar.gz From eseyman at fedoraproject.org Sat May 2 13:06:03 2009 From: eseyman at fedoraproject.org (Emmanuel Seyman) Date: Sat, 2 May 2009 13:06:03 +0000 (UTC) Subject: rpms/perl-JSON-RPC/F-10 import.log, NONE, 1.1 perl-JSON-RPC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502130603.9FE9A70120@cvs1.fedora.phx.redhat.com> Author: eseyman Update of /cvs/pkgs/rpms/perl-JSON-RPC/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27121/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-JSON-RPC.spec Log Message: Initial Import. --- NEW FILE import.log --- perl-JSON-RPC-0_96-2_fc10:F-10:perl-JSON-RPC-0.96-2.fc10.src.rpm:1241269495 --- NEW FILE perl-JSON-RPC.spec --- Name: perl-JSON-RPC Version: 0.96 Release: 2%{?dist} Summary: Perl implementation of JSON-RPC 1.1 protocol License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JSON-RPC/ Source0: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-RPC-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(CGI) >= 2.92 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTTP::Request) BuildRequires: perl(HTTP::Response) BuildRequires: perl(JSON) >= 2 BuildRequires: perl(LWP::UserAgent) >= 2.001 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description JSON-RPC is a stateless and light-weight remote procedure call (RPC) protocol for inter-networking applications over HTTP. It uses JSON as the data format for of all facets of a remote procedure call, including all application data carried in parameters. %prep %setup -q -n JSON-RPC-%{version} # Get rid of non-UNIX end-of-lines sed -i 's/\r//' ex/jsonrpc.conf %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm ex/MyApp.pm 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 ex README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Apr 28 2009 Emmanuel Seyman 0.96-2 - Remove unneeded Requires * Tue Apr 14 2009 Emmanuel Seyman 0.96-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:57:37 -0000 1.1 +++ .cvsignore 2 May 2009 13:05:33 -0000 1.2 @@ -0,0 +1 @@ +JSON-RPC-0.96.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:57:37 -0000 1.1 +++ sources 2 May 2009 13:05:33 -0000 1.2 @@ -0,0 +1 @@ +3912464c3cf59b60131fd2b15400192a JSON-RPC-0.96.tar.gz From eseyman at fedoraproject.org Sat May 2 13:19:09 2009 From: eseyman at fedoraproject.org (Emmanuel Seyman) Date: Sat, 2 May 2009 13:19:09 +0000 (UTC) Subject: rpms/perl-JSON-RPC/F-9 import.log, NONE, 1.1 perl-JSON-RPC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502131909.9409070120@cvs1.fedora.phx.redhat.com> Author: eseyman Update of /cvs/pkgs/rpms/perl-JSON-RPC/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29474/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-JSON-RPC.spec Log Message: Initial import. --- NEW FILE import.log --- perl-JSON-RPC-0_96-2_fc10:F-9:perl-JSON-RPC-0.96-2.fc10.src.rpm:1241270284 --- NEW FILE perl-JSON-RPC.spec --- Name: perl-JSON-RPC Version: 0.96 Release: 2%{?dist} Summary: Perl implementation of JSON-RPC 1.1 protocol License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JSON-RPC/ Source0: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-RPC-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(CGI) >= 2.92 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTTP::Request) BuildRequires: perl(HTTP::Response) BuildRequires: perl(JSON) >= 2 BuildRequires: perl(LWP::UserAgent) >= 2.001 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description JSON-RPC is a stateless and light-weight remote procedure call (RPC) protocol for inter-networking applications over HTTP. It uses JSON as the data format for of all facets of a remote procedure call, including all application data carried in parameters. %prep %setup -q -n JSON-RPC-%{version} # Get rid of non-UNIX end-of-lines sed -i 's/\r//' ex/jsonrpc.conf %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm ex/MyApp.pm 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 ex README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Apr 28 2009 Emmanuel Seyman 0.96-2 - Remove unneeded Requires * Tue Apr 14 2009 Emmanuel Seyman 0.96-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:57:37 -0000 1.1 +++ .cvsignore 2 May 2009 13:18:39 -0000 1.2 @@ -0,0 +1 @@ +JSON-RPC-0.96.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:57:37 -0000 1.1 +++ sources 2 May 2009 13:18:39 -0000 1.2 @@ -0,0 +1 @@ +3912464c3cf59b60131fd2b15400192a JSON-RPC-0.96.tar.gz From rdieter at fedoraproject.org Sat May 2 13:24:58 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 2 May 2009 13:24:58 +0000 (UTC) Subject: rpms/taglib-extras/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 taglib-extras.spec, 1.3, 1.4 Message-ID: <20090502132458.7D37670120@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/taglib-extras/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30429 Modified Files: .cvsignore sources taglib-extras.spec Log Message: * Sat May 02 2009 Rex Dieter - 0.1.3-1 - taglib-extras-0.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/taglib-extras/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 7 Apr 2009 19:48:27 -0000 1.3 +++ .cvsignore 2 May 2009 13:24:28 -0000 1.4 @@ -1 +1 @@ -taglib-extras-0.1.2.tar.gz +taglib-extras-0.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/taglib-extras/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 7 Apr 2009 19:48:27 -0000 1.3 +++ sources 2 May 2009 13:24:28 -0000 1.4 @@ -1 +1 @@ -f6fdba37ffebad96d9409c30c26dd028 taglib-extras-0.1.2.tar.gz +44c15bc5c1b183117909163f9dbc159f taglib-extras-0.1.3.tar.gz Index: taglib-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/taglib-extras/devel/taglib-extras.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- taglib-extras.spec 7 Apr 2009 19:48:27 -0000 1.3 +++ taglib-extras.spec 2 May 2009 13:24:28 -0000 1.4 @@ -1,12 +1,13 @@ Summary: Taglib support for other formats Name: taglib-extras -Version: 0.1.2 +Version: 0.1.3 Release: 1%{?dist} Group: Applications/Multimedia +# all LGPLv2, except for rmff/ which is GPLv2+/LGPLv2+ License: LGPLv2 URL: http://websvn.kde.org/trunk/kdesupport/taglib-extras/ -Source0: http://www.jefferai.com/taglib-extras/taglib-extras-%{version}.tar.gz +Source0: http://www.kollide.net/~jefferai/taglib-extras-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # taglib-extras-config: drop multilib-conflicting mention of libdir, since @@ -75,6 +76,9 @@ rm -rf %{buildroot} %changelog +* Sat May 02 2009 Rex Dieter - 0.1.3-1 +- taglib-extras-0.1.3 + * Thu Apr 07 2009 Eelko Berkenpies - 0.1.2-1 - taglib-extras-0.1.2 From davidz at fedoraproject.org Sat May 2 13:27:17 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Sat, 2 May 2009 13:27:17 +0000 (UTC) Subject: rpms/gvfs/devel 0014-gvfs-use-device-media-detected.patch, NONE, 1.1 0015-gvfs-respect-presentation-hide-for-drives.patch, NONE, 1.1 gvfs.spec, 1.126, 1.127 Message-ID: <20090502132717.D2EC370120@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30841 Modified Files: gvfs.spec Added Files: 0014-gvfs-use-device-media-detected.patch 0015-gvfs-respect-presentation-hide-for-drives.patch Log Message: * Sat May 02 2009 David Zeuthen - 1.2.2-4 - Don't show drives that are supposed to be hidden (#498649) - Only automount if media or drive was just inserted - this fixes a problem with spurious automounts when partitioning/formatting 0014-gvfs-use-device-media-detected.patch: --- NEW FILE 0014-gvfs-use-device-media-detected.patch --- >From 3f3f21fe6e2bdac8fd6acf048da6fb228adde092 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Fri, 01 May 2009 19:59:54 +0000 Subject: Use new gnome-disk-utility API to figure out when media was inserted This fixes a problem with Nautilus automounting newly created volumes appearing as a result of formatting/partitioning. --- diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c index 29e108d..c2c8b76 100644 --- a/monitor/gdu/ggdudrive.c +++ b/monitor/gdu/ggdudrive.c @@ -51,7 +51,6 @@ struct _GGduDrive { gboolean can_eject; gboolean can_poll_for_media; gboolean is_media_check_automatic; - time_t time_of_last_media_insertion; }; static void g_gdu_drive_drive_iface_init (GDriveIface *iface); @@ -178,9 +177,6 @@ update_drive (GGduDrive *drive) if (device != NULL) g_object_unref (device); - if (drive->has_media != old_has_media) - drive->time_of_last_media_insertion = time (NULL); - /* compute whether something changed */ changed = !((old_is_media_removable == drive->is_media_removable) && (old_has_media == drive->has_media) && @@ -233,8 +229,6 @@ g_gdu_drive_new (GVolumeMonitor *volume_monitor, drive->presentable = g_object_ref (presentable); - drive->time_of_last_media_insertion = time (NULL); - g_signal_connect (drive->presentable, "changed", G_CALLBACK (presentable_changed), drive); g_signal_connect (drive->presentable, "job-changed", G_CALLBACK (presentable_job_changed), drive); @@ -685,7 +679,16 @@ g_gdu_drive_has_presentable (GGduDrive *drive, time_t g_gdu_drive_get_time_of_last_media_insertion (GGduDrive *drive) { - return drive->time_of_last_media_insertion; + GduDevice *device; + time_t ret; + + ret = 0; + device = gdu_presentable_get_device (drive->presentable); + if (device != NULL) { + ret = gdu_device_get_media_detection_time (device); + g_object_unref (device); + } + return ret; } GduPresentable * -- cgit v0.8.2 0015-gvfs-respect-presentation-hide-for-drives.patch: --- NEW FILE 0015-gvfs-respect-presentation-hide-for-drives.patch --- >From 59dd3b33a71a930651f23142e2a7d7e57727144f Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Fri, 01 May 2009 21:23:01 +0000 Subject: Fix bug where drives are not ignored as they ought to be This should fix part of https://bugzilla.redhat.com/show_bug.cgi?id=498649#c14 (the other part is fixed in the Fedora livecd scripts) --- diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c index 2c1f727..df42249 100644 --- a/monitor/gdu/ggduvolumemonitor.c +++ b/monitor/gdu/ggduvolumemonitor.c @@ -833,8 +833,10 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points) goto out; } - if (gdu_device_get_presentation_hide (device)) + if (gdu_device_get_presentation_hide (device)) { + ignored = TRUE; goto out; + } has_volumes = FALSE; all_volumes_are_ignored = TRUE; -- cgit v0.8.2 Index: gvfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- gvfs.spec 15 Apr 2009 19:24:55 -0000 1.126 +++ gvfs.spec 2 May 2009 13:26:47 -0000 1.127 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -39,6 +39,8 @@ Patch4: gvfs-1.2.2-ssh-auth-sock.patch # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor # +# These are all in gvfs' master branch on git.gnome.org. +# # http://bugzilla.gnome.org/show_bug.cgi?id=573826 Patch101: gdu-0001-Bug-573826-gdu-volume-monitor.patch # http://bugzilla.gnome.org/show_bug.cgi?id=573826 @@ -65,6 +67,11 @@ Patch111: gdu-0011-Bug-576083-pre-unmoun Patch112: gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch Patch113: gdu-0013-pass-the-flush-mount-option-for-vfat.patch +# Only automount when media has just been inserted +Patch114: 0014-gvfs-use-device-media-detected.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=498649 +Patch115: 0015-gvfs-respect-presentation-hide-for-drives.patch + %description The gvfs package provides backend implementations for the gio framework in GLib. It includes ftp, sftp, cifs. @@ -163,6 +170,8 @@ media players (Media Transfer Protocol) %patch111 -p1 -b .gdu-pre-unmount-signals %patch112 -p1 -b .gdu-unwanted-devices %patch113 -p1 -b .gdu-vfat-flush +%patch114 -p1 -b .gdu-automount-only-on-insertion +%patch115 -p1 -b .gdu-hide-drives %build @@ -306,6 +315,11 @@ update-desktop-database &> /dev/null ||: %changelog +* Sat May 02 2009 David Zeuthen - 1.2.2-4 +- Don't show drives that are supposed to be hidden (#498649) +- Only automount if media or drive was just inserted - this fixes + a problem with spurious automounts when partitioning/formatting + * Wed Apr 15 2009 David Zeuthen - 1.2.2-3 - Sync with the gdu-volume-monitor branch From pkgdb at fedoraproject.org Sat May 2 14:47:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:47:29 +0000 Subject: [pkgdb] libical ownership updated Message-ID: <20090502144729.32DE010F870@bastion2.fedora.phx.redhat.com> Package libical in Fedora EPEL 5 was orphaned by lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:47:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:47:45 +0000 Subject: [pkgdb] libical ownership updated Message-ID: <20090502144745.D292A10F894@bastion2.fedora.phx.redhat.com> Package libical in Fedora EPEL 5 is now owned by robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:48:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:48:45 +0000 Subject: [pkgdb] libical: robert has requested watchbugzilla Message-ID: <20090502144846.0B87310F888@bastion2.fedora.phx.redhat.com> robert has requested the watchbugzilla acl on libical (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:48:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:48:50 +0000 Subject: [pkgdb] libical: robert has requested commit Message-ID: <20090502144850.CBFF510F898@bastion2.fedora.phx.redhat.com> robert has requested the commit acl on libical (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:48:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:48:48 +0000 Subject: [pkgdb] libical: robert has requested watchcommits Message-ID: <20090502144848.44A9810F895@bastion2.fedora.phx.redhat.com> robert has requested the watchcommits acl on libical (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:03 +0000 Subject: [pkgdb] libical: robert has requested watchbugzilla Message-ID: <20090502144903.17EFB10F886@bastion2.fedora.phx.redhat.com> robert has requested the watchbugzilla acl on libical (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:06 +0000 Subject: [pkgdb] libical: robert has requested watchcommits Message-ID: <20090502144906.5DBC010F8A1@bastion2.fedora.phx.redhat.com> robert has requested the watchcommits acl on libical (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:07 +0000 Subject: [pkgdb] libical: robert has requested commit Message-ID: <20090502144907.5482510F8A3@bastion2.fedora.phx.redhat.com> robert has requested the commit acl on libical (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:14 +0000 Subject: [pkgdb] libical: robert has requested watchbugzilla Message-ID: <20090502144914.ED12110F897@bastion2.fedora.phx.redhat.com> robert has requested the watchbugzilla acl on libical (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:18 +0000 Subject: [pkgdb] libical: robert has requested watchcommits Message-ID: <20090502144918.5396B10F8A4@bastion2.fedora.phx.redhat.com> robert has requested the watchcommits acl on libical (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:20 +0000 Subject: [pkgdb] libical: robert has requested commit Message-ID: <20090502144920.B2D2A10F886@bastion2.fedora.phx.redhat.com> robert has requested the commit acl on libical (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:31 +0000 Subject: [pkgdb] libical: robert has requested watchbugzilla Message-ID: <20090502144931.30D1C10F8A8@bastion2.fedora.phx.redhat.com> robert has requested the watchbugzilla acl on libical (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:33 +0000 Subject: [pkgdb] libical: robert has requested watchcommits Message-ID: <20090502144933.6A70910F89D@bastion2.fedora.phx.redhat.com> robert has requested the watchcommits acl on libical (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:49:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:49:35 +0000 Subject: [pkgdb] libical: robert has requested commit Message-ID: <20090502144935.62CD610F8AB@bastion2.fedora.phx.redhat.com> robert has requested the commit acl on libical (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:51:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:51:02 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090502145102.7933410F898@bastion2.fedora.phx.redhat.com> robert has set the watchcommits acl on libical (Fedora EPEL 5) to Obsolete for lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:51:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:51:00 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090502145100.AE28010F895@bastion2.fedora.phx.redhat.com> robert has set the watchbugzilla acl on libical (Fedora EPEL 5) to Obsolete for lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:51:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:51:05 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090502145105.9948310F89C@bastion2.fedora.phx.redhat.com> robert has set the commit acl on libical (Fedora EPEL 5) to Obsolete for lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sat May 2 14:51:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 02 May 2009 14:51:07 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090502145107.67ADD10F8A1@bastion2.fedora.phx.redhat.com> robert has set the approveacls acl on libical (Fedora EPEL 5) to Obsolete for lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From toshio at fedoraproject.org Sat May 2 14:55:07 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 2 May 2009 14:55:07 +0000 (UTC) Subject: rpms/TurboGears/devel TurboGears-1.0.8-paginate.patch, NONE, 1.1 TurboGears.spec, 1.43, 1.44 Message-ID: <20090502145507.4017170120@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11344 Modified Files: TurboGears.spec Added Files: TurboGears-1.0.8-paginate.patch Log Message: * Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 - Fix from upstream for pagination problem. TurboGears-1.0.8-paginate.patch: --- NEW FILE TurboGears-1.0.8-paginate.patch --- Index: /branches/1.0/turbogears/paginate.py =================================================================== --- /branches/1.0/turbogears/paginate.py (revision 5317) +++ /branches/1.0/turbogears/paginate.py (revision 6575) @@ -82,6 +82,6 @@ @type limit: integer - @param max_limit: The maximum number to which the imposed limit - can be increased using the dynamic_limit keyword argument in the URL. + @param max_limit: The maximum number to which the imposed limit can be + increased using the "var_name"_tgp_limit keyword argument in the URL. If this is set to 0, no dynamic change at all will be allowed; if it is set to None, any change will be allowed. @@ -113,4 +113,15 @@ """ + if default_reversed is not None: + warnings.warn("default_reversed is deprecated." + " Use default_order='-field' to indicate" + " default reversed order, or" + " default_order=['field1', '-field2, 'field3']" + " for multiple fields.", DeprecationWarning, 2) + if allow_limit_override is not None: + warnings.warn("allow_limit_override is deprecated." + " Use max_limit to specify an upper bound for limit.", + DeprecationWarning, 2) + def entangle(func): @@ -122,15 +133,4 @@ return kw.pop(var_name + '_tgp_' + name, kw.pop('tg_paginate_' + name, default)) - - if default_reversed is not None: - warnings.warn("default_reversed is deprecated." - " Use default_order='-field' to indicate" - " default reversed order, or" - " default_order=['field1', '-field2, 'field3']" - " for multiple fields.", DeprecationWarning, 2) - if allow_limit_override is not None: - warnings.warn("allow_limit_override is deprecated." - " Use max_limit to specify an upper bound for limit.", - DeprecationWarning, 2) page = kwpop('no') @@ -152,6 +152,7 @@ try: limit_ = int(kwpop('limit')) - if max_limit is not None: - if max_limit <= 0 and not allow_limit_override: + if max_limit is not None and not ( + allow_limit_override and max_limit == 0): + if max_limit <= 0: raise ValueError limit_ = min(limit_, max_limit) Index: /branches/1.0/turbogears/tests/test_paginate.py =================================================================== --- /branches/1.0/turbogears/tests/test_paginate.py (revision 5674) +++ /branches/1.0/turbogears/tests/test_paginate.py (revision 6575) @@ -471,4 +471,29 @@ Spy.assert_ok(self.body, 'pages', xrange(1, 3)) + def test_limit_override_deprecated(self): + import sys, StringIO + stderr, sys.stderr = sys.stderr, StringIO.StringIO() + try: + class DeprecatedMixin(RootController): + [expose()] + [paginate("data", limit=4, allow_limit_override=True)] + def custom_limit_deprecated(self): + spy = Spy(var_name='data', + order=None, ordering=[], row_count=10) + data = range(10) + return dict(data=data, spy=spy) + finally: + stderr, sys.stderr = sys.stderr, stderr + warn = stderr.getvalue() + stderr.close() + assert 'allow_limit_override is deprecated.' in warn + self.MyRoot.__bases__ = (DeprecatedMixin,) + self.MyRoot.__bases__ + # can override limit (using deprecated parameter) + self.request('/custom_limit_deprecated?tg_paginate_limit=2') + assert '"data": [0, 1]' in self.body + Spy.assert_ok(self.body, 'page_count', 5) + Spy.assert_ok(self.body, 'limit', 2) + Spy.assert_ok(self.body, 'pages', xrange(1, 6)) + def test_max_pages(self): self.request("/default_max_pages") Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- TurboGears.spec 23 Feb 2009 23:42:01 -0000 1.43 +++ TurboGears.spec 2 May 2009 14:54:36 -0000 1.44 @@ -3,7 +3,7 @@ Name: TurboGears Version: 1.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -12,7 +12,8 @@ URL: http://www.turbogears.or Source0: http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-cherrypyreq.patch Patch1: %{name}-%{version}-setup.patch - +# From upstream changeset r6575 +Patch2: %{name}-%{version}-paginate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +70,7 @@ TurboGears is easy to use for a wide ran %setup -q %patch0 -b .cherrypyreq %patch1 -b .setup +%patch2 -p3 -b .paginate %build @@ -92,6 +94,9 @@ rm -rf %{buildroot} %{python_sitelib}/turbogears/ %changelog +* Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 +- Fix from upstream for pagination problem. + * Mon Feb 23 2009 Fedora Release Engineering - 1.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nbecker at fedoraproject.org Sat May 2 15:16:06 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Sat, 2 May 2009 15:16:06 +0000 (UTC) Subject: rpms/python-igraph/F-11 .cvsignore, 1.4, 1.5 python-igraph.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <20090502151606.1983E70120@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/python-igraph/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15179 Modified Files: .cvsignore python-igraph.spec sources Log Message: Update to 0.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-igraph/F-11/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 16 Nov 2008 15:25:30 -0000 1.4 +++ .cvsignore 2 May 2009 15:15:35 -0000 1.5 @@ -1 +1 @@ -python-igraph-0.5.1.tar.gz +python-igraph-0.5.2.tar.gz Index: python-igraph.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-igraph/F-11/python-igraph.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- python-igraph.spec 26 Feb 2009 21:43:54 -0000 1.11 +++ python-igraph.spec 2 May 2009 15:15:35 -0000 1.12 @@ -1,8 +1,8 @@ %{!?python_archlib: %define python_archlib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-igraph -Version: 0.5.1 -Release: 4%{?dist} +Version: 0.5.2 +Release: 2%{?dist} Summary: Python bindings for igraph Group: Development/Languages @@ -31,7 +31,7 @@ around. %setup -q #%patch0 -p1 #%patch1 -p0 -%patch2 -p0 +#%patch2 -p0 %patch3 -p0 #%patch4 -p0 @@ -54,7 +54,17 @@ rm -rf $RPM_BUILD_ROOT %{python_archlib}/python_igraph-%{version}-py*.egg-info %{_bindir}/igraph +%check +PYTHONPATH=$RPM_BUILD_ROOT%{python_archlib} %{__python} -c 'import igraph.test; igraph.test.test();' + %changelog +* Mon Apr 27 2009 Neal Becker - 0.5.2-2 +- Try running check + +* Mon Apr 27 2009 Neal Becker - 0.5.2-1 +- Update to 0.5.2 +- Try building without patch2 + * Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-igraph/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 16 Nov 2008 15:25:30 -0000 1.4 +++ sources 2 May 2009 15:15:35 -0000 1.5 @@ -1 +1 @@ -9cc4364d656db67add07dd474c8b0f11 python-igraph-0.5.1.tar.gz +8e80ddff5a7a3b7c25e293d4daaee6c0 python-igraph-0.5.2.tar.gz From nbecker at fedoraproject.org Sat May 2 15:29:56 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Sat, 2 May 2009 15:29:56 +0000 (UTC) Subject: rpms/igraph/devel igraph.spec,1.29,1.30 Message-ID: <20090502152956.BE3EF70120@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/igraph/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17667 Modified Files: igraph.spec Log Message: Try putting back Provides for devel Index: igraph.spec =================================================================== RCS file: /cvs/pkgs/rpms/igraph/devel/igraph.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- igraph.spec 28 Apr 2009 14:18:47 -0000 1.29 +++ igraph.spec 2 May 2009 15:29:25 -0000 1.30 @@ -1,6 +1,6 @@ Name: igraph Version: 0.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for creating and manipulating graphs Group: System Environment/Libraries @@ -31,7 +31,7 @@ networks, community structure finding, e Requires: %{name} = %{version}-%{release}, pkgconfig Group: Development/Libraries Summary: Development files for igraph -#Provides: %{name}-devel-%{version} +Provides: %{name}-devel-%{version} %description devel The %{name}-devel package contains the header files and some @@ -95,6 +95,9 @@ fi make check %changelog +* Sat May 2 2009 Neal Becker - 0.5.2-3 +- Put back Provides for devel + * Tue Apr 28 2009 Neal Becker - 0.5.2-2 - Try enable gmp, graphml From nbecker at fedoraproject.org Sat May 2 15:45:30 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Sat, 2 May 2009 15:45:30 +0000 (UTC) Subject: rpms/python-igraph/devel python-igraph.spec,1.13,1.14 Message-ID: <20090502154530.CB1E470120@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/python-igraph/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22116 Modified Files: python-igraph.spec Log Message: Try removing Requires Index: python-igraph.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-igraph/devel/python-igraph.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- python-igraph.spec 28 Apr 2009 01:35:17 -0000 1.13 +++ python-igraph.spec 2 May 2009 15:45:00 -0000 1.14 @@ -2,7 +2,7 @@ Name: python-igraph Version: 0.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python bindings for igraph Group: Development/Languages @@ -17,7 +17,7 @@ Patch3: python-igraph-authors.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-setuptools igraph-devel = %{version} gcc libxml2-devel -Requires: python igraph libxml2 igraph = %{version} +#Requires: python igraph libxml2 igraph = %{version} %description This module extends Python with a Graph class which is capable of @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT PYTHONPATH=$RPM_BUILD_ROOT%{python_archlib} %{__python} -c 'import igraph.test; igraph.test.test();' %changelog +* Sat May 2 2009 Neal Becker - 0.5.2-3 +- Try removing Requires + * Mon Apr 27 2009 Neal Becker - 0.5.2-2 - Try running check From chkr at fedoraproject.org Sat May 2 17:02:44 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sat, 2 May 2009 17:02:44 +0000 (UTC) Subject: rpms/perl-JSON-RPC-Common/devel import.log, NONE, 1.1 perl-JSON-RPC-Common.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502170244.1318E70120@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/perl-JSON-RPC-Common/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3037/devel Modified Files: .cvsignore sources Added Files: import.log perl-JSON-RPC-Common.spec Log Message: - initial import of perl-JSON-RPC-Common --- NEW FILE import.log --- perl-JSON-RPC-Common-0_03-3_fc10:HEAD:perl-JSON-RPC-Common-0.03-3.fc10.src.rpm:1241283663 --- NEW FILE perl-JSON-RPC-Common.spec --- Name: perl-JSON-RPC-Common Version: 0.03 Release: 3%{?dist} Summary: Perl module for handling JSON-RPC objects Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/JSON-RPC-Common Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/JSON-RPC-Common-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(JSON) BuildRequires: perl(MooseX::Types) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::use::ok) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides abstractions for JSON-RPC 1.0, 1.1 (both variations) and 2.0 (formerly 1.2) Procedure Call and Procedure Return objects (formerly known as request and result), along with error objects. It also provides marshalling objects to convert the model objects into JSON text and HTTP requests/responses. %prep %setup -q -n JSON-RPC-Common-%{version} %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make 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 \; chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/JSON/RPC/ %{_mandir}/man3/*.3pm* %changelog * Fri May 01 2009 Christian Krause - 0.03-3 - fixed rpmlint warnings * Thu Apr 30 2009 Christian Krause - 0.03-2 - fixed description - added Changes file as %%doc - removed unneeded build requirements - package owns now %%{perl_vendorlib}/JSON/RPC/ * Wed Apr 29 2009 Christian Krause - 0.03-1 - Initial spec file for JSON-RPC-Common Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC-Common/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:55:40 -0000 1.1 +++ .cvsignore 2 May 2009 17:02:13 -0000 1.2 @@ -0,0 +1 @@ +JSON-RPC-Common-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC-Common/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:55:40 -0000 1.1 +++ sources 2 May 2009 17:02:13 -0000 1.2 @@ -0,0 +1 @@ +fe34cc24cb2d7745341d1506166a164c JSON-RPC-Common-0.03.tar.gz From toshio at fedoraproject.org Sat May 2 17:31:26 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 2 May 2009 17:31:26 +0000 (UTC) Subject: rpms/TurboGears/devel TurboGears-1.0.7-cherrypyreq.patch, 1.1, NONE TurboGears-1.0.7-setup.patch, 1.1, NONE Message-ID: <20090502173126.D826670120@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6812 Removed Files: TurboGears-1.0.7-cherrypyreq.patch TurboGears-1.0.7-setup.patch Log Message: Remove obsolete patches --- TurboGears-1.0.7-cherrypyreq.patch DELETED --- --- TurboGears-1.0.7-setup.patch DELETED --- From toshio at fedoraproject.org Sat May 2 17:36:15 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 2 May 2009 17:36:15 +0000 (UTC) Subject: rpms/TurboGears/EL-5 TurboGears-1.0.8-paginate.patch, NONE, 1.1 TurboGears.spec, 1.23, 1.24 Message-ID: <20090502173615.5641670120@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7410/EL-5 Modified Files: TurboGears.spec Added Files: TurboGears-1.0.8-paginate.patch Log Message: * Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 - Fix from upstream for pagination problem. TurboGears-1.0.8-paginate.patch: --- NEW FILE TurboGears-1.0.8-paginate.patch --- Index: /branches/1.0/turbogears/paginate.py =================================================================== --- /branches/1.0/turbogears/paginate.py (revision 5317) +++ /branches/1.0/turbogears/paginate.py (revision 6575) @@ -82,6 +82,6 @@ @type limit: integer - @param max_limit: The maximum number to which the imposed limit - can be increased using the dynamic_limit keyword argument in the URL. + @param max_limit: The maximum number to which the imposed limit can be + increased using the "var_name"_tgp_limit keyword argument in the URL. If this is set to 0, no dynamic change at all will be allowed; if it is set to None, any change will be allowed. @@ -113,4 +113,15 @@ """ + if default_reversed is not None: + warnings.warn("default_reversed is deprecated." + " Use default_order='-field' to indicate" + " default reversed order, or" + " default_order=['field1', '-field2, 'field3']" + " for multiple fields.", DeprecationWarning, 2) + if allow_limit_override is not None: + warnings.warn("allow_limit_override is deprecated." + " Use max_limit to specify an upper bound for limit.", + DeprecationWarning, 2) + def entangle(func): @@ -122,15 +133,4 @@ return kw.pop(var_name + '_tgp_' + name, kw.pop('tg_paginate_' + name, default)) - - if default_reversed is not None: - warnings.warn("default_reversed is deprecated." - " Use default_order='-field' to indicate" - " default reversed order, or" - " default_order=['field1', '-field2, 'field3']" - " for multiple fields.", DeprecationWarning, 2) - if allow_limit_override is not None: - warnings.warn("allow_limit_override is deprecated." - " Use max_limit to specify an upper bound for limit.", - DeprecationWarning, 2) page = kwpop('no') @@ -152,6 +152,7 @@ try: limit_ = int(kwpop('limit')) - if max_limit is not None: - if max_limit <= 0 and not allow_limit_override: + if max_limit is not None and not ( + allow_limit_override and max_limit == 0): + if max_limit <= 0: raise ValueError limit_ = min(limit_, max_limit) Index: /branches/1.0/turbogears/tests/test_paginate.py =================================================================== --- /branches/1.0/turbogears/tests/test_paginate.py (revision 5674) +++ /branches/1.0/turbogears/tests/test_paginate.py (revision 6575) @@ -471,4 +471,29 @@ Spy.assert_ok(self.body, 'pages', xrange(1, 3)) + def test_limit_override_deprecated(self): + import sys, StringIO + stderr, sys.stderr = sys.stderr, StringIO.StringIO() + try: + class DeprecatedMixin(RootController): + [expose()] + [paginate("data", limit=4, allow_limit_override=True)] + def custom_limit_deprecated(self): + spy = Spy(var_name='data', + order=None, ordering=[], row_count=10) + data = range(10) + return dict(data=data, spy=spy) + finally: + stderr, sys.stderr = sys.stderr, stderr + warn = stderr.getvalue() + stderr.close() + assert 'allow_limit_override is deprecated.' in warn + self.MyRoot.__bases__ = (DeprecatedMixin,) + self.MyRoot.__bases__ + # can override limit (using deprecated parameter) + self.request('/custom_limit_deprecated?tg_paginate_limit=2') + assert '"data": [0, 1]' in self.body + Spy.assert_ok(self.body, 'page_count', 5) + Spy.assert_ok(self.body, 'limit', 2) + Spy.assert_ok(self.body, 'pages', xrange(1, 6)) + def test_max_pages(self): self.request("/default_max_pages") Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- TurboGears.spec 7 Mar 2009 23:34:25 -0000 1.23 +++ TurboGears.spec 2 May 2009 17:35:44 -0000 1.24 @@ -3,7 +3,7 @@ Name: TurboGears Version: 1.0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -12,7 +12,8 @@ URL: http://www.turbogears.or Source0: http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-cherrypyreq.patch Patch1: %{name}-%{version}-setup.patch - +# From upstream changeset r6575 +Patch2: %{name}-%{version}-paginate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -70,6 +71,7 @@ TurboGears is easy to use for a wide ran %setup -q %patch0 -b .cherrypyreq %patch1 -b .setup +%patch2 -p3 -b .paginate %build @@ -93,6 +95,9 @@ rm -rf %{buildroot} %{python_sitelib}/turbogears/ %changelog +* Sat May 2 2009 Toshio Kuratomi - 1.0.8-4 +- Fix from upstream for pagination problem. + * Sat Mar 07 2009 Luke Macken 1.0.8-3 - Update our setup.py patch to work with the 0.9 branch of SQLObject From toshio at fedoraproject.org Sat May 2 17:36:15 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 2 May 2009 17:36:15 +0000 (UTC) Subject: rpms/TurboGears/F-10 TurboGears-1.0.8-paginate.patch, NONE, 1.1 TurboGears.spec, 1.41, 1.42 TurboGears-1.0.7-cherrypyreq.patch, 1.1, NONE TurboGears-1.0.7-setup.patch, 1.1, NONE Message-ID: <20090502173615.7EAE470120@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7410/F-10 Modified Files: TurboGears.spec Added Files: TurboGears-1.0.8-paginate.patch Removed Files: TurboGears-1.0.7-cherrypyreq.patch TurboGears-1.0.7-setup.patch Log Message: * Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 - Fix from upstream for pagination problem. TurboGears-1.0.8-paginate.patch: --- NEW FILE TurboGears-1.0.8-paginate.patch --- Index: /branches/1.0/turbogears/paginate.py =================================================================== --- /branches/1.0/turbogears/paginate.py (revision 5317) +++ /branches/1.0/turbogears/paginate.py (revision 6575) @@ -82,6 +82,6 @@ @type limit: integer - @param max_limit: The maximum number to which the imposed limit - can be increased using the dynamic_limit keyword argument in the URL. + @param max_limit: The maximum number to which the imposed limit can be + increased using the "var_name"_tgp_limit keyword argument in the URL. If this is set to 0, no dynamic change at all will be allowed; if it is set to None, any change will be allowed. @@ -113,4 +113,15 @@ """ + if default_reversed is not None: + warnings.warn("default_reversed is deprecated." + " Use default_order='-field' to indicate" + " default reversed order, or" + " default_order=['field1', '-field2, 'field3']" + " for multiple fields.", DeprecationWarning, 2) + if allow_limit_override is not None: + warnings.warn("allow_limit_override is deprecated." + " Use max_limit to specify an upper bound for limit.", + DeprecationWarning, 2) + def entangle(func): @@ -122,15 +133,4 @@ return kw.pop(var_name + '_tgp_' + name, kw.pop('tg_paginate_' + name, default)) - - if default_reversed is not None: - warnings.warn("default_reversed is deprecated." - " Use default_order='-field' to indicate" - " default reversed order, or" - " default_order=['field1', '-field2, 'field3']" - " for multiple fields.", DeprecationWarning, 2) - if allow_limit_override is not None: - warnings.warn("allow_limit_override is deprecated." - " Use max_limit to specify an upper bound for limit.", - DeprecationWarning, 2) page = kwpop('no') @@ -152,6 +152,7 @@ try: limit_ = int(kwpop('limit')) - if max_limit is not None: - if max_limit <= 0 and not allow_limit_override: + if max_limit is not None and not ( + allow_limit_override and max_limit == 0): + if max_limit <= 0: raise ValueError limit_ = min(limit_, max_limit) Index: /branches/1.0/turbogears/tests/test_paginate.py =================================================================== --- /branches/1.0/turbogears/tests/test_paginate.py (revision 5674) +++ /branches/1.0/turbogears/tests/test_paginate.py (revision 6575) @@ -471,4 +471,29 @@ Spy.assert_ok(self.body, 'pages', xrange(1, 3)) + def test_limit_override_deprecated(self): + import sys, StringIO + stderr, sys.stderr = sys.stderr, StringIO.StringIO() + try: + class DeprecatedMixin(RootController): + [expose()] + [paginate("data", limit=4, allow_limit_override=True)] + def custom_limit_deprecated(self): + spy = Spy(var_name='data', + order=None, ordering=[], row_count=10) + data = range(10) + return dict(data=data, spy=spy) + finally: + stderr, sys.stderr = sys.stderr, stderr + warn = stderr.getvalue() + stderr.close() + assert 'allow_limit_override is deprecated.' in warn + self.MyRoot.__bases__ = (DeprecatedMixin,) + self.MyRoot.__bases__ + # can override limit (using deprecated parameter) + self.request('/custom_limit_deprecated?tg_paginate_limit=2') + assert '"data": [0, 1]' in self.body + Spy.assert_ok(self.body, 'page_count', 5) + Spy.assert_ok(self.body, 'limit', 2) + Spy.assert_ok(self.body, 'pages', xrange(1, 6)) + def test_max_pages(self): self.request("/default_max_pages") Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/F-10/TurboGears.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- TurboGears.spec 3 Jan 2009 07:19:08 -0000 1.41 +++ TurboGears.spec 2 May 2009 17:35:45 -0000 1.42 @@ -3,7 +3,7 @@ Name: TurboGears Version: 1.0.8 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -12,7 +12,8 @@ URL: http://www.turbogears.or Source0: http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-cherrypyreq.patch Patch1: %{name}-%{version}-setup.patch - +# From upstream changeset r6575 +Patch2: %{name}-%{version}-paginate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +70,7 @@ TurboGears is easy to use for a wide ran %setup -q %patch0 -b .cherrypyreq %patch1 -b .setup +%patch2 -p3 -b .paginate %build @@ -92,7 +94,13 @@ rm -rf %{buildroot} %{python_sitelib}/turbogears/ %changelog -* Thu Dec 18 2008 Luke Macken - 1.0.8-1 +* Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 +- Fix from upstream for pagination problem. + +* Mon Feb 23 2009 Fedora Release Engineering - 1.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 03 2009 Luke Macken - 1.0.8-1 - Latest upstream release. * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.0.7-3 --- TurboGears-1.0.7-cherrypyreq.patch DELETED --- --- TurboGears-1.0.7-setup.patch DELETED --- From toshio at fedoraproject.org Sat May 2 17:36:15 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 2 May 2009 17:36:15 +0000 (UTC) Subject: rpms/TurboGears/F-11 TurboGears-1.0.8-paginate.patch, NONE, 1.1 TurboGears.spec, 1.43, 1.44 TurboGears-1.0.7-cherrypyreq.patch, 1.1, NONE TurboGears-1.0.7-setup.patch, 1.1, NONE Message-ID: <20090502173615.BD18270120@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7410/F-11 Modified Files: TurboGears.spec Added Files: TurboGears-1.0.8-paginate.patch Removed Files: TurboGears-1.0.7-cherrypyreq.patch TurboGears-1.0.7-setup.patch Log Message: * Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 - Fix from upstream for pagination problem. TurboGears-1.0.8-paginate.patch: --- NEW FILE TurboGears-1.0.8-paginate.patch --- Index: /branches/1.0/turbogears/paginate.py =================================================================== --- /branches/1.0/turbogears/paginate.py (revision 5317) +++ /branches/1.0/turbogears/paginate.py (revision 6575) @@ -82,6 +82,6 @@ @type limit: integer - @param max_limit: The maximum number to which the imposed limit - can be increased using the dynamic_limit keyword argument in the URL. + @param max_limit: The maximum number to which the imposed limit can be + increased using the "var_name"_tgp_limit keyword argument in the URL. If this is set to 0, no dynamic change at all will be allowed; if it is set to None, any change will be allowed. @@ -113,4 +113,15 @@ """ + if default_reversed is not None: + warnings.warn("default_reversed is deprecated." + " Use default_order='-field' to indicate" + " default reversed order, or" + " default_order=['field1', '-field2, 'field3']" + " for multiple fields.", DeprecationWarning, 2) + if allow_limit_override is not None: + warnings.warn("allow_limit_override is deprecated." + " Use max_limit to specify an upper bound for limit.", + DeprecationWarning, 2) + def entangle(func): @@ -122,15 +133,4 @@ return kw.pop(var_name + '_tgp_' + name, kw.pop('tg_paginate_' + name, default)) - - if default_reversed is not None: - warnings.warn("default_reversed is deprecated." - " Use default_order='-field' to indicate" - " default reversed order, or" - " default_order=['field1', '-field2, 'field3']" - " for multiple fields.", DeprecationWarning, 2) - if allow_limit_override is not None: - warnings.warn("allow_limit_override is deprecated." - " Use max_limit to specify an upper bound for limit.", - DeprecationWarning, 2) page = kwpop('no') @@ -152,6 +152,7 @@ try: limit_ = int(kwpop('limit')) - if max_limit is not None: - if max_limit <= 0 and not allow_limit_override: + if max_limit is not None and not ( + allow_limit_override and max_limit == 0): + if max_limit <= 0: raise ValueError limit_ = min(limit_, max_limit) Index: /branches/1.0/turbogears/tests/test_paginate.py =================================================================== --- /branches/1.0/turbogears/tests/test_paginate.py (revision 5674) +++ /branches/1.0/turbogears/tests/test_paginate.py (revision 6575) @@ -471,4 +471,29 @@ Spy.assert_ok(self.body, 'pages', xrange(1, 3)) + def test_limit_override_deprecated(self): + import sys, StringIO + stderr, sys.stderr = sys.stderr, StringIO.StringIO() + try: + class DeprecatedMixin(RootController): + [expose()] + [paginate("data", limit=4, allow_limit_override=True)] + def custom_limit_deprecated(self): + spy = Spy(var_name='data', + order=None, ordering=[], row_count=10) + data = range(10) + return dict(data=data, spy=spy) + finally: + stderr, sys.stderr = sys.stderr, stderr + warn = stderr.getvalue() + stderr.close() + assert 'allow_limit_override is deprecated.' in warn + self.MyRoot.__bases__ = (DeprecatedMixin,) + self.MyRoot.__bases__ + # can override limit (using deprecated parameter) + self.request('/custom_limit_deprecated?tg_paginate_limit=2') + assert '"data": [0, 1]' in self.body + Spy.assert_ok(self.body, 'page_count', 5) + Spy.assert_ok(self.body, 'limit', 2) + Spy.assert_ok(self.body, 'pages', xrange(1, 6)) + def test_max_pages(self): self.request("/default_max_pages") Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- TurboGears.spec 23 Feb 2009 23:42:01 -0000 1.43 +++ TurboGears.spec 2 May 2009 17:35:45 -0000 1.44 @@ -3,7 +3,7 @@ Name: TurboGears Version: 1.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -12,7 +12,8 @@ URL: http://www.turbogears.or Source0: http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-cherrypyreq.patch Patch1: %{name}-%{version}-setup.patch - +# From upstream changeset r6575 +Patch2: %{name}-%{version}-paginate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +70,7 @@ TurboGears is easy to use for a wide ran %setup -q %patch0 -b .cherrypyreq %patch1 -b .setup +%patch2 -p3 -b .paginate %build @@ -92,6 +94,9 @@ rm -rf %{buildroot} %{python_sitelib}/turbogears/ %changelog +* Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 +- Fix from upstream for pagination problem. + * Mon Feb 23 2009 Fedora Release Engineering - 1.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- TurboGears-1.0.7-cherrypyreq.patch DELETED --- --- TurboGears-1.0.7-setup.patch DELETED --- From toshio at fedoraproject.org Sat May 2 17:36:16 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 2 May 2009 17:36:16 +0000 (UTC) Subject: rpms/TurboGears/F-9 TurboGears-1.0.8-paginate.patch, NONE, 1.1 TurboGears.spec, 1.40, 1.41 TurboGears-1.0.7-cherrypyreq.patch, 1.1, NONE Message-ID: <20090502173616.0361C70120@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7410/F-9 Modified Files: TurboGears.spec Added Files: TurboGears-1.0.8-paginate.patch Removed Files: TurboGears-1.0.7-cherrypyreq.patch Log Message: * Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 - Fix from upstream for pagination problem. TurboGears-1.0.8-paginate.patch: --- NEW FILE TurboGears-1.0.8-paginate.patch --- Index: /branches/1.0/turbogears/paginate.py =================================================================== --- /branches/1.0/turbogears/paginate.py (revision 5317) +++ /branches/1.0/turbogears/paginate.py (revision 6575) @@ -82,6 +82,6 @@ @type limit: integer - @param max_limit: The maximum number to which the imposed limit - can be increased using the dynamic_limit keyword argument in the URL. + @param max_limit: The maximum number to which the imposed limit can be + increased using the "var_name"_tgp_limit keyword argument in the URL. If this is set to 0, no dynamic change at all will be allowed; if it is set to None, any change will be allowed. @@ -113,4 +113,15 @@ """ + if default_reversed is not None: + warnings.warn("default_reversed is deprecated." + " Use default_order='-field' to indicate" + " default reversed order, or" + " default_order=['field1', '-field2, 'field3']" + " for multiple fields.", DeprecationWarning, 2) + if allow_limit_override is not None: + warnings.warn("allow_limit_override is deprecated." + " Use max_limit to specify an upper bound for limit.", + DeprecationWarning, 2) + def entangle(func): @@ -122,15 +133,4 @@ return kw.pop(var_name + '_tgp_' + name, kw.pop('tg_paginate_' + name, default)) - - if default_reversed is not None: - warnings.warn("default_reversed is deprecated." - " Use default_order='-field' to indicate" - " default reversed order, or" - " default_order=['field1', '-field2, 'field3']" - " for multiple fields.", DeprecationWarning, 2) - if allow_limit_override is not None: - warnings.warn("allow_limit_override is deprecated." - " Use max_limit to specify an upper bound for limit.", - DeprecationWarning, 2) page = kwpop('no') @@ -152,6 +152,7 @@ try: limit_ = int(kwpop('limit')) - if max_limit is not None: - if max_limit <= 0 and not allow_limit_override: + if max_limit is not None and not ( + allow_limit_override and max_limit == 0): + if max_limit <= 0: raise ValueError limit_ = min(limit_, max_limit) Index: /branches/1.0/turbogears/tests/test_paginate.py =================================================================== --- /branches/1.0/turbogears/tests/test_paginate.py (revision 5674) +++ /branches/1.0/turbogears/tests/test_paginate.py (revision 6575) @@ -471,4 +471,29 @@ Spy.assert_ok(self.body, 'pages', xrange(1, 3)) + def test_limit_override_deprecated(self): + import sys, StringIO + stderr, sys.stderr = sys.stderr, StringIO.StringIO() + try: + class DeprecatedMixin(RootController): + [expose()] + [paginate("data", limit=4, allow_limit_override=True)] + def custom_limit_deprecated(self): + spy = Spy(var_name='data', + order=None, ordering=[], row_count=10) + data = range(10) + return dict(data=data, spy=spy) + finally: + stderr, sys.stderr = sys.stderr, stderr + warn = stderr.getvalue() + stderr.close() + assert 'allow_limit_override is deprecated.' in warn + self.MyRoot.__bases__ = (DeprecatedMixin,) + self.MyRoot.__bases__ + # can override limit (using deprecated parameter) + self.request('/custom_limit_deprecated?tg_paginate_limit=2') + assert '"data": [0, 1]' in self.body + Spy.assert_ok(self.body, 'page_count', 5) + Spy.assert_ok(self.body, 'limit', 2) + Spy.assert_ok(self.body, 'pages', xrange(1, 6)) + def test_max_pages(self): self.request("/default_max_pages") Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/F-9/TurboGears.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- TurboGears.spec 3 Jan 2009 07:20:14 -0000 1.40 +++ TurboGears.spec 2 May 2009 17:35:45 -0000 1.41 @@ -3,7 +3,7 @@ Name: TurboGears Version: 1.0.8 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -12,7 +12,8 @@ URL: http://www.turbogears.or Source0: http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-cherrypyreq.patch Patch1: %{name}-%{version}-setup.patch - +# From upstream changeset r6575 +Patch2: %{name}-%{version}-paginate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +70,7 @@ TurboGears is easy to use for a wide ran %setup -q %patch0 -b .cherrypyreq %patch1 -b .setup +%patch2 -p3 -b .paginate %build @@ -92,7 +94,13 @@ rm -rf %{buildroot} %{python_sitelib}/turbogears/ %changelog -* Thu Dec 18 2008 Luke Macken - 1.0.8-1 +* Sat May 2 2009 Toshio Kuratomi - 1.0.8-3 +- Fix from upstream for pagination problem. + +* Mon Feb 23 2009 Fedora Release Engineering - 1.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 03 2009 Luke Macken - 1.0.8-1 - Latest upstream release. * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.0.7-3 --- TurboGears-1.0.7-cherrypyreq.patch DELETED --- From chkr at fedoraproject.org Sat May 2 17:41:34 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sat, 2 May 2009 17:41:34 +0000 (UTC) Subject: rpms/perl-JSON-RPC-Common/F-11 import.log, NONE, 1.1 perl-JSON-RPC-Common.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502174134.8061870120@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/perl-JSON-RPC-Common/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8262/F-11 Modified Files: .cvsignore sources Added Files: import.log perl-JSON-RPC-Common.spec Log Message: Initial import of perl-JSON-RPC-Common --- NEW FILE import.log --- perl-JSON-RPC-Common-0_03-3_fc10:F-11:perl-JSON-RPC-Common-0.03-3.fc10.src.rpm:1241285822 --- NEW FILE perl-JSON-RPC-Common.spec --- Name: perl-JSON-RPC-Common Version: 0.03 Release: 3%{?dist} Summary: Perl module for handling JSON-RPC objects Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/JSON-RPC-Common Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/JSON-RPC-Common-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(JSON) BuildRequires: perl(MooseX::Types) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::use::ok) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides abstractions for JSON-RPC 1.0, 1.1 (both variations) and 2.0 (formerly 1.2) Procedure Call and Procedure Return objects (formerly known as request and result), along with error objects. It also provides marshalling objects to convert the model objects into JSON text and HTTP requests/responses. %prep %setup -q -n JSON-RPC-Common-%{version} %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make 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 \; chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/JSON/RPC/ %{_mandir}/man3/*.3pm* %changelog * Fri May 01 2009 Christian Krause - 0.03-3 - fixed rpmlint warnings * Thu Apr 30 2009 Christian Krause - 0.03-2 - fixed description - added Changes file as %%doc - removed unneeded build requirements - package owns now %%{perl_vendorlib}/JSON/RPC/ * Wed Apr 29 2009 Christian Krause - 0.03-1 - Initial spec file for JSON-RPC-Common Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC-Common/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:55:40 -0000 1.1 +++ .cvsignore 2 May 2009 17:41:03 -0000 1.2 @@ -0,0 +1 @@ +JSON-RPC-Common-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC-Common/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:55:40 -0000 1.1 +++ sources 2 May 2009 17:41:04 -0000 1.2 @@ -0,0 +1 @@ +fe34cc24cb2d7745341d1506166a164c JSON-RPC-Common-0.03.tar.gz From vpv at fedoraproject.org Sat May 2 17:43:25 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sat, 2 May 2009 17:43:25 +0000 (UTC) Subject: rpms/libvoikko/devel .cvsignore, 1.14, 1.15 libvoikko.spec, 1.23, 1.24 sources, 1.14, 1.15 Message-ID: <20090502174325.CB86370120@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/libvoikko/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8541 Modified Files: .cvsignore libvoikko.spec sources Log Message: * Sat May 2 2009 Ville-Pekka Vainio - 2.1-1 - 2.1 final, including fixes to grammar checking Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvoikko/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 17 Apr 2009 20:11:48 -0000 1.14 +++ .cvsignore 2 May 2009 17:42:55 -0000 1.15 @@ -1 +1 @@ -libvoikko-2.1rc4.tar.gz +libvoikko-2.1.tar.gz Index: libvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- libvoikko.spec 17 Apr 2009 20:11:48 -0000 1.23 +++ libvoikko.spec 2 May 2009 17:42:55 -0000 1.24 @@ -1,15 +1,15 @@ Name: libvoikko Version: 2.1 -Release: 0.5.rc4%{?dist} +Release: 1%{?dist} Summary: Voikko is a library for spellcheckers and hyphenators Group: System Environment/Libraries License: GPLv2+ URL: http://voikko.sourceforge.net/ # The usual format of stable release URLs -#Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz # The usual format of test release URLs -Source0: http://www.puimula.org/htp/testing/%{name}-%{version}rc4.tar.gz +#Source0: http://www.puimula.org/htp/testing/%{name}-%{version}rc4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: malaga-devel >= 7.8 python @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvoikko.pc %changelog +* Sat May 2 2009 Ville-Pekka Vainio - 2.1-1 +- 2.1 final, including fixes to grammar checking + * Fri Apr 17 2009 Ville-Pekka Vainio - 2.1-0.5.rc4 - 2.1rc4: - Fix invalid use of delete vs. delete[] Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvoikko/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 17 Apr 2009 20:11:48 -0000 1.14 +++ sources 2 May 2009 17:42:55 -0000 1.15 @@ -1 +1 @@ -17458bdd150cc02d6071eeda69d4d3db libvoikko-2.1rc4.tar.gz +c0c04a2979126fc9103fa4d88358c90a libvoikko-2.1.tar.gz From mbarnes at fedoraproject.org Sat May 2 17:53:02 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Sat, 2 May 2009 17:53:02 +0000 (UTC) Subject: rpms/gnome-python2/devel .cvsignore, 1.41, 1.42 gnome-python2.spec, 1.33, 1.34 sources, 1.41, 1.42 Message-ID: <20090502175302.8D60670120@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/gnome-python2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10058 Modified Files: .cvsignore gnome-python2.spec sources Log Message: * Sat May 02 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- .cvsignore 12 Apr 2009 14:49:30 -0000 1.41 +++ .cvsignore 2 May 2009 17:52:32 -0000 1.42 @@ -1 +1 @@ -gnome-python-2.26.1.tar.bz2 +gnome-python-2.27.1.tar.bz2 Index: gnome-python2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- gnome-python2.spec 12 Apr 2009 14:49:30 -0000 1.33 +++ gnome-python2.spec 2 May 2009 17:52:32 -0000 1.34 @@ -1,6 +1,6 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Last updated for 2.25.1 +# Last updated for 2.27.1 # The order here corresponds to that in configure.ac, # for easier comparison. Please do not alphabetize. %define pygtk_version 2.10.3 @@ -15,12 +15,13 @@ %define bonobo_activation_version 2.8.0 %define libbonobo_version 2.8.0 %define libbonoboui_version 2.8.0 +%define pygobject_version 2.17.0 %define python_version 2.3.0 ### Abstract ### Name: gnome-python2 -Version: 2.26.1 +Version: 2.27.1 Release: 1%{?dist} License: LGPLv2+ Group: Development/Languages @@ -211,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo} %changelog +* Sat May 02 2009 Matthew Barnes - 2.27.1-1.fc12 +- Update to 2.27.1 + * Sun Apr 12 2009 Matthew Barnes - 2.26.1-1.fc11 - Update to 2.26.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- sources 12 Apr 2009 14:49:30 -0000 1.41 +++ sources 2 May 2009 17:52:32 -0000 1.42 @@ -1 +1 @@ -e5dcae40b2c291126843680dbed924a8 gnome-python-2.26.1.tar.bz2 +6e1c9b9de1c98d064e8438f3f147305d gnome-python-2.27.1.tar.bz2 From chkr at fedoraproject.org Sat May 2 17:53:55 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sat, 2 May 2009 17:53:55 +0000 (UTC) Subject: rpms/perl-JSON-RPC-Common/F-10 perl-JSON-RPC-Common.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502175355.8950F70120@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/perl-JSON-RPC-Common/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10258 Modified Files: .cvsignore sources Added Files: perl-JSON-RPC-Common.spec Log Message: initial import of perl-JSON-RPC-Common --- NEW FILE perl-JSON-RPC-Common.spec --- Name: perl-JSON-RPC-Common Version: 0.03 Release: 3%{?dist} Summary: Perl module for handling JSON-RPC objects Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/JSON-RPC-Common Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/JSON-RPC-Common-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(JSON) BuildRequires: perl(MooseX::Types) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::use::ok) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides abstractions for JSON-RPC 1.0, 1.1 (both variations) and 2.0 (formerly 1.2) Procedure Call and Procedure Return objects (formerly known as request and result), along with error objects. It also provides marshalling objects to convert the model objects into JSON text and HTTP requests/responses. %prep %setup -q -n JSON-RPC-Common-%{version} %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make 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 \; chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/JSON/RPC/ %{_mandir}/man3/*.3pm* %changelog * Fri May 01 2009 Christian Krause - 0.03-3 - fixed rpmlint warnings * Thu Apr 30 2009 Christian Krause - 0.03-2 - fixed description - added Changes file as %%doc - removed unneeded build requirements - package owns now %%{perl_vendorlib}/JSON/RPC/ * Wed Apr 29 2009 Christian Krause - 0.03-1 - Initial spec file for JSON-RPC-Common Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC-Common/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:55:40 -0000 1.1 +++ .cvsignore 2 May 2009 17:53:25 -0000 1.2 @@ -0,0 +1 @@ +JSON-RPC-Common-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-RPC-Common/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:55:40 -0000 1.1 +++ sources 2 May 2009 17:53:25 -0000 1.2 @@ -0,0 +1 @@ +fe34cc24cb2d7745341d1506166a164c JSON-RPC-Common-0.03.tar.gz From myoung at fedoraproject.org Sat May 2 18:01:14 2009 From: myoung at fedoraproject.org (Michael Young) Date: Sat, 2 May 2009 18:01:14 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-ext4-prealloc-fixes.patch, NONE, 1.1.2.2 linux-2.6-iwl3945-remove-useless-exports.patch, NONE, 1.1.2.2 linux-2.6-missing-rfc2465-stats.patch, NONE, 1.1.2.2 patch-2.6.30-rc4.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.10, 1.1014.2.11 config-generic, 1.238.6.17, 1.238.6.18 config-x86-generic, 1.68.6.7, 1.68.6.8 config-x86_64-generic, 1.68.2.7, 1.68.2.8 kernel.spec, 1.1294.2.21, 1.1294.2.22 sources, 1.976.2.11, 1.976.2.12 upstream, 1.888.2.10, 1.888.2.11 xen.pvops.patch, 1.1.2.17, 1.1.2.18 xen.pvops.post.patch, 1.1.2.11, 1.1.2.12 patch-2.6.30-rc3.bz2.sign, 1.1.2.2, NONE Message-ID: <20090502180114.744C670120@cvs1.fedora.phx.redhat.com> Author: myoung Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10810 Modified Files: Tag: private-myoung-dom0-branch .cvsignore config-generic config-x86-generic config-x86_64-generic kernel.spec sources upstream xen.pvops.patch xen.pvops.post.patch Added Files: Tag: private-myoung-dom0-branch linux-2.6-ext4-prealloc-fixes.patch linux-2.6-iwl3945-remove-useless-exports.patch linux-2.6-missing-rfc2465-stats.patch patch-2.6.30-rc4.bz2.sign Removed Files: Tag: private-myoung-dom0-branch patch-2.6.30-rc3.bz2.sign Log Message: update pvops patch from xen-tip/master and try some configuration changes linux-2.6-ext4-prealloc-fixes.patch: --- NEW FILE linux-2.6-ext4-prealloc-fixes.patch --- We need to mark the buffer_head mapping prealloc space as new during write_begin. Otherwise we don't zero out the page cache content properly for a partial write. This will cause file corruption with preallocation. Also use block number -1 as the fake block number so that unmap_underlying_metadata doesn't drop wrong buffer_head Signed-off-by: Aneesh Kumar K.V Block number '0' should not be used as the fake block number for the delayed new buffer. This will result in vfs calling umap_underlying_metadata for block number '0'. So use -1 instead. Signed-off-by: Aneesh Kumar K.V --- fs/ext4/inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Index: linux-2.6.29.noarch/fs/ext4/inode.c =================================================================== --- linux-2.6.29.noarch.orig/fs/ext4/inode.c +++ linux-2.6.29.noarch/fs/ext4/inode.c @@ -2318,11 +2318,21 @@ static int ext4_da_get_block_prep(struct /* not enough space to reserve */ return ret; - map_bh(bh_result, inode->i_sb, 0); + map_bh(bh_result, inode->i_sb, -1); set_buffer_new(bh_result); set_buffer_delay(bh_result); } else if (ret > 0) { bh_result->b_size = (ret << inode->i_blkbits); + /* + * With sub-block writes into unwritten extents + * we also need to mark the buffer as new so that + * the unwritten parts of the buffer gets correctly zeroed. + */ + if (buffer_unwritten(bh_result)) { + bh_result->b_bdev = inode->i_sb->s_bdev; + set_buffer_new(bh_result); + bh_result->b_blocknr = -1; + } ret = 0; } linux-2.6-iwl3945-remove-useless-exports.patch: --- NEW FILE linux-2.6-iwl3945-remove-useless-exports.patch --- These exports are unnecessary because this object file is linked together with all the files that use the functions. Signed-off-by: Chuck Ebbert Index: linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c =================================================================== --- linux-2.6.29.noarch.orig/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -1694,7 +1694,6 @@ void iwl3945_rx_queue_reset(struct iwl_p rxq->free_count = 0; spin_unlock_irqrestore(&rxq->lock, flags); } -EXPORT_SYMBOL(iwl3945_rx_queue_reset); /* * this should be called while priv->lock is locked @@ -1745,7 +1744,6 @@ static void iwl3945_rx_queue_free(struct rxq->bd = NULL; rxq->rb_stts = NULL; } -EXPORT_SYMBOL(iwl3945_rx_queue_free); /* Convert linear signal-to-noise ratio into dB */ linux-2.6-missing-rfc2465-stats.patch: --- NEW FILE linux-2.6-missing-rfc2465-stats.patch --- diff -up linux-2.6.29.noarch/include/linux/snmp.h.orig linux-2.6.29.noarch/include/linux/snmp.h --- linux-2.6.29.noarch/include/linux/snmp.h.orig 2009-03-23 19:12:14.000000000 -0400 +++ linux-2.6.29.noarch/include/linux/snmp.h 2009-04-27 10:15:53.000000000 -0400 @@ -18,7 +18,7 @@ enum { IPSTATS_MIB_NUM = 0, - IPSTATS_MIB_INRECEIVES, /* InReceives */ + IPSTATS_MIB_INPKTS, /* InReceives */ IPSTATS_MIB_INHDRERRORS, /* InHdrErrors */ IPSTATS_MIB_INTOOBIGERRORS, /* InTooBigErrors */ IPSTATS_MIB_INNOROUTES, /* InNoRoutes */ @@ -28,7 +28,7 @@ enum IPSTATS_MIB_INDISCARDS, /* InDiscards */ IPSTATS_MIB_INDELIVERS, /* InDelivers */ IPSTATS_MIB_OUTFORWDATAGRAMS, /* OutForwDatagrams */ - IPSTATS_MIB_OUTREQUESTS, /* OutRequests */ + IPSTATS_MIB_OUTPKTS, /* OutRequests */ IPSTATS_MIB_OUTDISCARDS, /* OutDiscards */ IPSTATS_MIB_OUTNOROUTES, /* OutNoRoutes */ IPSTATS_MIB_REASMTIMEOUT, /* ReasmTimeout */ @@ -42,6 +42,12 @@ enum IPSTATS_MIB_OUTMCASTPKTS, /* OutMcastPkts */ IPSTATS_MIB_INBCASTPKTS, /* InBcastPkts */ IPSTATS_MIB_OUTBCASTPKTS, /* OutBcastPkts */ + IPSTATS_MIB_INOCTETS, /* InOctets */ + IPSTATS_MIB_OUTOCTETS, /* OutOctets */ + IPSTATS_MIB_INMCASTOCTETS, /* InMcastOctets */ + IPSTATS_MIB_OUTMCASTOCTETS, /* OutMcastOctets */ + IPSTATS_MIB_INBCASTOCTETS, /* InBcastOctets */ + IPSTATS_MIB_OUTBCASTOCTETS, /* OutBcastOctets */ __IPSTATS_MIB_MAX }; diff -up linux-2.6.29.noarch/include/net/ip.h.orig linux-2.6.29.noarch/include/net/ip.h --- linux-2.6.29.noarch/include/net/ip.h.orig 2009-04-27 09:33:56.000000000 -0400 +++ linux-2.6.29.noarch/include/net/ip.h 2009-04-27 10:15:53.000000000 -0400 @@ -168,7 +168,10 @@ struct ipv4_config extern struct ipv4_config ipv4_config; #define IP_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.ip_statistics, field) #define IP_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.ip_statistics, field) +#define IP_ADD_STATS(net, field, val) SNMP_ADD_STATS((net)->mib.ip_statistics, field, val) #define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH((net)->mib.ip_statistics, field, val) +#define IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS((net)->mib.ip_statistics, field, val) +#define IP_UPD_PO_STATS_BH(net, field, val) SNMP_UPD_PO_STATS_BH((net)->mib.ip_statistics, field, val) #define NET_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.net_statistics, field) #define NET_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.net_statistics, field) #define NET_INC_STATS_USER(net, field) SNMP_INC_STATS_USER((net)->mib.net_statistics, field) diff -up linux-2.6.29.noarch/include/net/ipv6.h.orig linux-2.6.29.noarch/include/net/ipv6.h --- linux-2.6.29.noarch/include/net/ipv6.h.orig 2009-04-27 09:33:56.000000000 -0400 +++ linux-2.6.29.noarch/include/net/ipv6.h 2009-04-27 10:15:53.000000000 -0400 @@ -126,15 +126,28 @@ extern struct ctl_path net_ipv6_ctl_path SNMP_ADD_STATS##modifier((net)->mib.statname##_statistics, (field), (val));\ }) +#define _DEVUPD(net, statname, modifier, idev, field, val) \ +({ \ + struct inet6_dev *_idev = (idev); \ + if (likely(_idev != NULL)) \ + SNMP_UPD_PO_STATS##modifier((_idev)->stats.statname, field, (val)); \ + SNMP_UPD_PO_STATS##modifier((net)->mib.statname##_statistics, field, (val));\ +}) + /* MIBs */ #define IP6_INC_STATS(net, idev,field) \ _DEVINC(net, ipv6, , idev, field) #define IP6_INC_STATS_BH(net, idev,field) \ _DEVINC(net, ipv6, _BH, idev, field) +#define IP6_ADD_STATS(net, idev,field,val) \ + _DEVADD(net, ipv6, , idev, field, val) #define IP6_ADD_STATS_BH(net, idev,field,val) \ _DEVADD(net, ipv6, _BH, idev, field, val) - +#define IP6_UPD_PO_STATS(net, idev,field,val) \ + _DEVUPD(net, ipv6, , idev, field, val) +#define IP6_UPD_PO_STATS_BH(net, idev,field,val) \ + _DEVUPD(net, ipv6, _BH, idev, field, val) #define ICMP6_INC_STATS(net, idev, field) \ _DEVINC(net, icmpv6, , idev, field) #define ICMP6_INC_STATS_BH(net, idev, field) \ diff -up linux-2.6.29.noarch/include/net/snmp.h.orig linux-2.6.29.noarch/include/net/snmp.h --- linux-2.6.29.noarch/include/net/snmp.h.orig 2009-03-23 19:12:14.000000000 -0400 +++ linux-2.6.29.noarch/include/net/snmp.h 2009-04-27 10:15:53.000000000 -0400 @@ -153,6 +153,11 @@ struct linux_xfrm_mib { per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field]--; \ put_cpu(); \ } while (0) +#define SNMP_ADD_STATS(mib, field, addend) \ + do { \ + per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field] += addend; \ + put_cpu(); \ + } while (0) #define SNMP_ADD_STATS_BH(mib, field, addend) \ (per_cpu_ptr(mib[0], raw_smp_processor_id())->mibs[field] += addend) #define SNMP_ADD_STATS_USER(mib, field, addend) \ @@ -160,5 +165,17 @@ struct linux_xfrm_mib { per_cpu_ptr(mib[1], get_cpu())->mibs[field] += addend; \ put_cpu(); \ } while (0) - +#define SNMP_UPD_PO_STATS(mib, basefield, addend) \ + do { \ + __typeof__(mib[0]) ptr = per_cpu_ptr(mib[!in_softirq()], get_cpu());\ + ptr->mibs[basefield##PKTS]++; \ + ptr->mibs[basefield##OCTETS] += addend;\ + put_cpu(); \ + } while (0) +#define SNMP_UPD_PO_STATS_BH(mib, basefield, addend) \ + do { \ + __typeof__(mib[0]) ptr = per_cpu_ptr(mib[!in_softirq()], raw_smp_processor_id());\ + ptr->mibs[basefield##PKTS]++; \ + ptr->mibs[basefield##OCTETS] += addend;\ + } while (0) #endif diff -up linux-2.6.29.noarch/net/ipv4/ip_input.c.orig linux-2.6.29.noarch/net/ipv4/ip_input.c --- linux-2.6.29.noarch/net/ipv4/ip_input.c.orig 2009-03-23 19:12:14.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv4/ip_input.c 2009-04-27 10:15:53.000000000 -0400 @@ -358,10 +358,12 @@ static int ip_rcv_finish(struct sk_buff goto drop; rt = skb->rtable; - if (rt->rt_type == RTN_MULTICAST) - IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCASTPKTS); - else if (rt->rt_type == RTN_BROADCAST) - IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCASTPKTS); + if (rt->rt_type == RTN_MULTICAST) { + IP_UPD_PO_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCAST, + skb->len); + } else if (rt->rt_type == RTN_BROADCAST) + IP_UPD_PO_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCAST, + skb->len); return dst_input(skb); @@ -384,7 +386,8 @@ int ip_rcv(struct sk_buff *skb, struct n if (skb->pkt_type == PACKET_OTHERHOST) goto drop; - IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INRECEIVES); + + IP_UPD_PO_STATS_BH(dev_net(dev), IPSTATS_MIB_IN, skb->len); if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) { IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS); diff -up linux-2.6.29.noarch/net/ipv4/ip_output.c.orig linux-2.6.29.noarch/net/ipv4/ip_output.c --- linux-2.6.29.noarch/net/ipv4/ip_output.c.orig 2009-04-27 09:33:59.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv4/ip_output.c 2009-04-27 10:15:53.000000000 -0400 @@ -181,10 +181,10 @@ static inline int ip_finish_output2(stru struct net_device *dev = dst->dev; unsigned int hh_len = LL_RESERVED_SPACE(dev); - if (rt->rt_type == RTN_MULTICAST) - IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTMCASTPKTS); - else if (rt->rt_type == RTN_BROADCAST) - IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTBCASTPKTS); + if (rt->rt_type == RTN_MULTICAST) { + IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUTMCAST, skb->len); + } else if (rt->rt_type == RTN_BROADCAST) + IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUTBCAST, skb->len); /* Be paranoid, rather than too clever. */ if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) { @@ -244,8 +244,8 @@ int ip_mc_output(struct sk_buff *skb) /* * If the indicated interface is up and running, send the packet. */ - IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTREQUESTS); - + IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUT, skb->len); + skb->dev = dev; skb->protocol = htons(ETH_P_IP); @@ -298,7 +298,7 @@ int ip_output(struct sk_buff *skb) { struct net_device *dev = skb->dst->dev; - IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTREQUESTS); + IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUT, skb->len); skb->dev = dev; skb->protocol = htons(ETH_P_IP); diff -up linux-2.6.29.noarch/net/ipv4/proc.c.orig linux-2.6.29.noarch/net/ipv4/proc.c --- linux-2.6.29.noarch/net/ipv4/proc.c.orig 2009-04-27 09:34:00.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv4/proc.c 2009-04-27 10:15:53.000000000 -0400 @@ -90,14 +90,14 @@ static const struct file_operations sock /* snmp items */ static const struct snmp_mib snmp4_ipstats_list[] = { - SNMP_MIB_ITEM("InReceives", IPSTATS_MIB_INRECEIVES), + SNMP_MIB_ITEM("InReceives", IPSTATS_MIB_INPKTS), SNMP_MIB_ITEM("InHdrErrors", IPSTATS_MIB_INHDRERRORS), SNMP_MIB_ITEM("InAddrErrors", IPSTATS_MIB_INADDRERRORS), SNMP_MIB_ITEM("ForwDatagrams", IPSTATS_MIB_OUTFORWDATAGRAMS), SNMP_MIB_ITEM("InUnknownProtos", IPSTATS_MIB_INUNKNOWNPROTOS), SNMP_MIB_ITEM("InDiscards", IPSTATS_MIB_INDISCARDS), SNMP_MIB_ITEM("InDelivers", IPSTATS_MIB_INDELIVERS), - SNMP_MIB_ITEM("OutRequests", IPSTATS_MIB_OUTREQUESTS), + SNMP_MIB_ITEM("OutRequests", IPSTATS_MIB_OUTPKTS), SNMP_MIB_ITEM("OutDiscards", IPSTATS_MIB_OUTDISCARDS), SNMP_MIB_ITEM("OutNoRoutes", IPSTATS_MIB_OUTNOROUTES), SNMP_MIB_ITEM("ReasmTimeout", IPSTATS_MIB_REASMTIMEOUT), @@ -118,6 +118,12 @@ static const struct snmp_mib snmp4_ipext SNMP_MIB_ITEM("OutMcastPkts", IPSTATS_MIB_OUTMCASTPKTS), SNMP_MIB_ITEM("InBcastPkts", IPSTATS_MIB_INBCASTPKTS), SNMP_MIB_ITEM("OutBcastPkts", IPSTATS_MIB_OUTBCASTPKTS), + SNMP_MIB_ITEM("InOctets", IPSTATS_MIB_INOCTETS), + SNMP_MIB_ITEM("OutOctets", IPSTATS_MIB_OUTOCTETS), + SNMP_MIB_ITEM("InMcastOctets", IPSTATS_MIB_INMCASTOCTETS), + SNMP_MIB_ITEM("OutMcastOctets", IPSTATS_MIB_OUTMCASTOCTETS), + SNMP_MIB_ITEM("InBcastOctets", IPSTATS_MIB_INBCASTOCTETS), + SNMP_MIB_ITEM("OutBcastOctets", IPSTATS_MIB_OUTBCASTOCTETS), SNMP_MIB_SENTINEL }; diff -up linux-2.6.29.noarch/net/ipv6/ip6_input.c.orig linux-2.6.29.noarch/net/ipv6/ip6_input.c --- linux-2.6.29.noarch/net/ipv6/ip6_input.c.orig 2009-04-27 09:34:00.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv6/ip6_input.c 2009-04-27 10:15:53.000000000 -0400 @@ -70,7 +70,7 @@ int ipv6_rcv(struct sk_buff *skb, struct idev = __in6_dev_get(skb->dev); - IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INRECEIVES); + IP6_UPD_PO_STATS_BH(net, idev, IPSTATS_MIB_IN, skb->len); if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL || !idev || unlikely(idev->cnf.disable_ipv6)) { @@ -242,8 +242,9 @@ int ip6_mc_input(struct sk_buff *skb) struct ipv6hdr *hdr; int deliver; - IP6_INC_STATS_BH(dev_net(skb->dst->dev), - ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS); + IP6_UPD_PO_STATS_BH(dev_net(skb->dst->dev), + ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCAST, + skb->len); hdr = ipv6_hdr(skb); deliver = ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL); diff -up linux-2.6.29.noarch/net/ipv6/ip6_output.c.orig linux-2.6.29.noarch/net/ipv6/ip6_output.c --- linux-2.6.29.noarch/net/ipv6/ip6_output.c.orig 2009-03-23 19:12:14.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv6/ip6_output.c 2009-04-27 10:15:53.000000000 -0400 @@ -159,7 +159,8 @@ static int ip6_output2(struct sk_buff *s } } - IP6_INC_STATS(dev_net(dev), idev, IPSTATS_MIB_OUTMCASTPKTS); + IP6_UPD_PO_STATS(dev_net(dev), idev, IPSTATS_MIB_OUTMCAST, + skb->len); } return NF_HOOK(PF_INET6, NF_INET_POST_ROUTING, skb, NULL, skb->dev, @@ -275,8 +276,8 @@ int ip6_xmit(struct sock *sk, struct sk_ mtu = dst_mtu(dst); if ((skb->len <= mtu) || skb->local_df || skb_is_gso(skb)) { - IP6_INC_STATS(net, ip6_dst_idev(skb->dst), - IPSTATS_MIB_OUTREQUESTS); + IP6_UPD_PO_STATS(net, ip6_dst_idev(skb->dst), + IPSTATS_MIB_OUT, skb->len); return NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev, dst_output); } @@ -1516,7 +1517,7 @@ int ip6_push_pending_frames(struct sock skb->mark = sk->sk_mark; skb->dst = dst_clone(&rt->u.dst); - IP6_INC_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS); + IP6_UPD_PO_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len); if (proto == IPPROTO_ICMPV6) { struct inet6_dev *idev = ip6_dst_idev(skb->dst); diff -up linux-2.6.29.noarch/net/ipv6/mcast.c.orig linux-2.6.29.noarch/net/ipv6/mcast.c --- linux-2.6.29.noarch/net/ipv6/mcast.c.orig 2009-03-23 19:12:14.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv6/mcast.c 2009-04-27 10:15:53.000000000 -0400 @@ -1449,7 +1449,8 @@ static void mld_sendpack(struct sk_buff int err; struct flowi fl; - IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS); + IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); + payload_len = (skb->tail - skb->network_header) - sizeof(*pip6); mldlen = skb->tail - skb->transport_header; pip6->payload_len = htons(payload_len); @@ -1473,13 +1474,15 @@ static void mld_sendpack(struct sk_buff if (err) goto err_out; + payload_len = skb->len; + err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev, dst_output); out: if (!err) { ICMP6MSGOUT_INC_STATS_BH(net, idev, ICMPV6_MLD2_REPORT); ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS); - IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS); + IP6_UPD_PO_STATS_BH(net, idev, IPSTATS_MIB_OUTMCAST, payload_len); } else IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTDISCARDS); @@ -1773,10 +1776,6 @@ static void igmp6_send(struct in6_addr * IPV6_TLV_PADN, 0 }; struct flowi fl; - rcu_read_lock(); - IP6_INC_STATS(net, __in6_dev_get(dev), - IPSTATS_MIB_OUTREQUESTS); - rcu_read_unlock(); if (type == ICMPV6_MGM_REDUCTION) snd_addr = &in6addr_linklocal_allrouters; else @@ -1786,6 +1785,11 @@ static void igmp6_send(struct in6_addr * payload_len = len + sizeof(ra); full_len = sizeof(struct ipv6hdr) + payload_len; + rcu_read_lock(); + IP6_UPD_PO_STATS(net, __in6_dev_get(dev), + IPSTATS_MIB_OUT, full_len); + rcu_read_unlock(); + skb = sock_alloc_send_skb(sk, LL_ALLOCATED_SPACE(dev) + full_len, 1, &err); if (skb == NULL) { @@ -1838,13 +1842,14 @@ static void igmp6_send(struct in6_addr * if (err) goto err_out; + err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev, dst_output); out: if (!err) { ICMP6MSGOUT_INC_STATS(net, idev, type); ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); - IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTMCASTPKTS); + IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUTMCAST, full_len); } else IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); diff -up linux-2.6.29.noarch/net/ipv6/ndisc.c.orig linux-2.6.29.noarch/net/ipv6/ndisc.c --- linux-2.6.29.noarch/net/ipv6/ndisc.c.orig 2009-04-27 09:34:00.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv6/ndisc.c 2009-04-27 10:15:53.000000000 -0400 @@ -533,7 +533,7 @@ void ndisc_send_skb(struct sk_buff *skb, skb->dst = dst; idev = in6_dev_get(dst->dev); - IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS); + IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev, dst_output); @@ -1613,7 +1613,7 @@ void ndisc_send_redirect(struct sk_buff buff->dst = dst; idev = in6_dev_get(dst->dev); - IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS); + IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev, dst_output); if (!err) { diff -up linux-2.6.29.noarch/net/ipv6/proc.c.orig linux-2.6.29.noarch/net/ipv6/proc.c --- linux-2.6.29.noarch/net/ipv6/proc.c.orig 2009-03-23 19:12:14.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv6/proc.c 2009-04-27 10:15:53.000000000 -0400 @@ -61,7 +61,7 @@ static const struct file_operations sock static struct snmp_mib snmp6_ipstats_list[] = { /* ipv6 mib according to RFC 2465 */ - SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INRECEIVES), + SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INPKTS), SNMP_MIB_ITEM("Ip6InHdrErrors", IPSTATS_MIB_INHDRERRORS), SNMP_MIB_ITEM("Ip6InTooBigErrors", IPSTATS_MIB_INTOOBIGERRORS), SNMP_MIB_ITEM("Ip6InNoRoutes", IPSTATS_MIB_INNOROUTES), @@ -71,7 +71,7 @@ static struct snmp_mib snmp6_ipstats_lis SNMP_MIB_ITEM("Ip6InDiscards", IPSTATS_MIB_INDISCARDS), SNMP_MIB_ITEM("Ip6InDelivers", IPSTATS_MIB_INDELIVERS), SNMP_MIB_ITEM("Ip6OutForwDatagrams", IPSTATS_MIB_OUTFORWDATAGRAMS), - SNMP_MIB_ITEM("Ip6OutRequests", IPSTATS_MIB_OUTREQUESTS), + SNMP_MIB_ITEM("Ip6OutRequests", IPSTATS_MIB_OUTPKTS), SNMP_MIB_ITEM("Ip6OutDiscards", IPSTATS_MIB_OUTDISCARDS), SNMP_MIB_ITEM("Ip6OutNoRoutes", IPSTATS_MIB_OUTNOROUTES), SNMP_MIB_ITEM("Ip6ReasmTimeout", IPSTATS_MIB_REASMTIMEOUT), @@ -83,6 +83,12 @@ static struct snmp_mib snmp6_ipstats_lis SNMP_MIB_ITEM("Ip6FragCreates", IPSTATS_MIB_FRAGCREATES), SNMP_MIB_ITEM("Ip6InMcastPkts", IPSTATS_MIB_INMCASTPKTS), SNMP_MIB_ITEM("Ip6OutMcastPkts", IPSTATS_MIB_OUTMCASTPKTS), + SNMP_MIB_ITEM("Ip6InOctets", IPSTATS_MIB_INOCTETS), + SNMP_MIB_ITEM("Ip6OutOctets", IPSTATS_MIB_OUTOCTETS), + SNMP_MIB_ITEM("Ip6InMcastOctets", IPSTATS_MIB_INMCASTOCTETS), + SNMP_MIB_ITEM("Ip6OutMcastOctets", IPSTATS_MIB_OUTMCASTOCTETS), + SNMP_MIB_ITEM("Ip6InBcastOctets", IPSTATS_MIB_INBCASTOCTETS), + SNMP_MIB_ITEM("Ip6OutBcastOctets", IPSTATS_MIB_OUTBCASTOCTETS), SNMP_MIB_SENTINEL }; diff -up linux-2.6.29.noarch/net/ipv6/raw.c.orig linux-2.6.29.noarch/net/ipv6/raw.c --- linux-2.6.29.noarch/net/ipv6/raw.c.orig 2009-03-23 19:12:14.000000000 -0400 +++ linux-2.6.29.noarch/net/ipv6/raw.c 2009-04-27 10:15:53.000000000 -0400 @@ -638,7 +638,7 @@ static int rawv6_send_hdrinc(struct sock if (err) goto error_fault; - IP6_INC_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS); + IP6_UPD_PO_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len); err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev, dst_output); if (err > 0) --- NEW FILE patch-2.6.30-rc4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJ+TT7yGugalF9Dw4RApuTAJ4kiOWQGtfnlmqTUeCFLZjcl1U8ugCfSQA8 nrj0GH59l7TgIN/zQ5NhzKc= =wgXk -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1014.2.10 retrieving revision 1.1014.2.11 diff -u -p -r1.1014.2.10 -r1.1014.2.11 --- .cvsignore 24 Apr 2009 22:27:02 -0000 1.1014.2.10 +++ .cvsignore 2 May 2009 18:00:24 -0000 1.1014.2.11 @@ -6,4 +6,4 @@ temp-* kernel-2.6.29 linux-2.6.29.tar.bz2 patch-2.6.29-git15.bz2 -patch-2.6.30-rc3.bz2 +patch-2.6.30-rc4.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.238.6.17 retrieving revision 1.238.6.18 diff -u -p -r1.238.6.17 -r1.238.6.18 --- config-generic 24 Apr 2009 22:27:04 -0000 1.238.6.17 +++ config-generic 2 May 2009 18:00:24 -0000 1.238.6.18 @@ -3967,8 +3967,10 @@ CONFIG_XEN_NETDEV_BACKEND=y CONFIG_RD_GZIP=y # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set -# CONFIG_XEN_GNTDEV is not set +CONFIG_XEN_GNTDEV=y CONFIG_XEN_SYS_HYPERVISOR=y # CONFIG_ENABLE_EVENT_TRACING is not set # CONFIG_FUNCTION_PROFILER is not set CONFIG_CLASSIC_RCU=y +CONFIG_XEN_PCI_PASSTHROUGH=y +# CONFIG_XEN_PCI_PASSTHROUGH_DEBUG is not set Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.68.6.7 retrieving revision 1.68.6.8 diff -u -p -r1.68.6.7 -r1.68.6.8 --- config-x86-generic 24 Apr 2009 22:27:04 -0000 1.68.6.7 +++ config-x86-generic 2 May 2009 18:00:24 -0000 1.68.6.8 @@ -109,7 +109,7 @@ CONFIG_PCMCIA_FDOMAIN=m CONFIG_SCSI_FUTURE_DOMAIN=m CONFIG_SCSI_ADVANSYS=m -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR=y CONFIG_SECCOMP=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.68.2.7 retrieving revision 1.68.2.8 diff -u -p -r1.68.2.7 -r1.68.2.8 --- config-x86_64-generic 24 Apr 2009 22:27:05 -0000 1.68.2.7 +++ config-x86_64-generic 2 May 2009 18:00:24 -0000 1.68.2.8 @@ -236,7 +236,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_BLK_DEV_CS5530 is not set # CONFIG_BLK_DEV_CS5535 is not set -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_ALL is not set CONFIG_SGI_IOC4=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1294.2.21 retrieving revision 1.1294.2.22 diff -u -p -r1.1294.2.21 -r1.1294.2.22 --- kernel.spec 24 Apr 2009 22:27:09 -0000 1.1294.2.21 +++ kernel.spec 2 May 2009 18:00:24 -0000 1.1294.2.22 @@ -57,7 +57,7 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 3 +%define rcrev 4 # The git snapshot level %define gitrev 0 # Set rpm version accordingly @@ -603,6 +603,9 @@ Patch147: linux-2.6-imac-transparent-bri Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch Patch160: linux-2.6-execshield.patch + +Patch200: linux-2.6-ext4-prealloc-fixes.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 @@ -674,6 +677,11 @@ Patch3000: linux-2.6-btrfs-experimental- Patch9002: cpufreq-add-atom-to-p4-clockmod.patch +Patch9100: linux-2.6-iwl3945-remove-useless-exports.patch + +#snmp fixes +Patch10000: linux-2.6-missing-rfc2465-stats.patch + Patch9997: xen.pvops.pre.patch Patch9998: xen.pvops.patch Patch9999: xen.pvops.post.patch @@ -871,12 +879,14 @@ exit 1 %endif # more sanity checking; do it quietly -for patch in %{patches} ; do - if [ ! -f $patch ] ; then - echo "ERROR: Patch ${patch##/*/} listed in specfile but is missing" - exit 1 - fi -done 2>/dev/null +if [ "%{patches}" != "%%{patches}" ] ; then + for patch in %{patches} ; do + if [ ! -f $patch ] ; then + echo "ERROR: Patch ${patch##/*/} listed in specfile but is missing" + exit 1 + fi + done +fi 2>/dev/null patch_command='patch -p1 -F1 -s' ApplyPatch() @@ -886,7 +896,7 @@ ApplyPatch() if [ ! -f $RPM_SOURCE_DIR/$patch ]; then exit 1 fi - if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then + if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then if [ "${patch:0:10}" != "patch-2.6." ] ; then echo "ERROR: Patch $patch not listed as a source patch in specfile" exit 1 @@ -1085,6 +1095,8 @@ ApplyPatch linux-2.6-sysrq-c.patch ApplyPatch rds-only-on-64-bit-or-x86.patch +ApplyPatch linux-2.6-missing-rfc2465-stats.patch + # Architecture patches # x86(-64) @@ -1118,6 +1130,7 @@ ApplyPatch linux-2.6-execshield.patch # # ext4 +ApplyPatch linux-2.6-ext4-prealloc-fixes.patch # xfs @@ -1232,6 +1245,8 @@ ApplyPatch linux-2.6-silence-acpi-blackl #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch +ApplyPatch linux-2.6-iwl3945-remove-useless-exports.patch + ApplyPatch xen.pvops.pre.patch ApplyPatch xen.pvops.patch ApplyPatch xen.pvops.post.patch @@ -1828,6 +1843,42 @@ fi # ||----w | # || || %changelog +* Sat May 02 2009 Michael Young +- update pvops patch from xen-tip/master +- Try enabling CONFIG_XEN_GNTDEV and CONFIG_XEN_PCI_PASSTHROUGH +- test a patch to allow CONFIG_CC_STACKPROTECTOR to be enabled + +* Fri May 01 2009 Eric Sandeen +- Fix ext4 corruption on partial write into prealloc block + +* Thu Apr 30 2009 Kyle McMartin +- 2.6.30-rc4 + +* Wed Apr 29 2009 Dave Jones +- 2.6.30-rc3-git6 + +* Tue Apr 28 2009 Dave Jones +- 2.6.30-rc3-git4 + +* Tue Apr 28 2009 Chuck Ebbert +- Make the kernel-vanilla package buildable again. +- Allow building with older versions of RPM. + +* Tue Apr 28 2009 Neil Horman +- Backport missing snmp stats (bz 492391) + +* Tue Apr 28 2009 Chuck Ebbert 2.6.30-0.72.rc3.git3 +- Drop unused exports from the iwl3945 driver. + +* Tue Apr 28 2009 Chuck Ebbert +- Linux 2.6.30-rc3-git3 + +* Mon Apr 27 2009 Dave Jones +- 2.6.30-rc3-git2 + +* Sun Apr 26 2009 Chuck Ebbert 2.6.30-0.68.rc3.git1 +- Linux 2.6.30-rc3-git1 + * Fri Apr 24 2009 Michael Young - switch back to devel kernel branch - switch pvops to xen-tip/next branch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.976.2.11 retrieving revision 1.976.2.12 diff -u -p -r1.976.2.11 -r1.976.2.12 --- sources 24 Apr 2009 22:27:15 -0000 1.976.2.11 +++ sources 2 May 2009 18:00:25 -0000 1.976.2.12 @@ -1,2 +1,2 @@ 64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2 -cd69d16ea42bbf20d0a505690be45868 patch-2.6.30-rc3.bz2 +1672a3064a2bfe049715a1103f03561c patch-2.6.30-rc4.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.888.2.10 retrieving revision 1.888.2.11 diff -u -p -r1.888.2.10 -r1.888.2.11 --- upstream 24 Apr 2009 22:27:16 -0000 1.888.2.10 +++ upstream 2 May 2009 18:00:25 -0000 1.888.2.11 @@ -1,2 +1,2 @@ linux-2.6.29.tar.bz2 -patch-2.6.30-rc3.bz2 +patch-2.6.30-rc4.bz2 xen.pvops.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -p -N -r 1.1.2.17 -r 1.1.2.18 xen.pvops.patch Index: xen.pvops.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -p -r1.1.2.17 -r1.1.2.18 --- xen.pvops.patch 24 Apr 2009 22:27:17 -0000 1.1.2.17 +++ xen.pvops.patch 2 May 2009 18:00:25 -0000 1.1.2.18 @@ -155,7 +155,7 @@ index 0688482..02cced1 100644 + closely matches the rcu_bh "np" number for that same CPU. This + is due to short-circuit evaluation in rcu_pending(). diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index 600cdd7..6b5b051 100644 +index 90b3924..6b5b051 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1240,6 +1240,11 @@ and is between 256 and 4096 characters. It is defined in the file @@ -180,15 +180,6 @@ index 600cdd7..6b5b051 100644 nointroute [IA-64] nojitter [IA64] Disables jitter checking for ITC timers. -@@ -1620,6 +1628,8 @@ and is between 256 and 4096 characters. It is defined in the file - - nowb [ARM] - -+ nox2apic [X86-64,APIC] Do not enable x2APIC mode. -+ - nptcg= [IA64] Override max number of concurrent global TLB - purges which is reported from either PAL_VM_SUMMARY or - SAL PALO. diff --git a/Documentation/kmemcheck.txt b/Documentation/kmemcheck.txt new file mode 100644 index 0000000..a848d49 @@ -11177,10 +11168,10 @@ index 34c1304..5d55158 100644 0: always panic on uncorrected errors, log corrected errors 1: panic or SIGBUS on uncorrected errors, log corrected errors diff --git a/MAINTAINERS b/MAINTAINERS -index cb95710..7ccf36e 100644 +index c547f4a..0e4bb2e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3336,6 +3336,14 @@ F: drivers/serial/kgdboc.c +@@ -3333,6 +3333,14 @@ F: drivers/serial/kgdboc.c F: include/linux/kgdb.h F: kernel/kgdb.c @@ -11195,7 +11186,7 @@ index cb95710..7ccf36e 100644 KMEMTRACE P: Eduard - Gabriel Munteanu M: eduard.munteanu at linux360.ro -@@ -4371,6 +4379,16 @@ S: Maintained +@@ -4375,6 +4383,16 @@ S: Maintained F: include/linux/delayacct.h F: kernel/delayacct.c @@ -11213,7 +11204,7 @@ index cb95710..7ccf36e 100644 P: Christoph Hellwig M: hch at infradead.org diff --git a/Makefile b/Makefile -index 9e5dc8f..c1ce11b 100644 +index eb38c83..7cc8517 100644 --- a/Makefile +++ b/Makefile @@ -557,6 +557,10 @@ ifdef CONFIG_FUNCTION_TRACER @@ -14971,7 +14962,7 @@ index 0000000..ad8ec35 +obj-$(CONFIG_IA32_EMULATION) += ia32/ + diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index c9086e6..cab2e22 100644 +index df9e885..cab2e22 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -42,10 +42,11 @@ config X86 @@ -14987,15 +14978,7 @@ index c9086e6..cab2e22 100644 config ARCH_DEFCONFIG string -@@ -277,6 +278,7 @@ config SPARSE_IRQ - config NUMA_MIGRATE_IRQ_DESC - bool "Move irq desc when changing irq smp_affinity" - depends on SPARSE_IRQ && NUMA -+ depends on BROKEN - default n - ---help--- - This enables moving irq_desc to cpu/node that irq will use handled. -@@ -354,7 +356,7 @@ config X86_UV +@@ -355,7 +356,7 @@ config X86_UV depends on X86_64 depends on X86_EXTENDED_PLATFORM depends on NUMA @@ -15004,15 +14987,7 @@ index c9086e6..cab2e22 100644 ---help--- This option is needed in order to support SGI Ultraviolet systems. If you don't have one of these, you should say N here. -@@ -664,6 +666,7 @@ config MAXSMP - - config NR_CPUS - int "Maximum number of CPUs" if SMP && !MAXSMP -+ range 2 8 if SMP && X86_32 && !X86_BIGSMP - range 2 512 if SMP && !MAXSMP - default "1" if !SMP - default "4096" if MAXSMP -@@ -725,6 +728,7 @@ config X86_UP_IOAPIC +@@ -727,6 +728,7 @@ config X86_UP_IOAPIC config X86_LOCAL_APIC def_bool y depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC @@ -15020,7 +14995,7 @@ index c9086e6..cab2e22 100644 config X86_IO_APIC def_bool y -@@ -1192,6 +1196,16 @@ config ARCH_MEMORY_PROBE +@@ -1194,6 +1196,16 @@ config ARCH_MEMORY_PROBE def_bool X86_64 depends on MEMORY_HOTPLUG @@ -15037,7 +15012,7 @@ index c9086e6..cab2e22 100644 source "mm/Kconfig" config HIGHPTE -@@ -1827,6 +1841,10 @@ config PCI_OLPC +@@ -1829,6 +1841,10 @@ config PCI_OLPC def_bool y depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY) @@ -15084,7 +15059,7 @@ index d8359e7..9a88937 100644 def_bool y diff --git a/arch/x86/Makefile b/arch/x86/Makefile -index f05d8c9..1b68659 100644 +index 8c86b72..1b68659 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -7,8 +7,6 @@ else @@ -15132,26 +15107,6 @@ index f05d8c9..1b68659 100644 # drivers-y are linked after core-y drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/ -@@ -153,7 +143,7 @@ endif - - boot := arch/x86/boot - --BOOT_TARGETS = bzlilo bzdisk fdimage fdimage144 fdimage288 isoimage install -+BOOT_TARGETS = bzlilo bzdisk fdimage fdimage144 fdimage288 isoimage - - PHONY += bzImage $(BOOT_TARGETS) - -@@ -171,6 +161,10 @@ bzImage: vmlinux - $(BOOT_TARGETS): vmlinux - $(Q)$(MAKE) $(build)=$(boot) $@ - -+PHONY += install -+install: -+ $(Q)$(MAKE) $(build)=$(boot) $@ -+ - PHONY += vdso_install - vdso_install: - $(Q)$(MAKE) $(build)=arch/x86/vdso $@ diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 6633b6e..658bc52 100644 --- a/arch/x86/boot/Makefile @@ -18383,7 +18338,7 @@ index 8820a73..b078352 100644 #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h -index 0d53425..cbfdc26 100644 +index 0d53425..a5f6790 100644 --- a/arch/x86/include/asm/traps.h +++ b/arch/x86/include/asm/traps.h @@ -2,6 +2,7 @@ @@ -18394,7 +18349,16 @@ index 0d53425..cbfdc26 100644 #ifdef CONFIG_X86_32 #define dotraplinkage -@@ -74,7 +75,6 @@ static inline int get_si_code(unsigned long condition) +@@ -13,6 +14,8 @@ asmlinkage void divide_error(void); + asmlinkage void debug(void); + asmlinkage void nmi(void); + asmlinkage void int3(void); ++asmlinkage void xen_debug(void); ++asmlinkage void xen_int3(void); + asmlinkage void overflow(void); + asmlinkage void bounds(void); + asmlinkage void invalid_op(void); +@@ -74,7 +77,6 @@ static inline int get_si_code(unsigned long condition) } extern int panic_on_unrecovered_nmi; @@ -19193,7 +19157,7 @@ index 1c11b81..8e07c14 100644 unsigned long vect = 0, psaival = 0; diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c -index a2789e4..b562550 100644 +index 30da617..b562550 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -59,11 +59,14 @@ @@ -19655,22 +19619,7 @@ index a2789e4..b562550 100644 } #endif /* CONFIG_INTR_REMAP */ [...2911 lines suppressed...] ++#define __XEN_ASM_PCIFRONT_H__ ++ ++#include ++ ++#ifdef __KERNEL__ ++ ++struct pcifront_device; ++struct pci_bus; ++ ++struct pcifront_sd { ++ int domain; ++ struct pcifront_device *pdev; ++}; ++ ++static inline struct pcifront_device * ++pcifront_get_pdev(struct pcifront_sd *sd) ++{ ++ return sd->pdev; ++} ++ ++static inline void pcifront_init_sd(struct pcifront_sd *sd, ++ unsigned int domain, unsigned int bus, ++ struct pcifront_device *pdev) ++{ ++ sd->domain = domain; ++ sd->pdev = pdev; ++} ++ ++static inline void pcifront_setup_root_resources(struct pci_bus *bus, ++ struct pcifront_sd *sd) ++{ ++} ++ ++extern struct rw_semaphore pci_bus_sem; ++ ++#endif /* __KERNEL__ */ ++ ++#endif /* __XEN_ASM_PCIFRONT_H__ */ diff --git a/include/xen/privcmd.h b/include/xen/privcmd.h new file mode 100644 index 0000000..c5d9067 @@ -49658,23 +51161,10 @@ index d82142b..37c6363 100644 * handle_IRQ_event - irq action chain handler * @irq: the interrupt number diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c -index 7e2e7dd..4925ece 100644 +index 2734eca..4925ece 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c -@@ -109,10 +109,9 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask) - spin_lock_irqsave(&desc->lock, flags); - - #ifdef CONFIG_GENERIC_PENDING_IRQ -- if (desc->status & IRQ_MOVE_PCNTXT || desc->status & IRQ_DISABLED) { -- cpumask_copy(desc->affinity, cpumask); -+ if (desc->status & IRQ_MOVE_PCNTXT) - desc->chip->set_affinity(irq, cpumask); -- } else { -+ else { - desc->status |= IRQ_MOVE_PENDING; - cpumask_copy(desc->pending_mask, cpumask); - } -@@ -931,7 +930,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, +@@ -930,7 +930,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, kfree(action); #ifdef CONFIG_DEBUG_SHIRQ @@ -49707,7 +51197,7 @@ index 4ebaf85..41c88fe 100644 { /* Information passed to kthread() from kthreadd. */ diff --git a/kernel/lockdep.c b/kernel/lockdep.c -index b0f0118..8bbeef9 100644 +index accb40c..8bbeef9 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -42,12 +42,14 @@ @@ -49726,48 +51216,7 @@ index b0f0118..8bbeef9 100644 #ifdef CONFIG_PROVE_LOCKING int prove_locking = 1; module_param(prove_locking, int, 0644); -@@ -2490,13 +2492,20 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this, - void lockdep_init_map(struct lockdep_map *lock, const char *name, - struct lock_class_key *key, int subclass) - { -- if (unlikely(!debug_locks)) -+ lock->class_cache = NULL; -+#ifdef CONFIG_LOCK_STAT -+ lock->cpu = raw_smp_processor_id(); -+#endif -+ -+ if (DEBUG_LOCKS_WARN_ON(!name)) { -+ lock->name = "NULL"; - return; -+ } -+ -+ lock->name = name; - - if (DEBUG_LOCKS_WARN_ON(!key)) - return; -- if (DEBUG_LOCKS_WARN_ON(!name)) -- return; - /* - * Sanity check, the lock-class key must be persistent: - */ -@@ -2505,12 +2514,11 @@ void lockdep_init_map(struct lockdep_map *lock, const char *name, - DEBUG_LOCKS_WARN_ON(1); - return; - } -- lock->name = name; - lock->key = key; -- lock->class_cache = NULL; --#ifdef CONFIG_LOCK_STAT -- lock->cpu = raw_smp_processor_id(); --#endif -+ -+ if (unlikely(!debug_locks)) -+ return; -+ - if (subclass) - register_lock_class(lock, subclass, 1); - } -@@ -2929,8 +2937,6 @@ void lock_set_class(struct lockdep_map *lock, const char *name, +@@ -2935,8 +2937,6 @@ void lock_set_class(struct lockdep_map *lock, const char *name, } EXPORT_SYMBOL_GPL(lock_set_class); @@ -49776,7 +51225,7 @@ index b0f0118..8bbeef9 100644 /* * We are not always called with irqs disabled - do that here, * and also avoid lockdep recursion: -@@ -2957,8 +2963,6 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, +@@ -2963,8 +2963,6 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, } EXPORT_SYMBOL_GPL(lock_acquire); @@ -49785,7 +51234,7 @@ index b0f0118..8bbeef9 100644 void lock_release(struct lockdep_map *lock, int nested, unsigned long ip) { -@@ -3099,6 +3103,8 @@ found_it: +@@ -3105,6 +3103,8 @@ found_it: hlock->holdtime_stamp = now; } @@ -49794,7 +51243,7 @@ index b0f0118..8bbeef9 100644 stats = get_lock_stats(hlock_class(hlock)); if (waittime) { if (hlock->read) -@@ -3114,8 +3120,6 @@ found_it: +@@ -3120,8 +3120,6 @@ found_it: lock->ip = ip; } @@ -49803,7 +51252,7 @@ index b0f0118..8bbeef9 100644 void lock_contended(struct lockdep_map *lock, unsigned long ip) { unsigned long flags; -@@ -3137,14 +3141,10 @@ void lock_contended(struct lockdep_map *lock, unsigned long ip) +@@ -3143,14 +3141,10 @@ void lock_contended(struct lockdep_map *lock, unsigned long ip) } EXPORT_SYMBOL_GPL(lock_contended); @@ -49930,19 +51379,6 @@ index 507cf2b..0249c94 100644 spin_lock_mutex(&lock->wait_lock, flags); } -diff --git a/kernel/panic.c b/kernel/panic.c -index 934fb37..3dcaa16 100644 ---- a/kernel/panic.c -+++ b/kernel/panic.c -@@ -221,7 +221,7 @@ void add_taint(unsigned flag) - * post-warning case. - */ - if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off()) -- printk(KERN_WARNING "Disabling lockdep due to kernel taint\n"); -+ printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n"); - - set_bit(flag, &tainted_mask); - } diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c new file mode 100644 index 0000000..0939609 @@ -53418,7 +54854,7 @@ index 7724e04..b2a6d7d 100644 struct proc_dir_entry *entry; diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index dfcd83c..4559e84 100644 +index 0692ab5..e950805 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -25,16 +25,6 @@ @@ -60128,7 +61564,7 @@ index 42a2dbc..ea7c3b4 100644 } EXPORT_SYMBOL(abort_exclusive_wait); diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index c6e854f..f70047b 100644 +index 812c282..b2a59e1 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -9,8 +9,20 @@ config PRINTK_TIME xen.pvops.post.patch: Index: xen.pvops.post.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -p -r1.1.2.11 -r1.1.2.12 --- xen.pvops.post.patch 24 Apr 2009 22:27:21 -0000 1.1.2.11 +++ xen.pvops.post.patch 2 May 2009 18:00:29 -0000 1.1.2.12 @@ -1,5 +1,6 @@ Reapply and merge in Fedora changes remove localversion-tip file to avoid -tip being added to the kernel name +Test some patches to get STACKPROTECTOR working --- a/arch/x86/mm/init.c 2009-04-23 20:13:34.000000000 +0100 +++ b/arch/x86/mm/init.c 2009-04-24 20:27:42.000000000 +0100 @@ -63,3 +64,47 @@ remove localversion-tip file to avoid -t +++ /dev/null 2009-02-17 18:08:14.005240123 +0000 @@ -1 +0,0 @@ --tip +--- linux-2.6.29.x86_64/arch/x86/xen/Makefile.orig 2009-04-24 22:54:26.000000000 +0100 ++++ linux-2.6.29.x86_64/arch/x86/xen/Makefile 2009-04-26 16:46:57.000000000 +0100 +@@ -4,6 +4,10 @@ + CFLAGS_REMOVE_time.o = -pg + CFLAGS_REMOVE_irq.o = -pg + endif ++nostackp := $(call cc-option, -fno-stack-protector) ++CFLAGS_enlighten.o := $(nostackp) ++CFLAGS_mmu.o := $(nostackp) ++CFLAGS_irq.o := $(nostackp) + + obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ + time.o xen-asm.o xen-asm_$(BITS).o \ +--- linux-2.6.29.x86_64/arch/x86/xen/enlighten.c.orig 2009-04-26 16:49:24.000000000 +0100 ++++ linux-2.6.29.x86_64/arch/x86/xen/enlighten.c 2009-04-26 21:57:28.000000000 +0100 +@@ -965,7 +965,7 @@ + + xen_domain_type = XEN_PV_DOMAIN; + +- BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0); ++/* BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0); */ + + xen_setup_features(); + +--- linux-2.6.29.x86_64/drivers/xen/Makefile.orig 2009-04-26 16:49:25.000000000 +0100 ++++ linux-2.6.29.x86_64/drivers/xen/Makefile 2009-04-26 22:26:55.000000000 +0100 +@@ -1,3 +1,6 @@ ++nostackp := $(call cc-option, -fno-stack-protector) ++CFLAGS_features.o := $(nostackp) ++ + obj-y += grant-table.o features.o events.o manage.o biomerge.o + obj-y += xenbus/ + +--- vanilla-2.6.30-rc3/arch/x86/kernel/cpu/Makefile 2009-04-23 20:13:34.000000000 +0100 ++++ linux-2.6.29.x86_64/arch/x86/kernel/cpu/Makefile 2009-04-27 21:47:28.000000000 +0100 +@@ -6,6 +6,8 @@ + ifdef CONFIG_FUNCTION_TRACER + CFLAGS_REMOVE_common.o = -pg + endif ++nostackp := $(call cc-option, -fno-stack-protector) ++CFLAGS_common.o := $(nostackp) + + obj-y := intel_cacheinfo.o addon_cpuid_features.o + obj-y += proc.o capflags.o powerflags.o common.o --- patch-2.6.30-rc3.bz2.sign DELETED --- From vpv at fedoraproject.org Sat May 2 18:25:14 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sat, 2 May 2009 18:25:14 +0000 (UTC) Subject: rpms/libvoikko/F-11 .cvsignore, 1.14, 1.15 libvoikko.spec, 1.23, 1.24 sources, 1.14, 1.15 Message-ID: <20090502182514.7A6FB70120@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/libvoikko/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14314 Modified Files: .cvsignore libvoikko.spec sources Log Message: * Sat May 2 2009 Ville-Pekka Vainio - 2.1-1 - 2.1 final, including fixes to grammar checking Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvoikko/F-11/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 17 Apr 2009 20:20:56 -0000 1.14 +++ .cvsignore 2 May 2009 18:24:43 -0000 1.15 @@ -1 +1 @@ -libvoikko-2.1rc4.tar.gz +libvoikko-2.1.tar.gz Index: libvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvoikko/F-11/libvoikko.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- libvoikko.spec 17 Apr 2009 20:20:56 -0000 1.23 +++ libvoikko.spec 2 May 2009 18:24:43 -0000 1.24 @@ -1,15 +1,15 @@ Name: libvoikko Version: 2.1 -Release: 0.5.rc4%{?dist} +Release: 1%{?dist} Summary: Voikko is a library for spellcheckers and hyphenators Group: System Environment/Libraries License: GPLv2+ URL: http://voikko.sourceforge.net/ # The usual format of stable release URLs -#Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz # The usual format of test release URLs -Source0: http://www.puimula.org/htp/testing/%{name}-%{version}rc4.tar.gz +#Source0: http://www.puimula.org/htp/testing/%{name}-%{version}rc4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: malaga-devel >= 7.8 python @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvoikko.pc %changelog +* Sat May 2 2009 Ville-Pekka Vainio - 2.1-1 +- 2.1 final, including fixes to grammar checking + * Fri Apr 17 2009 Ville-Pekka Vainio - 2.1-0.5.rc4 - 2.1rc4: - Fix invalid use of delete vs. delete[] Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvoikko/F-11/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 17 Apr 2009 20:20:56 -0000 1.14 +++ sources 2 May 2009 18:24:43 -0000 1.15 @@ -1 +1 @@ -17458bdd150cc02d6071eeda69d4d3db libvoikko-2.1rc4.tar.gz +c0c04a2979126fc9103fa4d88358c90a libvoikko-2.1.tar.gz From salimma at fedoraproject.org Sat May 2 21:05:23 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Sat, 2 May 2009 21:05:23 +0000 (UTC) Subject: rpms/google-gadgets/devel .cvsignore, 1.5, 1.6 google-gadgets.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <20090502210523.63B4E70133@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/google-gadgets/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9664/devel Modified Files: .cvsignore google-gadgets.spec sources Log Message: * Sat May 2 2009 Michel Salim - 0.10.6-0.1.20090430svn1449%{?dist} - Update to SVN checkout, for xulrunner 1.9.1 compatibility Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/google-gadgets/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 14 Jan 2009 17:48:44 -0000 1.5 +++ .cvsignore 2 May 2009 21:04:53 -0000 1.6 @@ -1 +1 @@ -google-gadgets-for-linux-0.10.5.tar.bz2 +google-gadgets-0.10.6-r1449.tar.bz2 Index: google-gadgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/google-gadgets/devel/google-gadgets.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- google-gadgets.spec 28 Apr 2009 03:25:37 -0000 1.12 +++ google-gadgets.spec 2 May 2009 21:04:53 -0000 1.13 @@ -1,14 +1,21 @@ +%define svnrev 1449 +%define alphatag 20090430svn%{svnrev} + Name: google-gadgets -Version: 0.10.5 -Release: 6%{?dist} +Version: 0.10.6 +Release: 0.1.%{alphatag}%{?dist} Summary: Google Gadgets for Linux Group: User Interface/Desktops License: ASL 2.0 URL: http://code.google.com/p/google-gadgets-for-linux/ -Source0: http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-%{version}.tar.bz2 +#Source0: http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-%{version}.tar.bz2 +Source0: %{name}-%{version}-r%{svnrev}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# for SVN checkouts +BuildRequires: autoconf automake libtool + BuildRequires: libcurl-devel libxml2-devel zlib-devel libtool-ltdl-devel # still needed even if we're not buliding gtkmoz element, for JavaScript BuildRequires: xulrunner-devel-unstable @@ -74,6 +81,9 @@ chmod -x ggadget/qt/utilities.h %build +autotools/bootstrap.sh +#ln -s %{_datadir}/automake-*/mkinstalldirs libltdl/ + %configure --disable-static \ --with-browser-plugins-dir=%{_libdir}/mozilla/plugins @@ -112,6 +122,10 @@ done # wipe prematurely-generated MIME info rm -rf $RPM_BUILD_ROOT%{_datadir}/mime rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache + +# SVN checkout: remove ltdl cruft +rm -rf $RPM_BUILD_ROOT%{_libdir}/*ltdl* +rm -rf $RPM_BUILD_ROOT%{_includedir}/*ltdl* %clean @@ -189,6 +203,9 @@ update-desktop-database &> /dev/null || %changelog +* Sat May 2 2009 Michel Salim - 0.10.6-0.1.20090430svn1449%{?dist} +- Update to SVN checkout, for xulrunner 1.9.1 compatibility + * Mon Apr 27 2009 Christopher Aillon - 0.10.5-6 - Rebuild against newer gecko Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/google-gadgets/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 14 Jan 2009 17:48:44 -0000 1.5 +++ sources 2 May 2009 21:04:53 -0000 1.6 @@ -1 +1 @@ -fdad6bd761b6c603e457b5d0d92ec2f9 google-gadgets-for-linux-0.10.5.tar.bz2 +9692fe3234b768a452c5c147e9955701 google-gadgets-0.10.6-r1449.tar.bz2 From salimma at fedoraproject.org Sat May 2 21:05:23 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Sat, 2 May 2009 21:05:23 +0000 (UTC) Subject: rpms/google-gadgets/F-11 .cvsignore, 1.5, 1.6 google-gadgets.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <20090502210523.50CB370120@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/google-gadgets/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9664/F-11 Modified Files: .cvsignore google-gadgets.spec sources Log Message: * Sat May 2 2009 Michel Salim - 0.10.6-0.1.20090430svn1449%{?dist} - Update to SVN checkout, for xulrunner 1.9.1 compatibility Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 14 Jan 2009 17:48:44 -0000 1.5 +++ .cvsignore 2 May 2009 21:04:52 -0000 1.6 @@ -1 +1 @@ -google-gadgets-for-linux-0.10.5.tar.bz2 +google-gadgets-0.10.6-r1449.tar.bz2 Index: google-gadgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- google-gadgets.spec 27 Apr 2009 23:04:59 -0000 1.12 +++ google-gadgets.spec 2 May 2009 21:04:52 -0000 1.13 @@ -1,14 +1,21 @@ +%define svnrev 1449 +%define alphatag 20090430svn%{svnrev} + Name: google-gadgets -Version: 0.10.5 -Release: 6%{?dist} +Version: 0.10.6 +Release: 0.1.%{alphatag}%{?dist} Summary: Google Gadgets for Linux Group: User Interface/Desktops License: ASL 2.0 URL: http://code.google.com/p/google-gadgets-for-linux/ -Source0: http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-%{version}.tar.bz2 +#Source0: http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-%{version}.tar.bz2 +Source0: %{name}-%{version}-r%{svnrev}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# for SVN checkouts +BuildRequires: autoconf automake libtool + BuildRequires: libcurl-devel libxml2-devel zlib-devel libtool-ltdl-devel # still needed even if we're not buliding gtkmoz element, for JavaScript BuildRequires: xulrunner-devel-unstable @@ -74,6 +81,9 @@ chmod -x ggadget/qt/utilities.h %build +autotools/bootstrap.sh +#ln -s %{_datadir}/automake-*/mkinstalldirs libltdl/ + %configure --disable-static \ --with-browser-plugins-dir=%{_libdir}/mozilla/plugins @@ -112,6 +122,10 @@ done # wipe prematurely-generated MIME info rm -rf $RPM_BUILD_ROOT%{_datadir}/mime rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache + +# SVN checkout: remove ltdl cruft +rm -rf $RPM_BUILD_ROOT%{_libdir}/*ltdl* +rm -rf $RPM_BUILD_ROOT%{_includedir}/*ltdl* %clean @@ -189,6 +203,9 @@ update-desktop-database &> /dev/null || %changelog +* Sat May 2 2009 Michel Salim - 0.10.6-0.1.20090430svn1449%{?dist} +- Update to SVN checkout, for xulrunner 1.9.1 compatibility + * Mon Apr 27 2009 Christopher Aillon - 0.10.5-6 - Rebuild against newer gecko Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 14 Jan 2009 17:48:44 -0000 1.5 +++ sources 2 May 2009 21:04:52 -0000 1.6 @@ -1 +1 @@ -fdad6bd761b6c603e457b5d0d92ec2f9 google-gadgets-for-linux-0.10.5.tar.bz2 +9692fe3234b768a452c5c147e9955701 google-gadgets-0.10.6-r1449.tar.bz2 From rdieter at fedoraproject.org Sat May 2 21:26:37 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 2 May 2009 21:26:37 +0000 (UTC) Subject: rpms/polkit-qt/devel import.log, NONE, 1.1 polkit-qt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502212637.EEAB370120@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/polkit-qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12980/devel Modified Files: .cvsignore sources Added Files: import.log polkit-qt.spec Log Message: import --- NEW FILE import.log --- polkit-qt-0_9_2-1_fc11:HEAD:polkit-qt-0.9.2-1.fc11.src.rpm:1241299565 --- NEW FILE polkit-qt.spec --- Name: polkit-qt Version: 0.9.2 Release: 1%{?dist} Summary: Qt bindings for PolicyKit Group: System Environment/Libraries License: GPLv2+ URL: http://api.kde.org/kdesupport-api/kdesupport-apidocs/polkit-qt/html/ Source0: http://download.kde.org/stable/apps/KDE4.x/admin/polkit-qt-0.9.2.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: automoc4 BuildRequires: cmake BuildRequires: PolicyKit-devel BuildRequires: qt4-devel %description Polkit-qt is a library that lets developers use the PolicyKit API through a nice Qt-styled API. It is mainly a wrapper around QAction and QAbstractButton that lets you integrate those two component easily with PolicyKit. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: PolicyKit-devel %description devel %{summary}. %package examples Summary: Example files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description examples %{summary}. %prep %setup -q %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake} -DBUILD_EXAMPLES=1 .. popd make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/libpolkit-qt-core.so.0* %{_libdir}/libpolkit-qt-gui.so.0* %files devel %defattr(-,root,root,-) %{_includedir}/PolicyKit/polkit-qt/ %{_libdir}/libpolkit-qt-core.so %{_libdir}/libpolkit-qt-gui.so %{_libdir}/pkgconfig/polkit-qt.pc %{_libdir}/pkgconfig/polkit-qt-core.pc %{_libdir}/pkgconfig/polkit-qt-gui.pc %files examples %defattr(-,root,root,-) %{_sysconfdir}/dbus-1/system.d/org.qt.policykit.examples.conf %{_bindir}/polkit-example-helper %{_datadir}/PolicyKit/policy/org.qt.policykit.examples.policy %{_datadir}/dbus-1/system-services/org.qt.policykit.examples.service %changelog * Wed Apr 22 2009 Rex Dieter 0.9.2-1 - polkit-0.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/polkit-qt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:56:13 -0000 1.1 +++ .cvsignore 2 May 2009 21:26:07 -0000 1.2 @@ -0,0 +1 @@ +polkit-qt-0.9.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/polkit-qt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:56:13 -0000 1.1 +++ sources 2 May 2009 21:26:07 -0000 1.2 @@ -0,0 +1 @@ +14cb821f8917c13ed4154a3ab8e596be polkit-qt-0.9.2.tar.bz2 From rdieter at fedoraproject.org Sat May 2 21:33:03 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 2 May 2009 21:33:03 +0000 (UTC) Subject: rpms/polkit-qt/F-11 polkit-qt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090502213303.29EC970120@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/polkit-qt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13808 Modified Files: .cvsignore sources Added Files: polkit-qt.spec Log Message: sync w/devel branch --- NEW FILE polkit-qt.spec --- Name: polkit-qt Version: 0.9.2 Release: 1%{?dist} Summary: Qt bindings for PolicyKit Group: System Environment/Libraries License: GPLv2+ URL: http://api.kde.org/kdesupport-api/kdesupport-apidocs/polkit-qt/html/ Source0: http://download.kde.org/stable/apps/KDE4.x/admin/polkit-qt-0.9.2.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: automoc4 BuildRequires: cmake BuildRequires: PolicyKit-devel BuildRequires: qt4-devel %description Polkit-qt is a library that lets developers use the PolicyKit API through a nice Qt-styled API. It is mainly a wrapper around QAction and QAbstractButton that lets you integrate those two component easily with PolicyKit. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: PolicyKit-devel %description devel %{summary}. %package examples Summary: Example files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description examples %{summary}. %prep %setup -q %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake} -DBUILD_EXAMPLES=1 .. popd make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/libpolkit-qt-core.so.0* %{_libdir}/libpolkit-qt-gui.so.0* %files devel %defattr(-,root,root,-) %{_includedir}/PolicyKit/polkit-qt/ %{_libdir}/libpolkit-qt-core.so %{_libdir}/libpolkit-qt-gui.so %{_libdir}/pkgconfig/polkit-qt.pc %{_libdir}/pkgconfig/polkit-qt-core.pc %{_libdir}/pkgconfig/polkit-qt-gui.pc %files examples %defattr(-,root,root,-) %{_sysconfdir}/dbus-1/system.d/org.qt.policykit.examples.conf %{_bindir}/polkit-example-helper %{_datadir}/PolicyKit/policy/org.qt.policykit.examples.policy %{_datadir}/dbus-1/system-services/org.qt.policykit.examples.service %changelog * Wed Apr 22 2009 Rex Dieter 0.9.2-1 - polkit-0.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/polkit-qt/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:56:13 -0000 1.1 +++ .cvsignore 2 May 2009 21:32:32 -0000 1.2 @@ -0,0 +1 @@ +polkit-qt-0.9.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/polkit-qt/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:56:13 -0000 1.1 +++ sources 2 May 2009 21:32:32 -0000 1.2 @@ -0,0 +1 @@ +14cb821f8917c13ed4154a3ab8e596be polkit-qt-0.9.2.tar.bz2 From myoung at fedoraproject.org Sat May 2 21:34:54 2009 From: myoung at fedoraproject.org (Michael Young) Date: Sat, 2 May 2009 21:34:54 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec, 1.1294.2.22, 1.1294.2.23 xen.pvops.post.patch, 1.1.2.12, 1.1.2.13 Message-ID: <20090502213454.4D5CD70120@cvs1.fedora.phx.redhat.com> Author: myoung Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13887 Modified Files: Tag: private-myoung-dom0-branch kernel.spec xen.pvops.post.patch Log Message: tweak to get pvops kernel to build with XEN_PCI_PASSTHROUGH and current config Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1294.2.22 retrieving revision 1.1294.2.23 diff -u -p -r1.1294.2.22 -r1.1294.2.23 --- kernel.spec 2 May 2009 18:00:24 -0000 1.1294.2.22 +++ kernel.spec 2 May 2009 21:34:23 -0000 1.1294.2.23 @@ -1847,6 +1847,7 @@ fi - update pvops patch from xen-tip/master - Try enabling CONFIG_XEN_GNTDEV and CONFIG_XEN_PCI_PASSTHROUGH - test a patch to allow CONFIG_CC_STACKPROTECTOR to be enabled +- patch to allow kernel to build with XEN_PCI_PASSTHROUGH and current config * Fri May 01 2009 Eric Sandeen - Fix ext4 corruption on partial write into prealloc block xen.pvops.post.patch: Index: xen.pvops.post.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -u -p -r1.1.2.12 -r1.1.2.13 --- xen.pvops.post.patch 2 May 2009 18:00:29 -0000 1.1.2.12 +++ xen.pvops.post.patch 2 May 2009 21:34:23 -0000 1.1.2.13 @@ -108,3 +108,13 @@ Test some patches to get STACKPROTECTOR obj-y := intel_cacheinfo.o addon_cpuid_features.o obj-y += proc.o capflags.o powerflags.o common.o +--- a/arch/x86/xen/Kconfig 2009-05-02 17:25:29.000000000 +0100 ++++ b/arch/x86/xen/Kconfig 2009-05-02 22:25:30.000000000 +0100 +@@ -42,6 +42,7 @@ + bool "Enable support for Xen PCI passthrough devices" + depends on XEN && PCI + select PCI_XEN ++ select XEN_XENBUS_FRONTEND + help + Enable support for passing PCI devices through to + unprivileged domains. (COMPLETELY UNTESTED) From rdieter at fedoraproject.org Sat May 2 22:23:06 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 2 May 2009 22:23:06 +0000 (UTC) Subject: rpms/eigen2/F-11 .cvsignore, 1.10, 1.11 eigen2.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <20090502222306.E62E070120@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/eigen2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19552 Modified Files: .cvsignore eigen2.spec sources Log Message: * Mon Apr 15 2009 Rex Dieter 2.0.1-1 - eigen-2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-11/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 2 Feb 2009 21:26:17 -0000 1.10 +++ .cvsignore 2 May 2009 22:22:36 -0000 1.11 @@ -1 +1 @@ -eigen-2.0.0.tar.bz2 +eigen-2.0.1.tar.bz2 Index: eigen2.spec =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-11/eigen2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- eigen2.spec 24 Feb 2009 14:16:18 -0000 1.12 +++ eigen2.spec 2 May 2009 22:22:36 -0000 1.13 @@ -8,8 +8,8 @@ Name: eigen2 Summary: A lightweight C++ template library for vector and matrix math -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Group: System Environment/Libraries License: GPLv2+ or LGPLv3+ URL: http://eigen.tuxfamily.org/ @@ -34,6 +34,7 @@ BuildRequires: tetex-latex BuildRequires: blas-devel BuildRequires: gsl-devel # can't use until undefined symbols are fixed: http://bugzilla.redhat.com/475411 +# also seems to have gcc44-related issues (here in eigen testsuite) #BuildRequires: suitesparse-devel BuildRequires: qt4-devel #-- Could NOT find TAUCS (missing: TAUCS_INCLUDES TAUCS_LIBRARIES) @@ -94,6 +95,9 @@ rm -rf %{buildroot} %changelog +* Mon Apr 15 2009 Rex Dieter 2.0.1-1 +- eigen-2.0.1 + * Tue Feb 24 2009 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-11/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 2 Feb 2009 21:26:17 -0000 1.10 +++ sources 2 May 2009 22:22:36 -0000 1.11 @@ -1 +1 @@ -bedfe344498b926a4b5db17d2846dbb5 eigen-2.0.0.tar.bz2 +3d7af1f727355dfe58531a3649c7d4b5 eigen-2.0.1.tar.bz2 From rdieter at fedoraproject.org Sat May 2 22:26:59 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 2 May 2009 22:26:59 +0000 (UTC) Subject: rpms/eigen2/F-10 .cvsignore, 1.8, 1.9 eigen2.spec, 1.7, 1.8 sources, 1.8, 1.9 Message-ID: <20090502222659.ADB1170131@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/eigen2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20432 Modified Files: .cvsignore eigen2.spec sources Log Message: * Mon Apr 15 2009 Rex Dieter 2.0.1-1 - eigen-2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 9 Feb 2009 14:32:25 -0000 1.8 +++ .cvsignore 2 May 2009 22:26:29 -0000 1.9 @@ -1 +1 @@ -eigen-2.0.0.tar.bz2 +eigen-2.0.1.tar.bz2 Index: eigen2.spec =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-10/eigen2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- eigen2.spec 9 Feb 2009 14:32:26 -0000 1.7 +++ eigen2.spec 2 May 2009 22:26:29 -0000 1.8 @@ -8,7 +8,7 @@ Name: eigen2 Summary: A lightweight C++ template library for vector and matrix math -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} Group: System Environment/Libraries License: GPLv2+ or LGPLv3+ @@ -34,6 +34,7 @@ BuildRequires: tetex-latex BuildRequires: blas-devel BuildRequires: gsl-devel # can't use until undefined symbols are fixed: http://bugzilla.redhat.com/475411 +# also seems to have gcc44-related issues (here in eigen testsuite) #BuildRequires: suitesparse-devel BuildRequires: qt4-devel #-- Could NOT find TAUCS (missing: TAUCS_INCLUDES TAUCS_LIBRARIES) @@ -94,6 +95,12 @@ rm -rf %{buildroot} %changelog +* Mon Apr 15 2009 Rex Dieter 2.0.1-1 +- eigen-2.0.1 + +* Tue Feb 24 2009 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 02 2009 Rex Dieter 2.0-1 - eigen-2.0.0 (final) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 9 Feb 2009 14:32:26 -0000 1.8 +++ sources 2 May 2009 22:26:29 -0000 1.9 @@ -1 +1 @@ -bedfe344498b926a4b5db17d2846dbb5 eigen-2.0.0.tar.bz2 +3d7af1f727355dfe58531a3649c7d4b5 eigen-2.0.1.tar.bz2 From rdieter at fedoraproject.org Sat May 2 22:29:19 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 2 May 2009 22:29:19 +0000 (UTC) Subject: rpms/eigen2/F-9 .cvsignore, 1.8, 1.9 eigen2.spec, 1.7, 1.8 sources, 1.8, 1.9 Message-ID: <20090502222919.CD44770120@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/eigen2/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21426 Modified Files: .cvsignore eigen2.spec sources Log Message: * Mon Apr 15 2009 Rex Dieter 2.0.1-1 - eigen-2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 9 Feb 2009 14:34:25 -0000 1.8 +++ .cvsignore 2 May 2009 22:28:49 -0000 1.9 @@ -1 +1 @@ -eigen-2.0.0.tar.bz2 +eigen-2.0.1.tar.bz2 Index: eigen2.spec =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-9/eigen2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- eigen2.spec 9 Feb 2009 14:34:25 -0000 1.7 +++ eigen2.spec 2 May 2009 22:28:49 -0000 1.8 @@ -8,7 +8,7 @@ Name: eigen2 Summary: A lightweight C++ template library for vector and matrix math -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} Group: System Environment/Libraries License: GPLv2+ or LGPLv3+ @@ -34,6 +34,7 @@ BuildRequires: tetex-latex BuildRequires: blas-devel BuildRequires: gsl-devel # can't use until undefined symbols are fixed: http://bugzilla.redhat.com/475411 +# also seems to have gcc44-related issues (here in eigen testsuite) #BuildRequires: suitesparse-devel BuildRequires: qt4-devel #-- Could NOT find TAUCS (missing: TAUCS_INCLUDES TAUCS_LIBRARIES) @@ -94,6 +95,12 @@ rm -rf %{buildroot} %changelog +* Mon Apr 15 2009 Rex Dieter 2.0.1-1 +- eigen-2.0.1 + +* Tue Feb 24 2009 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 02 2009 Rex Dieter 2.0-1 - eigen-2.0.0 (final) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eigen2/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 9 Feb 2009 14:34:25 -0000 1.8 +++ sources 2 May 2009 22:28:49 -0000 1.9 @@ -1 +1 @@ -bedfe344498b926a4b5db17d2846dbb5 eigen-2.0.0.tar.bz2 +3d7af1f727355dfe58531a3649c7d4b5 eigen-2.0.1.tar.bz2 From rdieter at fedoraproject.org Sat May 2 22:38:15 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 2 May 2009 22:38:15 +0000 (UTC) Subject: rpms/sbcl/devel sbcl-1.0.28-optflags.patch, NONE, 1.1 sbcl-1.0.28-x86_64_ADDR_NO_RANDOMIZE-2.patch, NONE, 1.1 .cvsignore, 1.46, 1.47 sbcl.spec, 1.105, 1.106 sources, 1.47, 1.48 sbcl-1.0.16-optflags.patch, 1.1, NONE Message-ID: <20090502223815.4038B70120@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/sbcl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22446 Modified Files: .cvsignore sbcl.spec sources Added Files: sbcl-1.0.28-optflags.patch sbcl-1.0.28-x86_64_ADDR_NO_RANDOMIZE-2.patch Removed Files: sbcl-1.0.16-optflags.patch Log Message: * Thu Apr 30 2009 Rex Dieter - 1.0.28-1 - sbcl-1.0.28 sbcl-1.0.28-optflags.patch: --- NEW FILE sbcl-1.0.28-optflags.patch --- diff -up sbcl-1.0.28/contrib/asdf-module.mk.optflags sbcl-1.0.28/contrib/asdf-module.mk --- sbcl-1.0.28/contrib/asdf-module.mk.optflags 2009-04-28 11:02:13.000000000 -0500 +++ sbcl-1.0.28/contrib/asdf-module.mk 2009-04-30 12:22:56.509637395 -0500 @@ -20,6 +20,8 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC)))) endif +EXTRA_CFLAGS += $(RPM_OPT_FLAGS) + export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS all: $(EXTRA_ALL_TARGETS) diff -up sbcl-1.0.28/src/runtime/Config.ppc-linux.optflags sbcl-1.0.28/src/runtime/Config.ppc-linux --- sbcl-1.0.28/src/runtime/Config.ppc-linux.optflags 2006-11-19 05:26:16.000000000 -0600 +++ sbcl-1.0.28/src/runtime/Config.ppc-linux 2009-04-30 12:21:36.861636752 -0500 @@ -9,7 +9,7 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. -CFLAGS = -g +CFLAGS += $(RPM_OPT_FLAGS) LINKFLAGS += -v -rdynamic NM = ./linux-nm diff -up sbcl-1.0.28/src/runtime/Config.sparc-linux.optflags sbcl-1.0.28/src/runtime/Config.sparc-linux --- sbcl-1.0.28/src/runtime/Config.sparc-linux.optflags 2005-09-16 08:26:39.000000000 -0500 +++ sbcl-1.0.28/src/runtime/Config.sparc-linux 2009-04-30 12:21:36.862636949 -0500 @@ -10,6 +10,7 @@ # files for more information. ASFLAGS = -g -Wall +CFLAGS += $(RPM_OPT_FLAGS) LINKFLAGS += -v -rdynamic NM = ./linux-nm diff -up sbcl-1.0.28/src/runtime/Config.x86_64-linux.optflags sbcl-1.0.28/src/runtime/Config.x86_64-linux --- sbcl-1.0.28/src/runtime/Config.x86_64-linux.optflags 2006-11-13 10:03:31.000000000 -0600 +++ sbcl-1.0.28/src/runtime/Config.x86_64-linux 2009-04-30 12:21:36.863636867 -0500 @@ -34,7 +34,7 @@ ifdef LISP_FEATURE_SB_THREAD OS_LIBS += -lpthread endif -CFLAGS += -fno-omit-frame-pointer +CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS) GC_SRC = gencgc.c diff -up sbcl-1.0.28/src/runtime/Config.x86-linux.optflags sbcl-1.0.28/src/runtime/Config.x86-linux --- sbcl-1.0.28/src/runtime/Config.x86-linux.optflags 2006-11-13 10:03:31.000000000 -0600 +++ sbcl-1.0.28/src/runtime/Config.x86-linux 2009-04-30 12:21:36.864637274 -0500 @@ -38,6 +38,8 @@ ifdef LISP_FEATURE_SB_THREAD OS_LIBS += -lpthread endif +CFLAGS += $(RPM_OPT_FLAGS) + GC_SRC = gencgc.c # Nothing to do for after-grovel-headers. sbcl-1.0.28-x86_64_ADDR_NO_RANDOMIZE-2.patch: --- NEW FILE sbcl-1.0.28-x86_64_ADDR_NO_RANDOMIZE-2.patch --- Index: src/runtime/linux-os.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/linux-os.c,v retrieving revision 1.81 diff -u -r1.81 linux-os.c --- src/runtime/linux-os.c 22 Mar 2009 19:07:09 -0000 1.81 +++ src/runtime/linux-os.c 23 Apr 2009 15:07:45 -0000 @@ -239,7 +239,7 @@ * Since randomization is currently implemented only on x86 kernels, * don't do this trick on other platforms. */ -#ifdef LISP_FEATURE_X86 +#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) if ((major_version == 2 /* Some old kernels will apparently lose unsupported personality flags * on exec() */ @@ -283,11 +283,13 @@ fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags (maybe /proc isn't mounted?). Trying to continue anyway.\n"); } } +#ifdef LISP_FEATURE_X86 /* Use SSE detector. Recent versions of Linux enable SSE support * on SSE capable CPUs. */ /* FIXME: Are there any old versions that does not support SSE? */ fast_bzero_pointer = fast_bzero_detect; #endif +#endif } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -r1.46 -r1.47 --- .cvsignore 4 Mar 2009 18:40:54 -0000 1.46 +++ .cvsignore 2 May 2009 22:37:44 -0000 1.47 @@ -1 +1 @@ -sbcl-1.0.26-source.tar.bz2 +sbcl-1.0.28-source.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -p -r1.105 -r1.106 --- sbcl.spec 4 Mar 2009 18:40:54 -0000 1.105 +++ sbcl.spec 2 May 2009 22:37:44 -0000 1.106 @@ -8,11 +8,11 @@ %define sbcl_shell /bin/bash # threading support -%{?!_without_threads:%define _with_threads --with-threads} +%{?!_without_threads:%global _with_threads --with-threads} Name: sbcl Summary: Steel Bank Common Lisp -Version: 1.0.26 +Version: 1.0.28 Release: 1%{?dist} License: BSD @@ -83,12 +83,16 @@ Source202: sbcl-install-clc.lisp Patch1: sbcl-1.0.25-default_sbcl_home.patch Patch2: sbcl-0.9.5-personality.patch -Patch3: sbcl-1.0.16-optflags.patch +Patch3: sbcl-1.0.28-optflags.patch Patch4: sbcl-0.9.17-LIB_DIR.patch Patch6: sbcl-0.9.5-verbose-build.patch # Allow override of contrib test failure(s) Patch7: sbcl-1.0.2-permissive.patch +## upstream patches +# use ADDR_NO_RANDOMIZE on x86_64 too +Patch100: sbcl-1.0.28-x86_64_ADDR_NO_RANDOMIZE-2.patch + Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation @@ -119,6 +123,9 @@ fi %{?sbcl_verbose:%patch6 -p1 -b .verbose-build} %patch7 -p1 -b .permissive +%patch100 -p0 -b .x86_64_ADDR_NO_RANDOMIZE-2 + + %if 0%{?_with_threads:1} ## Enable sb-thread %ifarch %{ix86} x86_64 @@ -250,6 +257,9 @@ rm -rf %{buildroot} %changelog +* Thu Apr 30 2009 Rex Dieter - 1.0.28-1 +- sbcl-1.0.28 + * Wed Mar 04 2009 Rex Dieter - 1.0.26-1 - sbcl-1.0.26 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -r1.47 -r1.48 --- sources 4 Mar 2009 18:40:55 -0000 1.47 +++ sources 2 May 2009 22:37:44 -0000 1.48 @@ -1 +1 @@ -b3550f4aa2db031b4630129dd0995f1b sbcl-1.0.26-source.tar.bz2 +5e1bf7a9c008badb3f8765e11ab3e410 sbcl-1.0.28-source.tar.bz2 --- sbcl-1.0.16-optflags.patch DELETED --- From rdieter at fedoraproject.org Sat May 2 22:39:30 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 2 May 2009 22:39:30 +0000 (UTC) Subject: rpms/maxima/devel maxima.spec,1.129,1.130 Message-ID: <20090502223930.24B0F70120@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/maxima/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673 Modified Files: maxima.spec Log Message: * Sat May 02 2009 Rex Dieter - 5.18.1-2 - rebuild (sbcl) Index: maxima.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -p -r1.129 -r1.130 --- maxima.spec 19 Apr 2009 02:18:54 -0000 1.129 +++ maxima.spec 2 May 2009 22:38:59 -0000 1.130 @@ -3,7 +3,7 @@ Summary: Symbolic Computation Program Name: maxima Version: 5.18.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -425,7 +425,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 02 2009 Rex Dieter - 5.18.1-2 +- rebuild (sbcl) + * Sat Apr 18 2009 Rex Dieter - 5.18.1-1 +- maxima-5.18.1 * Fri Apr 17 2009 Rex Dieter - 5.18.0-1 - maxima-5.18.0 From dodji at fedoraproject.org Sat May 2 23:19:55 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sat, 2 May 2009 23:19:55 +0000 (UTC) Subject: rpms/nemiver/devel .cvsignore, 1.16, 1.17 nemiver.spec, 1.24, 1.25 sources, 1.16, 1.17 Message-ID: <20090502231955.DC2A870120@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26508 Modified Files: .cvsignore nemiver.spec sources Log Message: * Sat May 02 2009 Dodji Seketeli - 0.6.7-1 - Update to new upstream release (0.6.7) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 5 Apr 2009 18:15:45 -0000 1.16 +++ .cvsignore 2 May 2009 23:19:24 -0000 1.17 @@ -1 +1 @@ -nemiver-0.6.6.tar.bz2 +nemiver-0.6.7.tar.bz2 Index: nemiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- nemiver.spec 5 Apr 2009 18:15:45 -0000 1.24 +++ nemiver.spec 2 May 2009 23:19:24 -0000 1.25 @@ -1,5 +1,5 @@ Name: nemiver -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} Summary: A GNOME C/C++ Debugger @@ -143,6 +143,9 @@ scrollkeeper-update -q ||: %{_mandir}/man?/%{name}.* %changelog +* Sat May 02 2009 Dodji Seketeli - 0.6.7-1 +- Update to new upstream release (0.6.7) + * Fri Apr 03 2009 Dodji Seketeli - 0.6.6-1 - Update to new upstream release (0.6.6) - Drop patch http://bugzilla.gnome.org/show_bug.cgi?id=574915 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- sources 3 Apr 2009 19:57:29 -0000 1.16 +++ sources 2 May 2009 23:19:24 -0000 1.17 @@ -1 +1 @@ -e17c00535e6584668fe785aa7589f98f nemiver-0.6.6.tar.bz2 +eeb0f56cf70d26746f79486bd5437ac7 nemiver-0.6.7.tar.bz2 From dodji at fedoraproject.org Sat May 2 23:24:44 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sat, 2 May 2009 23:24:44 +0000 (UTC) Subject: rpms/nemiver/F-9 .cvsignore, 1.10, 1.11 nemiver.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <20090502232444.A165970120@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27020 Modified Files: .cvsignore nemiver.spec sources Log Message: * Sat May 02 2009 Dodji Seketeli - 0.6.7-1 - Update to new upstream release (0.6.7) - Don't package *.la and *.a files in plugins Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 3 Apr 2009 20:41:28 -0000 1.10 +++ .cvsignore 2 May 2009 23:24:14 -0000 1.11 @@ -1 +1 @@ -nemiver-0.6.6.tar.bz2 +nemiver-0.6.7.tar.bz2 Index: nemiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-9/nemiver.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- nemiver.spec 3 Apr 2009 20:13:07 -0000 1.16 +++ nemiver.spec 2 May 2009 23:24:14 -0000 1.17 @@ -1,5 +1,5 @@ Name: nemiver -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} Summary: A GNOME C/C++ Debugger @@ -134,6 +134,8 @@ scrollkeeper-update -q ||: %exclude %{_libdir}/%{name}/*.la %exclude %{_libdir}/%{name}/modules/*.a %exclude %{_libdir}/%{name}/modules/*.la +%exclude %{_libdir}/%{name}/plugins/*/*.la +%exclude %{_libdir}/%{name}/plugins/*/*.a %{_bindir}/%{name} %{_libdir}/%{name}/ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas @@ -151,6 +153,10 @@ scrollkeeper-update -q ||: %changelog +* Sat May 02 2009 Dodji Seketeli - 0.6.7-1 +- Update to new upstream release (0.6.7) +- Don't package *.la and *.a files in plugins + * Fri Apr 03 2009 Dodji Seketeli - 0.6.6-1 - Update to new upstream release (0.6.6) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 3 Apr 2009 20:41:28 -0000 1.10 +++ sources 2 May 2009 23:24:14 -0000 1.11 @@ -1 +1 @@ -e17c00535e6584668fe785aa7589f98f nemiver-0.6.6.tar.bz2 +eeb0f56cf70d26746f79486bd5437ac7 nemiver-0.6.7.tar.bz2 From dodji at fedoraproject.org Sat May 2 23:26:21 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sat, 2 May 2009 23:26:21 +0000 (UTC) Subject: rpms/nemiver/F-10 .cvsignore, 1.14, 1.15 nemiver.spec, 1.22, 1.23 sources, 1.14, 1.15 Message-ID: <20090502232621.CEB4A70120@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27213 Modified Files: .cvsignore nemiver.spec sources Log Message: * Sat May 02 2009 Dodji Seketeli - 0.6.7-1 - Update to new upstream release (0.6.7) - Do not package *.la and *.a files from the plugin directory Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-10/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 3 Apr 2009 20:31:32 -0000 1.14 +++ .cvsignore 2 May 2009 23:25:51 -0000 1.15 @@ -1 +1 @@ -nemiver-0.6.6.tar.bz2 +nemiver-0.6.7.tar.bz2 Index: nemiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-10/nemiver.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- nemiver.spec 3 Apr 2009 20:08:53 -0000 1.22 +++ nemiver.spec 2 May 2009 23:25:51 -0000 1.23 @@ -1,5 +1,5 @@ Name: nemiver -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} Summary: A GNOME C/C++ Debugger @@ -140,6 +140,8 @@ scrollkeeper-update -q ||: %exclude %{_libdir}/%{name}/*.la %exclude %{_libdir}/%{name}/modules/*.a %exclude %{_libdir}/%{name}/modules/*.la +%exclude %{_libdir}/%{name}/plugins/*/*.la +%exclude %{_libdir}/%{name}/plugins/*/*.a %{_bindir}/%{name} %{_libdir}/%{name}/ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas @@ -157,6 +159,10 @@ scrollkeeper-update -q ||: %changelog +* Sat May 02 2009 Dodji Seketeli - 0.6.7-1 +- Update to new upstream release (0.6.7) +- Do not package *.la and *.a files from the plugin directory + * Fri Apr 03 2009 Dodji Seketeli - 0.6.6-1 - Update to new upstream release (0.6.6) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-10/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 3 Apr 2009 20:31:32 -0000 1.14 +++ sources 2 May 2009 23:25:51 -0000 1.15 @@ -1 +1 @@ -e17c00535e6584668fe785aa7589f98f nemiver-0.6.6.tar.bz2 +eeb0f56cf70d26746f79486bd5437ac7 nemiver-0.6.7.tar.bz2 From dodji at fedoraproject.org Sat May 2 23:35:20 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sat, 2 May 2009 23:35:20 +0000 (UTC) Subject: rpms/nemiver/F-11 .cvsignore, 1.16, 1.17 nemiver.spec, 1.24, 1.25 sources, 1.16, 1.17 Message-ID: <20090502233520.D82D370120@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28571 Modified Files: .cvsignore nemiver.spec sources Log Message: * Sun May 03 2009 Dodji Seketeli - 0.6.7-1 - Update to new upstream release (0.6.7) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-11/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 5 Apr 2009 18:15:45 -0000 1.16 +++ .cvsignore 2 May 2009 23:34:50 -0000 1.17 @@ -1 +1 @@ -nemiver-0.6.6.tar.bz2 +nemiver-0.6.7.tar.bz2 Index: nemiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-11/nemiver.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- nemiver.spec 5 Apr 2009 18:15:45 -0000 1.24 +++ nemiver.spec 2 May 2009 23:34:50 -0000 1.25 @@ -1,5 +1,5 @@ Name: nemiver -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} Summary: A GNOME C/C++ Debugger @@ -143,6 +143,9 @@ scrollkeeper-update -q ||: %{_mandir}/man?/%{name}.* %changelog +* Sun May 03 2009 Dodji Seketeli - 0.6.7-1 +- Update to new upstream release (0.6.7) + * Fri Apr 03 2009 Dodji Seketeli - 0.6.6-1 - Update to new upstream release (0.6.6) - Drop patch http://bugzilla.gnome.org/show_bug.cgi?id=574915 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-11/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- sources 3 Apr 2009 19:57:29 -0000 1.16 +++ sources 2 May 2009 23:34:50 -0000 1.17 @@ -1 +1 @@ -e17c00535e6584668fe785aa7589f98f nemiver-0.6.6.tar.bz2 +eeb0f56cf70d26746f79486bd5437ac7 nemiver-0.6.7.tar.bz2 From sergiopr at fedoraproject.org Sun May 3 00:26:23 2009 From: sergiopr at fedoraproject.org (Sergio Pascual) Date: Sun, 3 May 2009 00:26:23 +0000 (UTC) Subject: rpms/ds9/devel ds9.desktop,1.1,1.2 ds9.spec,1.19,1.20 Message-ID: <20090503002623.3B542700DA@cvs1.fedora.phx.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/ds9/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4491 Modified Files: ds9.desktop ds9.spec Log Message: * Sun May 03 2009 Sergio Pascual - 5.4-6 - Moved to desktop category Education Index: ds9.desktop =================================================================== RCS file: /cvs/pkgs/rpms/ds9/devel/ds9.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ds9.desktop 3 Dec 2007 20:22:08 -0000 1.1 +++ ds9.desktop 3 May 2009 00:25:51 -0000 1.2 @@ -6,6 +6,6 @@ Exec=ds9 %F Icon=/usr/share/pixmaps/ds9/sun.gif Terminal=false Type=Application -Categories=Graphics;2DGraphics;Astronomy;Science; +Categories=Education;Astronomy;Science; MimeType=application/fits;image/fits;image/x-fits; Index: ds9.spec =================================================================== RCS file: /cvs/pkgs/rpms/ds9/devel/ds9.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- ds9.spec 24 Feb 2009 12:50:14 -0000 1.19 +++ ds9.spec 3 May 2009 00:25:51 -0000 1.20 @@ -1,6 +1,6 @@ Name: ds9 Version: 5.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Astronomical Data Visualization Application Group: Applications/Engineering @@ -92,6 +92,9 @@ update-desktop-database &> /dev/null || %changelog +* Sun May 03 2009 Sergio Pascual - 5.4-6 +- Moved to desktop category Education + * Tue Feb 24 2009 Fedora Release Engineering - 5.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pgordon at fedoraproject.org Sun May 3 01:21:04 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Sun, 3 May 2009 01:21:04 +0000 (UTC) Subject: rpms/deluge/devel .cvsignore, 1.57, 1.58 deluge.spec, 1.89, 1.90 sources, 1.57, 1.58 Message-ID: <20090503012104.4014B700DA@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/deluge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14557 Modified Files: .cvsignore deluge.spec sources Log Message: Update to 1.1.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- .cvsignore 7 Apr 2009 04:55:33 -0000 1.57 +++ .cvsignore 3 May 2009 01:20:32 -0000 1.58 @@ -1 +1 @@ -deluge-1.1.6.tar.bz2 +deluge-1.1.7.tar.bz2 Index: deluge.spec =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- deluge.spec 7 Apr 2009 04:55:33 -0000 1.89 +++ deluge.spec 3 May 2009 01:20:32 -0000 1.90 @@ -3,10 +3,10 @@ ## Since we're using a system copy of rb_libtorrent, we need to ensure that it ## is a very recent version for proper API matching. -%define min_rblibtorrent_ver 0.14.1 +%define min_rblibtorrent_ver 0.14.3 Name: deluge -Version: 1.1.6 +Version: 1.1.7 Release: 1%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet @@ -141,6 +141,9 @@ fi %changelog +* Sat May 02 2009 Peter Gordon - 1.1.7-1 +- Update to new upstream bug-fix release (1.1.7). + * Mon Apr 06 2009 Peter Gordon - 1.1.6-1 - Update to new upstream bug-fix release (1.1.6) - Fix GPL version, add OpenSSL exception to License. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- sources 7 Apr 2009 04:55:33 -0000 1.57 +++ sources 3 May 2009 01:20:33 -0000 1.58 @@ -1 +1 @@ -78ef75153bbd5ef6a06ed876d66a9fb9 deluge-1.1.6.tar.bz2 +fd824abc3d8d2701f676176d7210c4c8 deluge-1.1.7.tar.bz2 From hadess at fedoraproject.org Sun May 3 01:43:10 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Sun, 3 May 2009 01:43:10 +0000 (UTC) Subject: rpms/totem-pl-parser/F-11 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 totem-pl-parser.spec, 1.37, 1.38 Message-ID: <20090503014310.14AED700DA@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem-pl-parser/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18145 Modified Files: .cvsignore sources totem-pl-parser.spec Log Message: * Sun May 03 2009 Bastien Nocera 2.26.2-1 - Update to 2.26.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-11/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 31 Mar 2009 11:56:23 -0000 1.21 +++ .cvsignore 3 May 2009 01:42:39 -0000 1.22 @@ -1 +1 @@ -totem-pl-parser-2.26.1.tar.bz2 +totem-pl-parser-2.26.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-11/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 31 Mar 2009 11:56:23 -0000 1.21 +++ sources 3 May 2009 01:42:39 -0000 1.22 @@ -1 +1 @@ -269a003146eaca6b9af0b90ad592571f totem-pl-parser-2.26.1.tar.bz2 +daffda80cfead2a1473ca3ff71e1057b totem-pl-parser-2.26.2.tar.bz2 Index: totem-pl-parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-11/totem-pl-parser.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- totem-pl-parser.spec 31 Mar 2009 11:56:23 -0000 1.37 +++ totem-pl-parser.spec 3 May 2009 01:42:39 -0000 1.38 @@ -1,5 +1,5 @@ Name: totem-pl-parser -Version: 2.26.1 +Version: 2.26.2 Release: 1%{?dist} Summary: Totem Playlist Parser library @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/totem-pl-parser %changelog +* Sun May 03 2009 Bastien Nocera 2.26.2-1 +- Update to 2.26.2 + * Tue Mar 31 2009 - Bastien Nocera - 2.26.1-1 - Update to 2.26.1 From mbarnes at fedoraproject.org Sun May 3 01:51:33 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Sun, 3 May 2009 01:51:33 +0000 (UTC) Subject: rpms/pygtk2/devel .cvsignore, 1.41, 1.42 pygtk2.spec, 1.23, 1.24 sources, 1.41, 1.42 Message-ID: <20090503015133.EBCBF700DA@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/pygtk2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19029 Modified Files: .cvsignore pygtk2.spec sources Log Message: * Sat May 02 2009 Matthew Barnes - 2.15.1-1.fc11 - Update to 2.15.1 - Bump pygobject2_version to 2.16.1. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pygtk2/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- .cvsignore 6 Mar 2009 12:54:08 -0000 1.41 +++ .cvsignore 3 May 2009 01:51:02 -0000 1.42 @@ -1 +1 @@ -pygtk-2.14.1.tar.bz2 +pygtk-2.15.0.tar.bz2 Index: pygtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- pygtk2.spec 6 Mar 2009 12:54:08 -0000 1.23 +++ pygtk2.spec 3 May 2009 01:51:02 -0000 1.24 @@ -1,12 +1,12 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Last updated for version 2.14.1 +# Last updated for version 2.15.0 %define glib2_version 2.8.0 %define pango_version 1.16.0 %define gtk2_version 2.9.0 %define libglade2_version 2.5.0 %define pycairo_version 1.0.2 -%define pygobject2_version 2.14.0 +%define pygobject2_version 2.16.1 %define python2_version 2.3.5 %define buildglade %(pkg-config libglade-2.0 && echo 1 || echo 0) @@ -14,7 +14,7 @@ ### Abstract ### Name: pygtk2 -Version: 2.14.1 +Version: 2.15.0 Release: 1%{?dist} License: LGPLv2+ Group: Development/Languages @@ -163,6 +163,10 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/pygtk %changelog +* Sat May 02 2009 Matthew Barnes - 2.15.1-1.fc11 +- Update to 2.15.1 +- Bump pygobject2_version to 2.16.1. + * Fri Mar 06 2009 Matthew Barnes - 2.14.1-1.fc11 - Update to 2.14.1 - Bump gtk2_version to 2.9.0 for gtkunixprint requirement. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pygtk2/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- sources 6 Mar 2009 12:54:09 -0000 1.41 +++ sources 3 May 2009 01:51:03 -0000 1.42 @@ -1 +1 @@ -c27a7d21b87910e80605d9135d220592 pygtk-2.14.1.tar.bz2 +fb0be6d2317688cf873504d5f354f06a pygtk-2.15.0.tar.bz2 From bskeggs at fedoraproject.org Sun May 3 02:25:37 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Sun, 3 May 2009 02:25:37 +0000 (UTC) Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.43, 1.44 kernel.spec, 1.1585, 1.1586 Message-ID: <20090503022537.66E88700DA@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21928 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Sun May 03 2009 Ben Skeggs 2.6.29.2-124 - drm-nouveau.patch: ignore unsupported dcb encoder types completely - nv50: module option to run output scripts, too raw to be by default yet, but will fix a number of issues in the places where they work. drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- drm-nouveau.patch 1 May 2009 23:45:21 -0000 1.43 +++ drm-nouveau.patch 3 May 2009 02:25:34 -0000 1.44 @@ -424,10 +424,10 @@ index 0000000..e3d354f +} diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c new file mode 100644 -index 0000000..2baf01b +index 0000000..7805dc9 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c -@@ -0,0 +1,4799 @@ +@@ -0,0 +1,4802 @@ +/* + * Copyright 2005-2006 Erik Waling + * Copyright 2006 Stephane Marchesin @@ -3473,7 +3473,8 @@ index 0000000..2baf01b + +static int +find_script_pointers(struct drm_device *dev, uint8_t *table, uint16_t *script0, -+ uint16_t *script1, uint16_t headerlen, int pxclk) ++ uint16_t *script1, uint16_t headerlen, int pxclk, ++ int cmpval) +{ + /* The output script tables describing a particular output type + * look as follows: @@ -3506,7 +3507,7 @@ index 0000000..2baf01b + + struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nvbios *bios = &dev_priv->VBIOS; -+ int i, cmpval = 0x0100; ++ int i; + + *script0 = *script1 = 0; + for (i = 0; i < table[5]; i++) { @@ -3566,7 +3567,6 @@ index 0000000..2baf01b + uint8_t *entry, *otable = NULL; + uint16_t script0, script1; + int i; -+ bool run_scripts = false; + + if (!bios->display.script_table_ptr) { + NV_ERROR(dev, "No pointer to output script table\n"); @@ -3601,23 +3601,26 @@ index 0000000..2baf01b + return 1; + } + -+ if (find_script_pointers(dev, otable, &script0, &script1, table[4], pxclk)) ++ if (find_script_pointers(dev, otable, &script0, &script1, table[4], ++ pxclk, dcbent->type == OUTPUT_LVDS ? ++ 0x0100 : (pxclk > 165000 ? 0x0105 : 0x0001))) + return 1; + bios->display.head = ffs(dcbent->or) - 1; + + if (script0) { + NV_TRACE(dev, "0x%04X: Parsing output Script0\n", script0); -+ if (run_scripts) + parse_init_table(dev, bios, script0, &iexec); ++ } else { ++ NV_ERROR(dev, "clock script missing!\n"); ++ return 1; + } + + if (script1) { + NV_TRACE(dev, "0x%04X: Parsing output Script1\n", script1); -+ if (run_scripts) + parse_init_table(dev, bios, script1, &iexec); + } + -+ return run_scripts ? 0 : 1; ++ return 0; +} + + @@ -7092,10 +7095,10 @@ index 0000000..4383883 +#endif diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c new file mode 100644 -index 0000000..f497aae +index 0000000..578983e --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c -@@ -0,0 +1,190 @@ +@@ -0,0 +1,194 @@ +/* + * Copyright 2005 Stephane Marchesin. + * All Rights Reserved. @@ -7142,6 +7145,10 @@ index 0000000..f497aae +int nouveau_duallink = 0; +module_param_named(duallink, nouveau_duallink, int, 0400); + ++MODULE_PARM_DESC(uscript, "Execute output scripts (>=GeForce 8)"); ++int nouveau_uscript = 0; ++module_param_named(uscript, nouveau_uscript, int, 0400); ++ +int nouveau_fbpercrtc = 0; +#if 0 +module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400); @@ -23835,10 +23842,10 @@ index 0000000..87c6213 +} diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c new file mode 100644 -index 0000000..83fb192 +index 0000000..a83ee1b --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_connector.c -@@ -0,0 +1,503 @@ +@@ -0,0 +1,498 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -23880,39 +23887,11 @@ index 0000000..83fb192 +nv50_connector_to_encoder(struct nouveau_connector *connector, bool digital) +{ + struct drm_device *dev = connector->base.dev; -+ struct drm_encoder *drm_encoder; -+ bool digital_possible = false; -+ bool analog_possible = false; -+ int i; -+ -+ switch (connector->base.connector_type) { -+ case DRM_MODE_CONNECTOR_VGA: -+ case DRM_MODE_CONNECTOR_SVIDEO: -+ analog_possible = true; -+ break; -+ case DRM_MODE_CONNECTOR_DVII: -+ analog_possible = true; -+ digital_possible = true; -+ break; -+ case DRM_MODE_CONNECTOR_DVID: -+ case DRM_MODE_CONNECTOR_LVDS: -+ digital_possible = true; -+ break; -+ default: -+ return NULL; -+ } -+ -+ /* Return early on bad situations. */ -+ if (!analog_possible && !digital) -+ return NULL; -+ -+ if (!digital_possible && digital) -+ return NULL; ++ struct nouveau_encoder *encoder; ++ struct drm_mode_object *obj; ++ int i, id; + + for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { -+ struct drm_mode_object *obj; -+ int id; -+ + id = connector->base.encoder_ids[i]; + if (!id) + break; @@ -23920,21 +23899,20 @@ index 0000000..83fb192 + obj = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_ENCODER); + if (!obj) + continue; -+ drm_encoder = obj_to_encoder(obj); ++ encoder = to_nouveau_encoder(obj_to_encoder(obj)); + + if (digital) { -+ switch (drm_encoder->encoder_type) { -+ case DRM_MODE_ENCODER_TMDS: -+ case DRM_MODE_ENCODER_LVDS: -+ return to_nouveau_encoder(drm_encoder); ++ switch (encoder->dcb->type) { ++ case OUTPUT_TMDS: ++ case OUTPUT_LVDS: ++ return encoder; + default: + break; + } + } else { -+ switch (drm_encoder->encoder_type) { -+ case DRM_MODE_ENCODER_DAC: -+ case DRM_MODE_ENCODER_TVDAC: -+ return to_nouveau_encoder(drm_encoder); ++ switch (encoder->dcb->type) { ++ case OUTPUT_ANALOG: ++ return encoder; + default: + break; + } @@ -24188,6 +24166,30 @@ index 0000000..83fb192 + connector->to_encoder(connector, connector->digital); + unsigned min_clock, max_clock; + ++ /* This really should not happen, but it appears it might do ++ * somehow, debug! ++ */ ++ if (!encoder) { ++ int i; ++ ++ NV_ERROR(dev, "no encoder for connector: %s %d\n", ++ drm_get_connector_name(drm_connector), ++ connector->digital); ++ for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { ++ struct drm_mode_object *obj; ++ if (!drm_connector->encoder_ids[i]) ++ break; ++ ++ obj = drm_mode_object_find(dev, drm_connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER); ++ if (!obj) ++ continue; ++ encoder = to_nouveau_encoder(obj_to_encoder(obj)); ++ NV_ERROR(dev, " %d: %d", i, encoder->dcb->type); ++ } ++ ++ return MODE_BAD; ++ } ++ + min_clock = 25000; + + switch (encoder->base.encoder_type) { @@ -25593,10 +25595,10 @@ index 0000000..e64c314 + diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c new file mode 100644 -index 0000000..67ad5f6 +index 0000000..ac51e1a --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_display.c -@@ -0,0 +1,422 @@ +@@ -0,0 +1,423 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -25866,7 +25868,8 @@ index 0000000..67ad5f6 + nv50_dac_create(dev, entry); + break; + default: -+ break; ++ NV_WARN(dev, "DCB encoder %d unknown\n", entry->type); ++ continue; + } + + connector[entry->i2c_index] |= (1 << entry->type); @@ -48565,10 +48568,10 @@ index 0000000..6572f12 +} diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c new file mode 100644 -index 0000000..b4b096e +index 0000000..69a07e2 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_sor.c -@@ -0,0 +1,275 @@ +@@ -0,0 +1,286 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -48607,6 +48610,7 @@ index 0000000..b4b096e +#include "nv50_display_commands.h" + +extern int nouveau_duallink; ++extern int nouveau_uscript; + +static void +nv50_sor_disconnect(struct nouveau_encoder *encoder) @@ -48624,14 +48628,24 @@ index 0000000..b4b096e + struct drm_display_mode *mode) +{ + struct drm_device *dev = encoder->base.dev; -+ uint32_t limit = 165000; ++ uint32_t limit = encoder->dcb->type == OUTPUT_LVDS ? 112000 : 165000; ++ int ret; + + NV_DEBUG(dev, "or %d\n", encoder->or); + + /* We don't yet know what to do, if anything at all. */ -+ if (encoder->base.encoder_type == DRM_MODE_ENCODER_LVDS) ++ if (!nouveau_uscript && encoder->dcb->type == OUTPUT_LVDS) + return 0; + ++ if (nouveau_uscript) { ++ NV_TRACE(dev, "executing display table for %d %d %d %d\n", ++ encoder->dcb->type, encoder->dcb->location, ++ encoder->dcb->or, mode->clock); ++ ret = nouveau_bios_run_display_table(dev, encoder->dcb, mode->clock); ++ if (ret) ++ NV_ERROR(dev, "error running display table, may hang\n"); ++ } ++ + /* 0x70000 was a late addition to nv, mentioned as fixing tmds + * initialisation on certain gpu's. I presume it's some kind of + * clock setting, but what precisely i do not know. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1585 retrieving revision 1.1586 diff -u -p -r1.1585 -r1.1586 --- kernel.spec 2 May 2009 04:41:37 -0000 1.1585 +++ kernel.spec 3 May 2009 02:25:35 -0000 1.1586 @@ -1967,6 +1967,11 @@ fi # and build. %changelog +* Sun May 03 2009 Ben Skeggs 2.6.29.2-124 +- drm-nouveau.patch: ignore unsupported dcb encoder types completely +- nv50: module option to run output scripts, too raw to be by default yet, + but will fix a number of issues in the places where they work. + * Sat May 02 2009 Kyle McMartin 2.6.29.2-123 - Build htmldocs single threaded. From rdieter at fedoraproject.org Sun May 3 02:58:06 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 3 May 2009 02:58:06 +0000 (UTC) Subject: rpms/akonadi/F-10 .cvsignore, 1.6, 1.7 akonadi.spec, 1.19, 1.20 sources, 1.6, 1.7 akonadi-1.1.1-startup-2.patch, 1.1, NONE Message-ID: <20090503025807.08052700DA@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23706 Modified Files: .cvsignore akonadi.spec sources Removed Files: akonadi-1.1.1-startup-2.patch Log Message: * Thu Apr 30 2009 Rex Dieter - 1.1.2-1 - akonadi-1.1.2 - optimize scriptlets a bit Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 23 Jan 2009 17:27:26 -0000 1.6 +++ .cvsignore 3 May 2009 02:57:35 -0000 1.7 @@ -1 +1 @@ -akonadi-1.1.1.tar.bz2 +akonadi-1.1.2.tar.bz2 Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-10/akonadi.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- akonadi.spec 25 Feb 2009 14:35:08 -0000 1.19 +++ akonadi.spec 3 May 2009 02:57:35 -0000 1.20 @@ -1,12 +1,13 @@ + Summary: PIM Storage Service Name: akonadi -Version: 1.1.1 -Release: 6%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://download.akonadi-project.org/ -Source0: http://akonadi.omat.nl/akonadi-%{version}.tar.bz2 +Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # shrink default initial db size a bit (approx 140mb->28mb) @@ -14,8 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version Patch1: akonadi-1.1.1-mysql_conf.patch ## upstream -# http://websvn.kde.org/branches/akonadi/1.1/server/src/akonadi.cpp?r1=905029&r2=931467&view=patch -Patch100: akonadi-1.1.1-startup-2.patch BuildRequires: cmake >= 2.6.0 BuildRequires: qt4-devel >= 4.4 @@ -33,7 +32,6 @@ Requires: qt4-mysql # not *strictly* required, but we need a functional default configuration Requires(hint): mysql-server -Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description @@ -58,7 +56,6 @@ Requires: pkgconfig %patch1 -p1 -b .mysql_conf touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf -%patch100 -p3 -b .startup-2 %build @@ -85,13 +82,16 @@ touch -d %{mysql_conf_timestamp} $RPM_BU rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig + +%posttrans update-mime-database %{_datadir}/mime &> /dev/null || : %postun -/sbin/ldconfig -update-mime-database %{_datadir}/mime &> /dev/null || : +/sbin/ldconfig ||: +if [ $1 -eq 0 ] ; then + update-mime-database %{_datadir}/mime &> /dev/null ||: +fi %files @@ -118,6 +118,10 @@ update-mime-database %{_datadir}/mime &> %changelog +* Thu Apr 30 2009 Rex Dieter - 1.1.2-1 +- akonadi-1.1.2 +- optimize scriptlets a bit + * Wed Feb 25 2009 Rex Dieter - 1.1.1-6 - rev startup patch - BR: cmake >= 2.6.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 23 Jan 2009 17:27:26 -0000 1.6 +++ sources 3 May 2009 02:57:35 -0000 1.7 @@ -1 +1 @@ -2e98b42cec9ec4e60a2e3c096f1a3106 akonadi-1.1.1.tar.bz2 +5651b02358f7d2f1c0954dfd31feafb1 akonadi-1.1.2.tar.bz2 --- akonadi-1.1.1-startup-2.patch DELETED --- From rdieter at fedoraproject.org Sun May 3 02:59:57 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 3 May 2009 02:59:57 +0000 (UTC) Subject: rpms/akonadi/F-9 .cvsignore, 1.4, 1.5 akonadi.spec, 1.7, 1.8 sources, 1.4, 1.5 akonadi-1.1.1-startup-2.patch, 1.1, NONE Message-ID: <20090503025957.D62F8700DA@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23881 Modified Files: .cvsignore akonadi.spec sources Removed Files: akonadi-1.1.1-startup-2.patch Log Message: * Thu Apr 30 2009 Rex Dieter - 1.1.2-1 - akonadi-1.1.2 - optimize scriptlets a bit Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 14 Mar 2009 16:36:22 -0000 1.4 +++ .cvsignore 3 May 2009 02:59:27 -0000 1.5 @@ -1 +1 @@ -akonadi-1.1.1.tar.bz2 +akonadi-1.1.2.tar.bz2 Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/akonadi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- akonadi.spec 14 Mar 2009 16:36:22 -0000 1.7 +++ akonadi.spec 3 May 2009 02:59:27 -0000 1.8 @@ -1,12 +1,13 @@ + Summary: PIM Storage Service Name: akonadi -Version: 1.1.1 -Release: 6%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://download.akonadi-project.org/ -Source0: http://akonadi.omat.nl/akonadi-%{version}.tar.bz2 +Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # shrink default initial db size a bit (approx 140mb->28mb) @@ -14,8 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version Patch1: akonadi-1.1.1-mysql_conf.patch ## upstream -# http://websvn.kde.org/branches/akonadi/1.1/server/src/akonadi.cpp?r1=905029&r2=931467&view=patch -Patch100: akonadi-1.1.1-startup-2.patch BuildRequires: cmake >= 2.6.0 BuildRequires: qt4-devel >= 4.4 @@ -33,7 +32,6 @@ Requires: qt4-mysql # not *strictly* required, but we need a functional default configuration Requires(hint): mysql-server -Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description @@ -58,7 +56,6 @@ Requires: pkgconfig %patch1 -p1 -b .mysql_conf touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf -%patch100 -p3 -b .startup-2 %build @@ -85,13 +82,16 @@ touch -d %{mysql_conf_timestamp} $RPM_BU rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig + +%posttrans update-mime-database %{_datadir}/mime &> /dev/null || : %postun -/sbin/ldconfig -update-mime-database %{_datadir}/mime &> /dev/null || : +/sbin/ldconfig ||: +if [ $1 -eq 0 ] ; then + update-mime-database %{_datadir}/mime &> /dev/null ||: +fi %files @@ -118,6 +118,10 @@ update-mime-database %{_datadir}/mime &> %changelog +* Thu Apr 30 2009 Rex Dieter - 1.1.2-1 +- akonadi-1.1.2 +- optimize scriptlets a bit + * Wed Feb 25 2009 Rex Dieter - 1.1.1-6 - rev startup patch - BR: cmake >= 2.6.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 26 Jan 2009 10:57:58 -0000 1.4 +++ sources 3 May 2009 02:59:27 -0000 1.5 @@ -1 +1 @@ -2e98b42cec9ec4e60a2e3c096f1a3106 akonadi-1.1.1.tar.bz2 +5651b02358f7d2f1c0954dfd31feafb1 akonadi-1.1.2.tar.bz2 --- akonadi-1.1.1-startup-2.patch DELETED --- From mitr at fedoraproject.org Sun May 3 03:40:00 2009 From: mitr at fedoraproject.org (Miloslav Trmac) Date: Sun, 3 May 2009 03:40:00 +0000 (UTC) Subject: rpms/stunnel/devel stunnel-4.27-aliasing.patch, 1.1, 1.2 stunnel.spec, 1.58, 1.59 Message-ID: <20090503034001.187A870131@cvs1.fedora.phx.redhat.com> Author: mitr Update of /cvs/pkgs/rpms/stunnel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26138 Modified Files: stunnel-4.27-aliasing.patch stunnel.spec Log Message: * Sun May 3 2009 Miloslav Trma?? - 4.27-3 - Fix the previous patch. stunnel-4.27-aliasing.patch: Index: stunnel-4.27-aliasing.patch =================================================================== RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel-4.27-aliasing.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- stunnel-4.27-aliasing.patch 30 Apr 2009 12:05:50 -0000 1.1 +++ stunnel-4.27-aliasing.patch 3 May 2009 03:39:29 -0000 1.2 @@ -6,7 +6,7 @@ diff -urN stunnel/src/libwrap.c stunnel- return -1; } - *recvfd=*((int *)CMSG_DATA(cmptr)); -+ memcpy(&recvfd, CMSG_DATA(cmptr), sizeof(int)); ++ memcpy(recvfd, CMSG_DATA(cmptr), sizeof(int)); #else if(msg.msg_accrightslen==sizeof(int)) *recvfd=newfd; Index: stunnel.spec =================================================================== RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- stunnel.spec 30 Apr 2009 12:05:50 -0000 1.58 +++ stunnel.spec 3 May 2009 03:39:29 -0000 1.59 @@ -1,7 +1,7 @@ Summary: An SSL-encrypting socket wrapper Name: stunnel Version: 4.27 -Release: 2 +Release: 3 License: GPLv2 Group: Applications/Internet URL: http://stunnel.mirt.net/ @@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_sysconfdir}/stunnel/* %changelog +* Sun May 3 2009 Miloslav Trma?? - 4.27-3 +- Fix the previous patch. + * Wed Apr 29 2009 Miloslav Trma?? - 4.27-2 - Avoid aliasing undefined by ISO C From pgordon at fedoraproject.org Sun May 3 03:47:31 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Sun, 3 May 2009 03:47:31 +0000 (UTC) Subject: rpms/deluge/F-11 .cvsignore, 1.57, 1.58 deluge.spec, 1.89, 1.90 sources, 1.57, 1.58 Message-ID: <20090503034731.ADE83700DA@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/deluge/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27029/F-11 Modified Files: .cvsignore deluge.spec sources Log Message: Update to 1.1.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deluge/F-11/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- .cvsignore 7 Apr 2009 04:55:33 -0000 1.57 +++ .cvsignore 3 May 2009 03:47:01 -0000 1.58 @@ -1 +1 @@ -deluge-1.1.6.tar.bz2 +deluge-1.1.7.tar.bz2 Index: deluge.spec =================================================================== RCS file: /cvs/pkgs/rpms/deluge/F-11/deluge.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- deluge.spec 7 Apr 2009 04:55:33 -0000 1.89 +++ deluge.spec 3 May 2009 03:47:01 -0000 1.90 @@ -6,8 +6,8 @@ %define min_rblibtorrent_ver 0.14.1 Name: deluge -Version: 1.1.6 -Release: 1%{?dist} +Version: 1.1.7 +Release: 1%{?dist}.1 Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet License: GPLv3 with exceptions @@ -141,6 +141,10 @@ fi %changelog +* Sat May 02 2009 Peter Gordon - 1.1.7-1.1 +- Update to new upstream bug-fix release (1.1.7). +- Slight release bump to fix CVS tag. + * Mon Apr 06 2009 Peter Gordon - 1.1.6-1 - Update to new upstream bug-fix release (1.1.6) - Fix GPL version, add OpenSSL exception to License. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deluge/F-11/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- sources 7 Apr 2009 04:55:33 -0000 1.57 +++ sources 3 May 2009 03:47:01 -0000 1.58 @@ -1 +1 @@ -78ef75153bbd5ef6a06ed876d66a9fb9 deluge-1.1.6.tar.bz2 +fd824abc3d8d2701f676176d7210c4c8 deluge-1.1.7.tar.bz2 From mnagy at fedoraproject.org Sun May 3 07:12:58 2009 From: mnagy at fedoraproject.org (Martin Nagy) Date: Sun, 3 May 2009 07:12:58 +0000 (UTC) Subject: rpms/bind-dyndb-ldap/F-11 bind-dyndb-ldap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090503071259.CEFFC700DA@cvs1.fedora.phx.redhat.com> Author: mnagy Update of /cvs/extras/rpms/bind-dyndb-ldap/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23109 Modified Files: .cvsignore sources Added Files: bind-dyndb-ldap.spec Log Message: * Sun May 03 2009 Martin Nagy - 0.1.0-0.1.a1 - initial packaging --- NEW FILE bind-dyndb-ldap.spec --- Name: bind-dyndb-ldap Version: 0.1.0 Release: 0.1.a1%{?dist} Summary: LDAP back-end plug-in for BIND Group: System Environment/Libraries License: GPLv2 URL: http://mnagy.github.com/bind-dyndb-ldap Source0: http://cloud.github.com/downloads/mnagy/%{name}/%{name}-%{version}a1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bind-devel >= 9.6.1-0.3.b1 BuildRequires: openldap-devel Requires: bind >= 9.6.1-0.3.b1 %description This package provides an LDAP back-end plug-in for BIND. It features support for dynamic updates and internal caching, to lift the load off of your LDAP server. %prep %setup -q -n %{name}-%{version}a1 %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} # Remove unwanted files rm %{buildroot}%{_libdir}/bind/ldap.la rm -r %{buildroot}%{_datadir}/doc/%{name} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README COPYING doc/{example.ldif,schema} %{_libdir}/bind/ldap.so %changelog * Sun May 03 2009 Martin Nagy - 0.1.0-0.1.a1 - initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bind-dyndb-ldap/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:33:23 -0000 1.1 +++ .cvsignore 3 May 2009 07:12:54 -0000 1.2 @@ -0,0 +1 @@ +bind-dyndb-ldap-0.1.0a1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bind-dyndb-ldap/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:33:23 -0000 1.1 +++ sources 3 May 2009 07:12:54 -0000 1.2 @@ -0,0 +1 @@ +d2ccf56cc4e1018a667802cc084f0c2e bind-dyndb-ldap-0.1.0a1.tar.bz2 From mnagy at fedoraproject.org Sun May 3 07:20:07 2009 From: mnagy at fedoraproject.org (Martin Nagy) Date: Sun, 3 May 2009 07:20:07 +0000 (UTC) Subject: rpms/bind-dyndb-ldap/devel bind-dyndb-ldap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090503072007.8AAAC700DA@cvs1.fedora.phx.redhat.com> Author: mnagy Update of /cvs/extras/rpms/bind-dyndb-ldap/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23960 Modified Files: .cvsignore sources Added Files: bind-dyndb-ldap.spec Log Message: * Sun May 03 2009 Martin Nagy - 0.1.0-0.1.a1 - initial packaging --- NEW FILE bind-dyndb-ldap.spec --- Name: bind-dyndb-ldap Version: 0.1.0 Release: 0.1.a1%{?dist} Summary: LDAP back-end plug-in for BIND Group: System Environment/Libraries License: GPLv2 URL: http://mnagy.github.com/bind-dyndb-ldap Source0: http://cloud.github.com/downloads/mnagy/%{name}/%{name}-%{version}a1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bind-devel >= 9.6.1-0.3.b1 BuildRequires: openldap-devel Requires: bind >= 9.6.1-0.3.b1 %description This package provides an LDAP back-end plug-in for BIND. It features support for dynamic updates and internal caching, to lift the load off of your LDAP server. %prep %setup -q -n %{name}-%{version}a1 %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} # Remove unwanted files rm %{buildroot}%{_libdir}/bind/ldap.la rm -r %{buildroot}%{_datadir}/doc/%{name} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README COPYING doc/{example.ldif,schema} %{_libdir}/bind/ldap.so %changelog * Sun May 03 2009 Martin Nagy - 0.1.0-0.1.a1 - initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bind-dyndb-ldap/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:33:23 -0000 1.1 +++ .cvsignore 3 May 2009 07:19:36 -0000 1.2 @@ -0,0 +1 @@ +bind-dyndb-ldap-0.1.0a1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bind-dyndb-ldap/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:33:23 -0000 1.1 +++ sources 3 May 2009 07:19:36 -0000 1.2 @@ -0,0 +1 @@ +d2ccf56cc4e1018a667802cc084f0c2e bind-dyndb-ldap-0.1.0a1.tar.bz2 From tanguy at fedoraproject.org Sun May 3 08:22:33 2009 From: tanguy at fedoraproject.org (Eric Tanguy) Date: Sun, 3 May 2009 08:22:33 +0000 (UTC) Subject: rpms/qucs/F-10 qucs-0.0.15-qucsdigi.patch, NONE, 1.1 qucs.spec, 1.24, 1.25 Message-ID: <20090503082234.08216700DA@cvs1.fedora.phx.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2506 Modified Files: qucs.spec Added Files: qucs-0.0.15-qucsdigi.patch Log Message: qucs-0.0.15-qucsdigi.patch: --- NEW FILE qucs-0.0.15-qucsdigi.patch --- --- qucs-0.0.15/qucs/qucsdigi 2008-09-25 21:15:57.000000000 +0200 +++ qucs-0.0.15/qucs/qucsdigi 2009-05-03 10:05:02.000000000 +0200 @@ -60,7 +60,7 @@ LIBS=`freehdl-config --libtool` IEEELIBS=`freehdl-config --ieee` LDFLAGS=`freehdl-config --ldflags` -LIBTOOL=`freehdl-config --linker` +LIBTOOL=`freehdl-config --libtool` cp $NAME digi.vhdl NAME="digi" Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/F-10/qucs.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- qucs.spec 1 May 2009 14:12:25 -0000 1.24 +++ qucs.spec 3 May 2009 08:22:01 -0000 1.25 @@ -1,9 +1,10 @@ Summary: Circuit simulator Name: qucs Version: 0.0.15 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: qucs-0.0.15-qucsdigi.patch URL: http://qucs.sourceforge.net/ License: GPL+ Group: Applications/Engineering @@ -20,6 +21,7 @@ e.g. DC, AC, S-parameter and harmonic ba %prep %setup -q +%patch0 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Sun May 03 2009 Eric Tanguy - 0.0.15-2 +- Correct a problem in digital simulation + * Fri May 01 2009 Eric Tanguy - 0.0.15-1 - Update to 0.0.15 From iarnell at fedoraproject.org Sun May 3 08:22:52 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 3 May 2009 08:22:52 +0000 (UTC) Subject: rpms/perl-App-Nopaste/devel perl-App-Nopaste.spec,1.1,1.2 Message-ID: <20090503082252.C8B1A700DA@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-App-Nopaste/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2612 Modified Files: perl-App-Nopaste.spec Log Message: * Sun May 03 2009 Iain Arnell 0.10-2 - rename nopaste command to avoid conflict with existing nopaste rpm Index: perl-App-Nopaste.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/devel/perl-App-Nopaste.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- perl-App-Nopaste.spec 30 Apr 2009 07:18:16 -0000 1.1 +++ perl-App-Nopaste.spec 3 May 2009 08:22:22 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-App-Nopaste Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy access to any pastebin License: GPL+ or Artistic Group: Development/Libraries @@ -39,6 +39,10 @@ name nopaste). %prep %setup -q -n App-Nopaste-%{version} +mv bin/nopaste bin/app-nopaste +sed -i -e 's/nopaste/app-nopaste/' bin/app-nopaste +sed -i -e 's/nopaste/app-nopaste/' Makefile.PL + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -68,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Sun May 03 2009 Iain Arnell 0.10-2 +- rename nopaste command to avoid conflict with existing nopaste rpm + * Sun Apr 19 2009 Iain Arnell 0.10-1 - Specfile autogenerated by cpanspec 1.77. - add requires for optional modules From tanguy at fedoraproject.org Sun May 3 08:40:17 2009 From: tanguy at fedoraproject.org (Eric Tanguy) Date: Sun, 3 May 2009 08:40:17 +0000 (UTC) Subject: rpms/qucs/F-11 qucs-0.0.15-qucsdigi.patch, NONE, 1.1 qucs.spec, 1.25, 1.26 Message-ID: <20090503084018.1C48B700DA@cvs1.fedora.phx.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6143 Modified Files: qucs.spec Added Files: qucs-0.0.15-qucsdigi.patch Log Message: qucs-0.0.15-qucsdigi.patch: --- NEW FILE qucs-0.0.15-qucsdigi.patch --- --- qucs-0.0.15/qucs/qucsdigi 2008-09-25 21:15:57.000000000 +0200 +++ qucs-0.0.15/qucs/qucsdigi 2009-05-03 10:05:02.000000000 +0200 @@ -60,7 +60,7 @@ LIBS=`freehdl-config --libtool` IEEELIBS=`freehdl-config --ieee` LDFLAGS=`freehdl-config --ldflags` -LIBTOOL=`freehdl-config --linker` +LIBTOOL=`freehdl-config --libtool` cp $NAME digi.vhdl NAME="digi" Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/F-11/qucs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- qucs.spec 1 May 2009 14:21:20 -0000 1.25 +++ qucs.spec 3 May 2009 08:39:46 -0000 1.26 @@ -1,9 +1,10 @@ Summary: Circuit simulator Name: qucs Version: 0.0.15 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: qucs-0.0.15-qucsdigi.patch URL: http://qucs.sourceforge.net/ License: GPL+ Group: Applications/Engineering @@ -20,6 +21,7 @@ e.g. DC, AC, S-parameter and harmonic ba %prep %setup -q +%patch0 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Sun May 03 2009 Eric Tanguy - 0.0.15-2 +- Correct a problem in digital simulation + * Fri May 01 2009 Eric Tanguy - 0.0.15-1 - Update to 0.0.15 From tanguy at fedoraproject.org Sun May 3 08:42:30 2009 From: tanguy at fedoraproject.org (Eric Tanguy) Date: Sun, 3 May 2009 08:42:30 +0000 (UTC) Subject: rpms/qucs/devel qucs-0.0.15-qucsdigi.patch, NONE, 1.1 qucs.spec, 1.25, 1.26 Message-ID: <20090503084230.91294700DA@cvs1.fedora.phx.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6586 Modified Files: qucs.spec Added Files: qucs-0.0.15-qucsdigi.patch Log Message: qucs-0.0.15-qucsdigi.patch: --- NEW FILE qucs-0.0.15-qucsdigi.patch --- --- qucs-0.0.15/qucs/qucsdigi 2008-09-25 21:15:57.000000000 +0200 +++ qucs-0.0.15/qucs/qucsdigi 2009-05-03 10:05:02.000000000 +0200 @@ -60,7 +60,7 @@ LIBS=`freehdl-config --libtool` IEEELIBS=`freehdl-config --ieee` LDFLAGS=`freehdl-config --ldflags` -LIBTOOL=`freehdl-config --linker` +LIBTOOL=`freehdl-config --libtool` cp $NAME digi.vhdl NAME="digi" Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- qucs.spec 1 May 2009 14:24:40 -0000 1.25 +++ qucs.spec 3 May 2009 08:41:59 -0000 1.26 @@ -1,9 +1,10 @@ Summary: Circuit simulator Name: qucs Version: 0.0.15 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: qucs-0.0.15-qucsdigi.patch URL: http://qucs.sourceforge.net/ License: GPL+ Group: Applications/Engineering @@ -20,6 +21,7 @@ e.g. DC, AC, S-parameter and harmonic ba %prep %setup -q +%patch0 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Sun May 03 2009 Eric Tanguy - 0.0.15-2 +- Correct a problem in digital simulation + * Fri May 01 2009 Eric Tanguy - 0.0.15-1 - Update to 0.0.15 From cwickert at fedoraproject.org Sun May 3 09:38:51 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 3 May 2009 09:38:51 +0000 (UTC) Subject: rpms/lxde-common/F-10 lxde-common-0.4-lxpanel-config.patch, NONE, 1.1 lxde-common-0.4-openbox-menu.patch, NONE, 1.1 lxde-common-0.4-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lxde-common.spec, 1.2, 1.3 sources, 1.2, 1.3 lxde-common-0.3.0.1-default-wallpaper.patch, 1.1, NONE lxde-common-0.3.2.1-lxpanel-config.patch, 1.1, NONE lxde-common-0.3.2.1-lxpanel-mixer.patch, 1.1, NONE lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch, 1.1, NONE lxde-common-0.3.2.1-lxpanel-starthere.patch, 1.1, NONE lxde-common-0.3.2.1-lxterminal.patch, 1.1, NONE lxde-common-0.3.2.1-vendor-artwork.patch, 1.1, NONE Message-ID: <20090503093851.E02F9700DA@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxde-common/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16466 Modified Files: .cvsignore lxde-common.spec sources Added Files: lxde-common-0.4-lxpanel-config.patch lxde-common-0.4-openbox-menu.patch lxde-common-0.4-pulseaudio.patch Removed Files: lxde-common-0.3.0.1-default-wallpaper.patch lxde-common-0.3.2.1-lxpanel-config.patch lxde-common-0.3.2.1-lxpanel-mixer.patch lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch lxde-common-0.3.2.1-lxpanel-starthere.patch lxde-common-0.3.2.1-lxterminal.patch lxde-common-0.3.2.1-vendor-artwork.patch Log Message: * Tue Apr 28 2009 Christoph Wickert - 0.4-1 - Update to 0.4 - Require lxmenu-data and lxde-settings-daemon - Drop obsolete config file /etc/xdg/lxsession/LXDE/default lxde-common-0.4-lxpanel-config.patch: --- NEW FILE lxde-common-0.4-lxpanel-config.patch --- diff -dur lxde-common-0.4.orig/lxpanel/config lxde-common-0.4/lxpanel/config --- lxde-common-0.4.orig/lxpanel/config 2008-06-16 10:10:24.000000000 +0200 +++ lxde-common-0.4/lxpanel/config 2009-04-28 22:11:13.000000000 +0200 @@ -1,4 +1,4 @@ [Command] FileManager=pcmanfm %s -Terminal=xterm -e +Terminal=lxterminal -e Logout=lxde-logout diff -dur lxde-common-0.4.orig/lxpanel/panel.in lxde-common-0.4/lxpanel/panel.in --- lxde-common-0.4.orig/lxpanel/panel.in 2008-06-16 10:10:24.000000000 +0200 +++ lxde-common-0.4/lxpanel/panel.in 2009-04-29 00:27:56.000000000 +0200 @@ -13,9 +13,9 @@ alpha=0 setdocktype=1 setpartialstrut=1 - usefontcolor=1 + usefontcolor=0 fontcolor=#ffffff - background=1 + background=0 backgroundfile=@prefix@/share/lxpanel/images/background.png } @@ -29,12 +29,13 @@ Plugin { type = menu Config { - image=@prefix@/share/lxde/images/lxde-icon.png + image=fedora-logo-icon.png system { } separator { } item { + image=gnome-run command=run } separator { @@ -50,10 +51,13 @@ type = launchbar Config { Button { - id=pcmanfm.desktop + id=fedora-pcmanfm.desktop } Button { - id=firefox.desktop + id=fedora-lxterminal.desktop + } + Button { + id=mozilla-firefox.desktop } } } @@ -139,3 +143,7 @@ } } +Plugin { + type = volumealsa +} + lxde-common-0.4-openbox-menu.patch: --- NEW FILE lxde-common-0.4-openbox-menu.patch --- --- lxde-common-0.4.orig/openbox/menu.xml 2008-07-16 04:20:32.000000000 +0200 +++ lxde-common-0.4/openbox/menu.xml 2009-04-28 23:25:47.000000000 +0200 @@ -2,38 +2,49 @@ - + + + + + + + yespcmanfm pcmanfm - - xterm + + lxterminal firefox - - - - - - + - + + + + + + + yesgtk-run + lxpanelctl run - + - yesopenbox - obconf + yesgtk-find + pcmanfm -f + @@ -43,4 +54,4 @@ - \ Kein Zeilenumbruch am Dateiende. + lxde-common-0.4-pulseaudio.patch: --- NEW FILE lxde-common-0.4-pulseaudio.patch --- --- lxde-common-0.4.orig/autostart 2008-11-28 16:09:00.000000000 +0100 +++ lxde-common-0.4/autostart 2009-04-28 23:52:51.000000000 +0200 @@ -1,4 +1,5 @@ @lxde-settings-daemon + at pulseaudio -D @xscreensaver -no-splash @lxpanel --profile LXDE @pcmanfm -d Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxde-common/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 10 Oct 2008 23:51:57 -0000 1.2 +++ .cvsignore 3 May 2009 09:38:17 -0000 1.3 @@ -1 +1 @@ -lxde-common-0.3.2.1.tar.bz2 +lxde-common-0.4.tar.bz2 Index: lxde-common.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxde-common/F-10/lxde-common.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- lxde-common.spec 1 Nov 2008 02:53:36 -0000 1.2 +++ lxde-common.spec 3 May 2009 09:38:19 -0000 1.3 @@ -1,30 +1,28 @@ Name: lxde-common -Version: 0.3.2.1 -Release: 4%{?dist} +Version: 0.4 +Release: 1%{?dist} Summary: Default configuration files for LXDE -Summary(de): Konfigurationsdateien f??r LXDE Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.3.2.1-lxpanel-config.patch -Patch1: %{name}-0.3.2.1-lxpanel-mixer.patch -Patch2: %{name}-0.3.2.1-lxterminal.patch -Patch3: %{name}-0.3.2.1-lxpanel-no-background-by-default.patch +# Distro specific patches +Patch10: %{name}-0.3.2.1-pcmanfm-config.patch +Patch11: %{name}-0.4-lxpanel-config.patch +Patch12: %{name}-0.4-openbox-menu.patch +Patch13: %{name}-0.3.2.1-logout-banner.patch +# Pulseaudio +Patch4: %{name}-0.4-pulseaudio.patch # Because of new gdm # http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac -Patch4: %{name}-0.3.2.1-gdm-number-of-desktops.patch -# Vendor specific patches -Patch10: %{name}-0.3.0.1-default-wallpaper.patch -Patch11: %{name}-0.3.2.1-vendor-artwork.patch -Patch12: %{name}-0.3.2.1-lxpanel-starthere.patch +Patch5: %{name}-0.3.2.1-gdm-number-of-desktops.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig glib2-devel libX11-devel -Requires: lxsession lxpanel pcmanfm openbox +Requires: lxsession lxpanel pcmanfm openbox xdg-utils +Requires: lxmenu-data lxde-settings-daemon # Use vendor's artwork -Requires: gtk-nodoka-engine fedora-icon-theme +Requires: system-logos %if 0%{?fedora} < 9 Requires: desktop-backgrounds-basic %else @@ -32,34 +30,31 @@ Requires: desktop-backgrounds-comp # needed for new gdm workaround Requires: wmctrl %endif - +Provides: %{name}-data = %{version}-%{release} +# needed because the lxde-common-data required its main package with full n-v-r +Provides: %{name}-data = 0.3.2.1-4 +Obsoletes: %{name}-data <= 0.3.2.1-4 +BuildArch: noarch %description This package contains the configuration files for LXDE, the Lightweight X11 Desktop Environment. -%description -l de -Dieses Paket enth??lt die Konfigurationsdateien f??r LXDE, die leichtgewichtige -X11 Desktop Umgebung. - %prep %setup -q -%patch0 -p1 -b .panel-config -%patch1 -p1 -b .mixer -%patch2 -p1 -b .lxterminal -%patch3 -p1 -b .no-background -%if 0%{?fedora} < 9 -%patch4 -p1 -b .gdm-desktops +%patch10 -p1 -b .orig +%patch11 -p1 -b .orig +%patch12 -p1 -b .orig +%patch13 -p1 -b .logout-banner +%patch4 -p1 -b .pulseaudio +%if 0%{?fedora} > 8 +%patch5 -p1 -b .gdm-desktops %endif -%patch10 -p1 -b .default-wallpaper -%patch11 -p1 -b .vendor -%patch12 -p1 -b .starthere %build %configure -make %{?_smp_mflags} %install @@ -67,6 +62,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' # the icon theme is packaged in a different package rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/ +# only used by obsolete lxsession, not lxsession-lite +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default %clean @@ -77,27 +74,31 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING %dir %{_sysconfdir}/xdg/lxsession/LXDE/ -%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/default %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config - %{_bindir}/startlxde %{_bindir}/lxde-logout -%{_bindir}/lxde-settings %{_bindir}/openbox-lxde - -%{_datadir}/lxde/ +%{_datadir}/lxde/* %{_datadir}/lxpanel/profile/LXDE/ %{_mandir}/man1/*.1.gz -%{_usr}/share/xsessions/LXDE.desktop +%{_datadir}/xsessions/LXDE.desktop %changelog -* Sat Nov 01 2008 Christoph Wickert - 0.3.2.1-4 +* Tue Apr 28 2009 Christoph Wickert - 0.4-1 +- Update to 0.4 +- Require lxmenu-data and lxde-settings-daemon +- Drop obsolete config file /etc/xdg/lxsession/LXDE/default + +* Fri Mar 06 2009 Christoph Wickert - 0.3.2.1-4 - Workaround for new gdm +- Add Pulseaudio support +- Add mixer plugin to the panel +- Require xdg-utils * Fri Oct 10 2008 Christoph Wickert - 0.3.2.1-3 -- Require fedora-icon-theme and fedora-logos +- Require fedora-icon-theme and system-logos * Thu Oct 09 2008 Christoph Wickert - 0.3.2.1-2 - Rebase patches for rpm's new fuzz=0 behaviour Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxde-common/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 10 Oct 2008 23:51:57 -0000 1.2 +++ sources 3 May 2009 09:38:19 -0000 1.3 @@ -1 +1 @@ -f30eee998071ace04e7be33aa8ac6a5b lxde-common-0.3.2.1.tar.bz2 +aa16d649ecb9b42ac52eec5c125b7084 lxde-common-0.4.tar.bz2 --- lxde-common-0.3.0.1-default-wallpaper.patch DELETED --- --- lxde-common-0.3.2.1-lxpanel-config.patch DELETED --- --- lxde-common-0.3.2.1-lxpanel-mixer.patch DELETED --- --- lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch DELETED --- --- lxde-common-0.3.2.1-lxpanel-starthere.patch DELETED --- --- lxde-common-0.3.2.1-lxterminal.patch DELETED --- --- lxde-common-0.3.2.1-vendor-artwork.patch DELETED --- From cwickert at fedoraproject.org Sun May 3 09:46:10 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 3 May 2009 09:46:10 +0000 (UTC) Subject: rpms/lxde-common/F-10 lxde-common-0.3.2.1-logout-banner.patch, NONE, 1.1 lxde-common-0.3.2.1-pcmanfm-config.patch, NONE, 1.1 Message-ID: <20090503094610.AE54E700DA@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxde-common/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17890 Added Files: lxde-common-0.3.2.1-logout-banner.patch lxde-common-0.3.2.1-pcmanfm-config.patch Log Message: add missing patches lxde-common-0.3.2.1-logout-banner.patch: --- NEW FILE lxde-common-0.3.2.1-logout-banner.patch --- --- lxde-common-0.3.2.1.orig/lxde-logout.in 2008-04-20 10:26:19.000000000 +0200 +++ lxde-common-0.3.2.1/lxde-logout.in 2008-11-30 17:08:25.000000000 +0100 @@ -1,2 +1,2 @@ #!/bin/sh -lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top +lxsession-logout --banner "@prefix@/share/pixmaps/fedora-logo-small.png" --side=top lxde-common-0.3.2.1-pcmanfm-config.patch: --- NEW FILE lxde-common-0.3.2.1-pcmanfm-config.patch --- diff -dur lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in lxde-common-0.3.2.1/pcmanfm/main.lxde.in --- lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in 2008-04-20 10:24:58.000000000 +0200 +++ lxde-common-0.3.2.1/pcmanfm/main.lxde.in 2008-05-06 02:13:16.000000000 +0200 @@ -1,3 +1,6 @@ [Desktop] show_wallpaper=1 -wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg +wallpaper=@prefix@/share/backgrounds/images/default.png + +[General] +terminal=lxterminal From robert at fedoraproject.org Sun May 3 11:24:12 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 11:24:12 +0000 (UTC) Subject: rpms/jwhois/devel jwhois-4.0-conf_update3.patch, NONE, 1.1 jwhois.spec, 1.49, 1.50 Message-ID: <20090503112412.CDF4F700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/jwhois/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3462 Modified Files: jwhois.spec Added Files: jwhois-4.0-conf_update3.patch Log Message: Update jwhois.conf for .al, .cu, .my and .so domains jwhois-4.0-conf_update3.patch: --- NEW FILE jwhois-4.0-conf_update3.patch --- --- jwhois-4.0/example/jwhois.conf 2009-05-03 13:15:33.000000000 +0200 +++ jwhois-4.0/example/jwhois.conf.rsc 2009-05-03 13:17:52.000000000 +0200 @@ -119,7 +119,7 @@ "\\.af$" = "whois.cocca.cx"; "\\.ag$" = "whois.nic.ag"; "\\.ai$" = "whois.ai"; - "\\.al$" = "whois.ripe.net"; + "\\.al$" = "www.ert.gov.al"; "\\.am$" = "whois.amnic.net"; "\\.ar$" = "www.nic.ar"; "\\.arpa$" = "whois.iana.org"; @@ -168,6 +168,7 @@ query-format = "domain $*"; } "\\.coop$" = "whois.nic.coop"; + "\\.cu$" = "www.nic.cu"; "\\.cx$" = "whois.nic.cx"; "\\.cy$" = "whois.ripe.net"; "\\.cz$" = "whois.nic.cz"; @@ -254,7 +255,7 @@ "\\.museum$" = "whois.museum"; "\\.mw$" = "www.tarsus.net"; "\\.mx$" = "whois.nic.mx"; - "\\.my$" = "whois.mynic.net.my"; + "\\.my$" = "whois.domainregistry.my"; "\\.na$" = "whois.na-nic.com.na"; "\\.name$" = "whois.nic.name"; "\\.net$" { @@ -293,6 +294,7 @@ "\\.sk$" = "whois.sk-nic.sk"; "\\.sm$" = "whois.ripe.net"; "\\.sn$" = "whois.nic.sn"; + "\\.so$" = "whois.nic.so"; "\\.sr$" = "whois.register.sr"; "\\.st$" = "whois.nic.st"; "\\.su$" = "whois.ripn.net"; @@ -1069,9 +1071,24 @@ http-action = "/cgi-bin/checkavail.cgi"; form-element = "domain"; } + "whois\\.dotster\\.com" { answer-charset = "UTF-8"; } + + "www\\.ert\\.gov\\.al" { + http = "true"; + http-method = "POST"; + http-action = "/ert_eng/domain_res.html"; + query-format = "Domain=${+2}"; + } + + "www\\.nic\\.cu" { + http = "true"; + http-method = "GET"; + http-action = "/dom_det.php"; + form-element = "domsrch"; + } } # Index: jwhois.spec =================================================================== RCS file: /cvs/pkgs/rpms/jwhois/devel/jwhois.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- jwhois.spec 23 Apr 2009 14:37:47 -0000 1.49 +++ jwhois.spec 3 May 2009 11:23:39 -0000 1.50 @@ -1,6 +1,6 @@ Name: jwhois Version: 4.0 -Release: 14%{?dist} +Release: 15%{?dist} URL: http://www.gnu.org/software/jwhois/ Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz Patch0: jwhois-4.0-connect.patch @@ -12,6 +12,7 @@ Patch5: jwhois-4.0-fclose.patch Patch6: jwhois-4.0-conf_update.patch Patch7: jwhois-4.0-conf_update2.patch Patch8: jwhois-4.0-dotster.patch +Patch9: jwhois-4.0-conf_update3.patch License: GPLv3 Group: Applications/Internet Summary: Internet whois/nicname client @@ -34,6 +35,7 @@ A whois client that accepts both traditi %patch6 -p1 -b .conf_update %patch7 -p1 -b .conf_update2 %patch8 -p1 -b .dotster +%patch9 -p1 -b .conf_update3 iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_ mv doc/sv/jwhois.1_ doc/sv/jwhois.1 @@ -73,6 +75,9 @@ fi rm -fr $RPM_BUILD_ROOT %changelog +* Sun May 03 2009 Robert Scheck - 4.0-15 +- Update jwhois.conf for .al, .cu, .my and .so domains + * Thu Apr 23 2009 Vitezslav Crhonek - 4.0-14 - Update jwhois.conf to expect UTF-8 answer charset from whois.dotster.com Resolves: #496015 From robert at fedoraproject.org Sun May 3 11:41:24 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 11:41:24 +0000 (UTC) Subject: rpms/perl-Net-LibIDN/devel .cvsignore, 1.5, 1.6 perl-Net-LibIDN.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <20090503114124.78E3D700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/extras/rpms/perl-Net-LibIDN/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4553 Modified Files: .cvsignore perl-Net-LibIDN.spec sources Log Message: Upgrade to 0.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-LibIDN/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 25 Jan 2009 15:46:16 -0000 1.5 +++ .cvsignore 3 May 2009 11:41:22 -0000 1.6 @@ -1 +1 @@ -Net-LibIDN-0.11.tar.gz +Net-LibIDN-0.12.tar.gz Index: perl-Net-LibIDN.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-LibIDN/devel/perl-Net-LibIDN.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- perl-Net-LibIDN.spec 23 Feb 2009 21:24:23 -0000 1.10 +++ perl-Net-LibIDN.spec 3 May 2009 11:41:22 -0000 1.11 @@ -2,8 +2,8 @@ Summary: Perl bindings for GNU LibIDN Name: perl-Net-LibIDN -Version: 0.11 -Release: 2%{?dist} +Version: 0.12 +Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/%{pkgname}/ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/auto/Net %changelog +* Sun May 03 2009 Robert Scheck 0.12-1 +- Upgrade to 0.12 + * Mon Feb 23 2009 Robert Scheck 0.11-2 - Rebuilt against gcc 4.4 and rpm 4.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-LibIDN/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 25 Jan 2009 15:46:16 -0000 1.5 +++ sources 3 May 2009 11:41:22 -0000 1.6 @@ -1 +1 @@ -9386ec7da9d0de1509e05eaef3a1943e Net-LibIDN-0.11.tar.gz +c3e4de2065009d67bcb1df0afb473e12 Net-LibIDN-0.12.tar.gz From robert at fedoraproject.org Sun May 3 11:46:31 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 11:46:31 +0000 (UTC) Subject: rpms/duplicity/devel .cvsignore, 1.12, 1.13 duplicity.spec, 1.26, 1.27 sources, 1.12, 1.13 Message-ID: <20090503114631.051DF700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/extras/rpms/duplicity/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5601/devel Modified Files: .cvsignore duplicity.spec sources Log Message: Upgrade to 0.5.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 16 Apr 2009 05:55:41 -0000 1.12 +++ .cvsignore 3 May 2009 11:46:00 -0000 1.13 @@ -1 +1 @@ -duplicity-0.5.15.tar.gz +duplicity-0.5.16.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- duplicity.spec 16 Apr 2009 05:53:53 -0000 1.26 +++ duplicity.spec 3 May 2009 11:46:00 -0000 1.27 @@ -2,7 +2,7 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.5.15 +Version: 0.5.16 Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/%{name}* %changelog +* Sun May 03 2009 Robert Scheck 0.5.16-1 +- Upgrade to 0.5.16 + * Thu Apr 16 2009 Robert Scheck 0.5.15-1 - Upgrade to 0.5.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 16 Apr 2009 05:55:41 -0000 1.12 +++ sources 3 May 2009 11:46:00 -0000 1.13 @@ -1 +1 @@ -8d5c85a6da317573d4cbf44eae8caa63 duplicity-0.5.15.tar.gz +83e92b106a42c09e86447b1019f0a105 duplicity-0.5.16.tar.gz From robert at fedoraproject.org Sun May 3 11:46:30 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 11:46:30 +0000 (UTC) Subject: rpms/duplicity/F-11 .cvsignore, 1.11, 1.12 duplicity.spec, 1.25, 1.26 sources, 1.11, 1.12 Message-ID: <20090503114630.A0537700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/extras/rpms/duplicity/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5601/F-11 Modified Files: .cvsignore duplicity.spec sources Log Message: Upgrade to 0.5.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-11/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 21 Mar 2009 15:41:44 -0000 1.11 +++ .cvsignore 3 May 2009 11:46:00 -0000 1.12 @@ -1 +1 @@ -duplicity-0.5.12.tar.gz +duplicity-0.5.16.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-11/duplicity.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- duplicity.spec 21 Mar 2009 15:41:44 -0000 1.25 +++ duplicity.spec 3 May 2009 11:46:00 -0000 1.26 @@ -2,9 +2,9 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.5.12 +Version: 0.5.16 Release: 1%{?dist} -License: GPLv3+ +License: GPLv2+ Group: Applications/Archiving URL: http://www.nongnu.org/duplicity/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz @@ -51,6 +51,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/%{name}* %changelog +* Sun May 03 2009 Robert Scheck 0.5.16-1 +- Upgrade to 0.5.16 + +* Thu Apr 16 2009 Robert Scheck 0.5.15-1 +- Upgrade to 0.5.15 + * Sat Mar 21 2009 Robert Scheck 0.5.12-1 - Upgrade to 0.5.12 (#490289) Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-11/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 21 Mar 2009 15:41:44 -0000 1.11 +++ sources 3 May 2009 11:46:00 -0000 1.12 @@ -1 +1 @@ -38cb42fc0299ae0c8e029bd381aa4452 duplicity-0.5.12.tar.gz +83e92b106a42c09e86447b1019f0a105 duplicity-0.5.16.tar.gz From robert at fedoraproject.org Sun May 3 11:51:24 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 11:51:24 +0000 (UTC) Subject: rpms/nomarch/devel import.log,1.1,NONE Message-ID: <20090503115124.1EE37700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/nomarch/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6865 Removed Files: import.log Log Message: Remove obsolete import.log --- import.log DELETED --- From robert at fedoraproject.org Sun May 3 11:52:57 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 11:52:57 +0000 (UTC) Subject: rpms/perl-Convert-UUlib/devel import.log,1.1,NONE Message-ID: <20090503115257.66068700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/perl-Convert-UUlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7263 Removed Files: import.log Log Message: Remove obsolete import.log --- import.log DELETED --- From robert at fedoraproject.org Sun May 3 11:57:48 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 11:57:48 +0000 (UTC) Subject: rpms/python-boto/F-11 .cvsignore, 1.6, 1.7 python-boto.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <20090503115748.E3002700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/python-boto/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8006 Modified Files: .cvsignore python-boto.spec sources Log Message: Upgrade to 1.7a Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-boto/F-11/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 7 Dec 2008 17:30:39 -0000 1.6 +++ .cvsignore 3 May 2009 11:57:18 -0000 1.7 @@ -1 +1 @@ -boto-1.5c.tar.gz +boto-1.7a.tar.gz Index: python-boto.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-boto/F-11/python-boto.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- python-boto.spec 23 Feb 2009 21:12:58 -0000 1.9 +++ python-boto.spec 3 May 2009 11:57:18 -0000 1.10 @@ -3,8 +3,8 @@ Summary: A simple lightweight interface to Amazon Web Services Name: python-boto -Version: 1.5c -Release: 2%{?dist} +Version: 1.7a +Release: 1%{?dist} License: MIT Group: Development/Languages URL: http://code.google.com/p/%{pkgname}/ @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Thu Apr 16 2009 Robert Scheck 1.7a-1 +- Upgrade to 1.7a + * Mon Feb 23 2009 Robert Scheck 1.5c-2 - Rebuild against rpm 4.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-boto/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 7 Dec 2008 17:30:39 -0000 1.6 +++ sources 3 May 2009 11:57:18 -0000 1.7 @@ -1 +1 @@ -596558d292361944d2319cc615494734 boto-1.5c.tar.gz +e64e995ff2313452e78ef37dddeb44c1 boto-1.7a.tar.gz From robert at fedoraproject.org Sun May 3 12:14:09 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 12:14:09 +0000 (UTC) Subject: rpms/unicap/EL-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 unicap.spec, 1.8, 1.9 Message-ID: <20090503121410.0B049700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31190/EL-5 Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/EL-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 19 Oct 2008 14:20:33 -0000 1.8 +++ .cvsignore 3 May 2009 12:13:38 -0000 1.9 @@ -1 +1 @@ -unicap-0.9.3.tar.gz +unicap-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 19 Oct 2008 14:20:33 -0000 1.8 +++ sources 3 May 2009 12:13:38 -0000 1.9 @@ -1 +1 @@ -69db7c7dacb58c303d44f3b6598653ee unicap-0.9.3.tar.gz +1d64005afac1ec9d75a1637d7f1aa91e unicap-0.9.5.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/EL-5/unicap.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- unicap.spec 19 Oct 2008 14:20:33 -0000 1.8 +++ unicap.spec 3 May 2009 12:13:38 -0000 1.9 @@ -6,7 +6,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.9.3 +Version: 0.9.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -72,8 +72,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun May 03 2009 Robert Scheck 0.9.5-1 +- Upgrade to 0.9.5 + +* Mon Feb 23 2009 Robert Scheck 0.9.3-2 +- Rebuild against gcc 4.4 and rpm 4.6 + * Mon Oct 13 2008 Robert Scheck 0.9.3-1 - Upgrade to 0.9.3 (#466825, thanks to Hans de Goede) +- Enabled libv4l support for the new gspca kernel driver * Sat Aug 09 2008 Robert Scheck 0.2.23-4 - Rebuild to get missing dependencies back (#443015, #458527) From robert at fedoraproject.org Sun May 3 12:14:10 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 12:14:10 +0000 (UTC) Subject: rpms/unicap/F-10 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 unicap.spec, 1.10, 1.11 Message-ID: <20090503121410.741DA700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31190/F-10 Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-10/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 13 Oct 2008 21:43:42 -0000 1.7 +++ .cvsignore 3 May 2009 12:13:39 -0000 1.8 @@ -1 +1 @@ -unicap-0.9.3.tar.gz +unicap-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-10/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 13 Oct 2008 21:43:42 -0000 1.7 +++ sources 3 May 2009 12:13:39 -0000 1.8 @@ -1 +1 @@ -69db7c7dacb58c303d44f3b6598653ee unicap-0.9.3.tar.gz +1d64005afac1ec9d75a1637d7f1aa91e unicap-0.9.5.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-10/unicap.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- unicap.spec 19 Oct 2008 14:03:56 -0000 1.10 +++ unicap.spec 3 May 2009 12:13:40 -0000 1.11 @@ -6,7 +6,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.9.3 +Version: 0.9.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -73,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun May 03 2009 Robert Scheck 0.9.5-1 +- Upgrade to 0.9.5 + +* Mon Feb 23 2009 Robert Scheck 0.9.3-2 +- Rebuild against gcc 4.4 and rpm 4.6 + * Mon Oct 13 2008 Robert Scheck 0.9.3-1 - Upgrade to 0.9.3 (#466825, thanks to Hans de Goede) - Enabled libv4l support for the new gspca kernel driver From robert at fedoraproject.org Sun May 3 12:14:11 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 12:14:11 +0000 (UTC) Subject: rpms/unicap/F-9 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 unicap.spec, 1.9, 1.10 Message-ID: <20090503121411.68AEB700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31190/F-9 Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 19 Oct 2008 14:20:34 -0000 1.8 +++ .cvsignore 3 May 2009 12:13:41 -0000 1.9 @@ -1 +1 @@ -unicap-0.9.3.tar.gz +unicap-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 19 Oct 2008 14:20:34 -0000 1.8 +++ sources 3 May 2009 12:13:41 -0000 1.9 @@ -1 +1 @@ -69db7c7dacb58c303d44f3b6598653ee unicap-0.9.3.tar.gz +1d64005afac1ec9d75a1637d7f1aa91e unicap-0.9.5.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-9/unicap.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- unicap.spec 19 Oct 2008 14:20:34 -0000 1.9 +++ unicap.spec 3 May 2009 12:13:41 -0000 1.10 @@ -6,7 +6,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.9.3 +Version: 0.9.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -72,8 +72,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun May 03 2009 Robert Scheck 0.9.5-1 +- Upgrade to 0.9.5 + +* Mon Feb 23 2009 Robert Scheck 0.9.3-2 +- Rebuild against gcc 4.4 and rpm 4.6 + * Mon Oct 13 2008 Robert Scheck 0.9.3-1 - Upgrade to 0.9.3 (#466825, thanks to Hans de Goede) +- Enabled libv4l support for the new gspca kernel driver * Sat Aug 09 2008 Robert Scheck 0.2.23-4 - Rebuild to get missing dependencies back (#443015, #458527) From robert at fedoraproject.org Sun May 3 12:14:11 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 12:14:11 +0000 (UTC) Subject: rpms/unicap/F-11 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 unicap.spec, 1.11, 1.12 Message-ID: <20090503121411.1D2A3700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31190/F-11 Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-11/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 13 Oct 2008 21:43:42 -0000 1.7 +++ .cvsignore 3 May 2009 12:13:40 -0000 1.8 @@ -1 +1 @@ -unicap-0.9.3.tar.gz +unicap-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-11/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 13 Oct 2008 21:43:42 -0000 1.7 +++ sources 3 May 2009 12:13:40 -0000 1.8 @@ -1 +1 @@ -69db7c7dacb58c303d44f3b6598653ee unicap-0.9.3.tar.gz +1d64005afac1ec9d75a1637d7f1aa91e unicap-0.9.5.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-11/unicap.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- unicap.spec 23 Feb 2009 21:13:23 -0000 1.11 +++ unicap.spec 3 May 2009 12:13:40 -0000 1.12 @@ -6,8 +6,8 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.5 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun May 03 2009 Robert Scheck 0.9.5-1 +- Upgrade to 0.9.5 + * Mon Feb 23 2009 Robert Scheck 0.9.3-2 - Rebuild against gcc 4.4 and rpm 4.6 From robert at fedoraproject.org Sun May 3 12:14:12 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 3 May 2009 12:14:12 +0000 (UTC) Subject: rpms/unicap/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 unicap.spec, 1.11, 1.12 Message-ID: <20090503121412.59B82700DA@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31190/devel Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 13 Oct 2008 21:43:42 -0000 1.7 +++ .cvsignore 3 May 2009 12:13:41 -0000 1.8 @@ -1 +1 @@ -unicap-0.9.3.tar.gz +unicap-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 13 Oct 2008 21:43:42 -0000 1.7 +++ sources 3 May 2009 12:13:41 -0000 1.8 @@ -1 +1 @@ -69db7c7dacb58c303d44f3b6598653ee unicap-0.9.3.tar.gz +1d64005afac1ec9d75a1637d7f1aa91e unicap-0.9.5.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/devel/unicap.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- unicap.spec 23 Feb 2009 21:13:23 -0000 1.11 +++ unicap.spec 3 May 2009 12:13:41 -0000 1.12 @@ -6,8 +6,8 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.5 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun May 03 2009 Robert Scheck 0.9.5-1 +- Upgrade to 0.9.5 + * Mon Feb 23 2009 Robert Scheck 0.9.3-2 - Rebuild against gcc 4.4 and rpm 4.6 From than at fedoraproject.org Sun May 3 12:36:28 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 12:36:28 +0000 (UTC) Subject: rpms/kdeaccessibility/F-11 .cvsignore, 1.38, 1.39 kdeaccessibility.spec, 1.78, 1.79 sources, 1.39, 1.40 Message-ID: <20090503123628.71B08700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdeaccessibility/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3069 Modified Files: .cvsignore kdeaccessibility.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- .cvsignore 30 Mar 2009 17:06:38 -0000 1.38 +++ .cvsignore 3 May 2009 12:35:55 -0000 1.39 @@ -1 +1,2 @@ kdeaccessibility-4.2.2.tar.bz2 +kdeaccessibility-4.2.3.tar.bz2 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/kdeaccessibility.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -p -r1.78 -r1.79 --- kdeaccessibility.spec 31 Mar 2009 11:22:50 -0000 1.78 +++ kdeaccessibility.spec 3 May 2009 12:35:55 -0000 1.79 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Accessibility Name: kdeaccessibility Epoch: 1 -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} Group: User Interface/Desktops @@ -111,6 +111,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Mar 30 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- sources 30 Mar 2009 17:06:38 -0000 1.39 +++ sources 3 May 2009 12:35:55 -0000 1.40 @@ -1 +1,2 @@ 7fd255ecf2274f868d4634b0f44e41af kdeaccessibility-4.2.2.tar.bz2 +d371973283e3b7843c9f8489e05269b2 kdeaccessibility-4.2.3.tar.bz2 From than at fedoraproject.org Sun May 3 12:39:29 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 12:39:29 +0000 (UTC) Subject: rpms/kdeaccessibility/F-11 sources,1.40,1.41 Message-ID: <20090503123929.5FDD4700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdeaccessibility/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3665 Modified Files: sources Log Message: 4.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- sources 3 May 2009 12:35:55 -0000 1.40 +++ sources 3 May 2009 12:38:58 -0000 1.41 @@ -1,2 +1 @@ -7fd255ecf2274f868d4634b0f44e41af kdeaccessibility-4.2.2.tar.bz2 d371973283e3b7843c9f8489e05269b2 kdeaccessibility-4.2.3.tar.bz2 From than at fedoraproject.org Sun May 3 12:42:06 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 12:42:06 +0000 (UTC) Subject: rpms/kdeadmin/F-11 .cvsignore, 1.59, 1.60 kdeadmin.spec, 1.131, 1.132 sources, 1.61, 1.62 Message-ID: <20090503124207.0285070135@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdeadmin/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4142 Modified Files: .cvsignore kdeadmin.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/F-11/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- .cvsignore 30 Mar 2009 17:09:15 -0000 1.59 +++ .cvsignore 3 May 2009 12:41:36 -0000 1.60 @@ -1 +1,2 @@ kdeadmin-4.2.2.tar.bz2 +kdeadmin-4.2.3.tar.bz2 Index: kdeadmin.spec =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -p -r1.131 -r1.132 --- kdeadmin.spec 21 Apr 2009 12:55:36 -0000 1.131 +++ kdeadmin.spec 3 May 2009 12:41:36 -0000 1.132 @@ -1,7 +1,7 @@ Name: kdeadmin Epoch: 7 -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment - Administrative tools Group: User Interface/Desktops @@ -143,6 +143,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 21 2009 Than Ngo - 4.2.2-4 - get rid of the dependency of system-config-printer - drop the BR on PyKDE4, system-config-printer-libs Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/F-11/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- sources 30 Mar 2009 17:09:15 -0000 1.61 +++ sources 3 May 2009 12:41:36 -0000 1.62 @@ -1 +1 @@ -b9104de38fa36962a2812aa9cae8fc5f kdeadmin-4.2.2.tar.bz2 +dc352ccb03c285a87fcc68d7d18e9d43 kdeadmin-4.2.3.tar.bz2 From caolanm at fedoraproject.org Sun May 3 12:56:19 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 3 May 2009 12:56:19 +0000 (UTC) Subject: rpms/hyphen-sa/devel .cvsignore, 1.1, 1.2 hyphen-sa.spec, 1.1, 1.2 sources, 1.1, 1.2 hyph-sa.tex, 1.1, NONE Message-ID: <20090503125619.46B29700DA@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hyphen-sa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7176 Modified Files: .cvsignore hyphen-sa.spec sources Removed Files: hyph-sa.tex Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hyphen-sa/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 8 Apr 2009 02:53:12 -0000 1.1 +++ .cvsignore 3 May 2009 12:55:45 -0000 1.2 @@ -0,0 +1 @@ +hyph-sa.tex Index: hyphen-sa.spec =================================================================== RCS file: /cvs/pkgs/rpms/hyphen-sa/devel/hyphen-sa.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- hyphen-sa.spec 8 Apr 2009 07:57:56 -0000 1.1 +++ hyphen-sa.spec 3 May 2009 12:55:46 -0000 1.2 @@ -1,6 +1,6 @@ Name: hyphen-sa Summary: Sanskrit hyphenation rules -%define upstreamid 20081010 +%define upstreamid 20090412 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/hyph-sa.tex @@ -50,5 +50,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/hyphen/hyph_bn_*.dic %changelog +* Sun May 03 2009 Caolan McNamara - 0.20090412-1 +- latest version + * Mon Apr 06 2009 Caolan McNamara - 0.20081010-1 - initial version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hyphen-sa/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 8 Apr 2009 02:53:12 -0000 1.1 +++ sources 3 May 2009 12:55:46 -0000 1.2 @@ -0,0 +1 @@ +8721f45555bcdf52146780a29ad82802 hyph-sa.tex --- hyph-sa.tex DELETED --- From deji at fedoraproject.org Sun May 3 12:58:04 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Sun, 3 May 2009 12:58:04 +0000 (UTC) Subject: rpms/atlas/devel atlas.spec,1.22,1.23 Message-ID: <20090503125804.43733700DA@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/atlas/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7614 Modified Files: atlas.spec Log Message: * Sat May 02 2009 Deji Akingunola - 3.8.3-4 - Use the right -msse* option for the -sse* subpackages (Fedora bug #498715) Index: atlas.spec =================================================================== RCS file: /cvs/pkgs/rpms/atlas/devel/atlas.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- atlas.spec 22 Apr 2009 11:47:16 -0000 1.22 +++ atlas.spec 3 May 2009 12:57:33 -0000 1.23 @@ -2,7 +2,7 @@ Name: atlas Version: 3.8.3 -Release: 3%{?dist}.1 +Release: 4%{?dist} Summary: Automatically Tuned Linear Algebra Software Group: System Environment/Libraries @@ -150,9 +150,11 @@ for type in %{types}; do if [ "$type" = "sse" ]; then sed -i 's#ARCH =.*#ARCH = PIII32SSE1#' Make.inc sed -i 's#-DATL_SSE3 -DATL_SSE2##' Make.inc + sed -i 's#-msse3#-msse#' Make.inc elif [ "$type" = "sse2" ]; then sed -i 's#ARCH =.*#ARCH = P432SSE2#' Make.inc sed -i 's#-DATL_SSE3##' Make.inc + sed -i 's#-msse3#-msse2#' Make.inc elif [ "$type" = "sse3" ]; then sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc fi @@ -279,6 +281,9 @@ rm -rf %{buildroot} %endif %changelog +* Sat May 02 2009 Deji Akingunola - 3.8.3-4 +- Use the right -msse* option for the -sse* subpackages (Fedora bug #498715) + * Tue Apr 21 2009 Karsten Hopp 3.8.3-3.1 - add s390x to 64 bit archs From than at fedoraproject.org Sun May 3 12:59:59 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 12:59:59 +0000 (UTC) Subject: rpms/kdeartwork/F-11 .cvsignore, 1.57, 1.58 kdeartwork.spec, 1.105, 1.106 sources, 1.59, 1.60 Message-ID: <20090503125959.7977E700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdeartwork/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7962 Modified Files: .cvsignore kdeartwork.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/F-11/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- .cvsignore 30 Mar 2009 17:18:17 -0000 1.57 +++ .cvsignore 3 May 2009 12:59:28 -0000 1.58 @@ -1 +1,2 @@ kdeartwork-4.2.2.tar.bz2 +kdeartwork-4.2.3.tar.bz2 Index: kdeartwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/F-11/kdeartwork.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -p -r1.105 -r1.106 --- kdeartwork.spec 1 Apr 2009 17:27:35 -0000 1.105 +++ kdeartwork.spec 3 May 2009 12:59:28 -0000 1.106 @@ -1,6 +1,6 @@ Name: kdeartwork -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: Additional artwork for KDE License: GPLv2 @@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-3 - optimize scriptlets - omit (unused) noarch hacks, use f10+ support Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/F-11/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- sources 30 Mar 2009 17:18:17 -0000 1.59 +++ sources 3 May 2009 12:59:29 -0000 1.60 @@ -1 +1 @@ -2315d64bb543decdb602b01376f5fc1e kdeartwork-4.2.2.tar.bz2 +6867919e82d111b0a2c0fe4067f41591 kdeartwork-4.2.3.tar.bz2 From deji at fedoraproject.org Sun May 3 13:02:32 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Sun, 3 May 2009 13:02:32 +0000 (UTC) Subject: rpms/atlas/F-11 atlas.spec,1.21,1.22 Message-ID: <20090503130232.9E2A0700DA@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/atlas/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8420 Modified Files: atlas.spec Log Message: * Sat May 02 2009 Deji Akingunola - 3.8.3-4 - Use the right -msse* option for the -sse* subpackages (Fedora bug #498715) Index: atlas.spec =================================================================== RCS file: /cvs/pkgs/rpms/atlas/F-11/atlas.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- atlas.spec 27 Feb 2009 18:24:52 -0000 1.21 +++ atlas.spec 3 May 2009 13:02:01 -0000 1.22 @@ -2,7 +2,7 @@ Name: atlas Version: 3.8.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Automatically Tuned Linear Algebra Software Group: System Environment/Libraries @@ -121,7 +121,7 @@ optimizations for the sse3 extensions to %endif %endif -%ifarch x86_64 ppc64 +%ifarch x86_64 ppc64 s390x %define mode 64 %else %define mode 32 @@ -150,9 +150,11 @@ for type in %{types}; do if [ "$type" = "sse" ]; then sed -i 's#ARCH =.*#ARCH = PIII32SSE1#' Make.inc sed -i 's#-DATL_SSE3 -DATL_SSE2##' Make.inc + sed -i 's#-msse3#-msse#' Make.inc elif [ "$type" = "sse2" ]; then sed -i 's#ARCH =.*#ARCH = P432SSE2#' Make.inc sed -i 's#-DATL_SSE3##' Make.inc + sed -i 's#-msse3#-msse2#' Make.inc elif [ "$type" = "sse3" ]; then sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc fi @@ -279,6 +281,12 @@ rm -rf %{buildroot} %endif %changelog +* Sat May 02 2009 Deji Akingunola - 3.8.3-4 +- Use the right -msse* option for the -sse* subpackages (Fedora bug #498715) + +* Tue Apr 21 2009 Karsten Hopp 3.8.3-3.1 +- add s390x to 64 bit archs + * Fri Feb 27 2009 Deji Akingunola - 3.8.3-3 - Rebuild From caolanm at fedoraproject.org Sun May 3 13:03:28 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 3 May 2009 13:03:28 +0000 (UTC) Subject: rpms/hunspell-mn/devel .cvsignore, 1.1, 1.2 hunspell-mn.spec, 1.2, 1.3 sources, 1.1, 1.2 dict-mn.oxt, 1.1, NONE Message-ID: <20090503130328.D1856700DA@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-mn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8625 Modified Files: .cvsignore hunspell-mn.spec sources Removed Files: dict-mn.oxt Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-mn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 Nov 2008 17:35:39 -0000 1.1 +++ .cvsignore 3 May 2009 13:02:57 -0000 1.2 @@ -0,0 +1 @@ +dict-mn_0.06-5.oxt Index: hunspell-mn.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-mn/devel/hunspell-mn.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- hunspell-mn.spec 25 Feb 2009 05:09:04 -0000 1.2 +++ hunspell-mn.spec 3 May 2009 13:02:58 -0000 1.3 @@ -1,8 +1,9 @@ Name: hunspell-mn Summary: Mongolian hunspell dictionaries -Version: 0.60.2 -Release: 2%{?dist} -Source: http://www.openmn.org/mn_download/dict-mn.oxt +%define upstreamid 20080709 +Version: 0.%{upstreamid} +Release: 1%{?dist} +Source: http://extensions.services.openoffice.org/files/1408/0/dict-mn_0.06-5.oxt Group: Applications/Text URL: http://mnspell.openmn.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/myspell/* %changelog +* Sun May 03 2009 Caolan McNamara - 0.20080709.1 +- latest version + * Tue Feb 24 2009 Fedora Release Engineering - 0.60.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-mn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 Nov 2008 17:35:39 -0000 1.1 +++ sources 3 May 2009 13:02:58 -0000 1.2 @@ -0,0 +1 @@ +6320a7d7795eec809a3b23626b2d9590 dict-mn_0.06-5.oxt --- dict-mn.oxt DELETED --- From caolanm at fedoraproject.org Sun May 3 13:08:36 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 3 May 2009 13:08:36 +0000 (UTC) Subject: rpms/icu/devel .cvsignore, 1.15, 1.16 icu-3.4-multiarchdevel.patch, 1.2, 1.3 icu.spec, 1.88, 1.89 sources, 1.16, 1.17 icu.icu6008.arm.padding.patch, 1.1, NONE icu.icu6439.bare.elif.patch, 1.1, NONE Message-ID: <20090503130836.D3C4C700DA@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/icu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9557 Modified Files: .cvsignore icu-3.4-multiarchdevel.patch icu.spec sources Removed Files: icu.icu6008.arm.padding.patch icu.icu6439.bare.elif.patch Log Message: bump and drop integrated patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/icu/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- .cvsignore 16 Jan 2009 10:57:59 -0000 1.15 +++ .cvsignore 3 May 2009 13:08:05 -0000 1.16 @@ -1,3 +1,2 @@ -icu4c-4_0-src.tgz icu-config -icu4c-4_0_1-src.tgz +icu4c-4_2_d03-src.tgz icu-3.4-multiarchdevel.patch: Index: icu-3.4-multiarchdevel.patch =================================================================== RCS file: /cvs/pkgs/rpms/icu/devel/icu-3.4-multiarchdevel.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- icu-3.4-multiarchdevel.patch 11 Jan 2008 12:18:28 -0000 1.2 +++ icu-3.4-multiarchdevel.patch 3 May 2009 13:08:06 -0000 1.3 @@ -1,13 +1,13 @@ --- icu/source/configure.in.orig 2006-05-02 12:10:31.000000000 +0100 +++ icu/source/configure.in 2006-05-02 15:06:07.000000000 +0100 -@@ -1011,6 +1011,7 @@ +@@ -1117,6 +1117,7 @@ Makefile \ - data/icupkg.inc \ + data/pkgdataMakefile \ config/Makefile.inc \ + config/icu.pc \ + config/pkgdataMakefile \ data/Makefile \ stubdata/Makefile \ - common/Makefile \ --- /dev/null 2006-04-29 13:38:37.035974750 +0100 +++ icu/source/config/icu.pc.in 2006-05-02 15:03:14.000000000 +0100 @@ -0,0 +1,46 @@ Index: icu.spec =================================================================== RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -r1.88 -r1.89 --- icu.spec 25 Feb 2009 06:44:39 -0000 1.88 +++ icu.spec 3 May 2009 13:08:06 -0000 1.89 @@ -1,22 +1,20 @@ Name: icu -Version: 4.0.1 -Release: 3%{?dist} +Version: 4.2 +Release: 0.1.d03%{?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/%{version}/icu4c-4_0_1-src.tgz +Source0: http://download.icu-project.org/files/icu4c/4.2/icu4c-4_2_d03-src.tgz Source1: icu-config BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, autoconf Requires: lib%{name} = %{version}-%{release} Patch1: icu-3.4-multiarchdevel.patch -Patch2: icu.icuXXXX.virama.prevnext.patch -Patch3: icu.icu6008.arm.padding.patch +Patch2: icu.icu6284.strictalias.patch +Patch3: icu.icuXXXX.virama.prevnext.patch Patch4: icu.icu6213.worstcase.patch -Patch5: icu.icu6284.strictalias.patch -Patch6: icu.icu6439.bare.elif.patch %description Tools and utilities for developing with icu. @@ -56,11 +54,10 @@ Group: Documentation %prep %setup -q -n %{name} %patch1 -p1 -b .multiarchdevel -%patch2 -p1 -b .icuXXXX.virama.prevnext.patch -%patch3 -p1 -b .icu6008.arm.padding.patch -%patch4 -p1 -b .icu6213.worstcase.patch -%patch5 -p1 -b .icu6284.strictalias.patch -%patch6 -p1 -b .icu6439.bare.elif.patch +%patch2 -p1 -b .icu6284.strictalias.patch +#let's skip these for now, hopefully unneccessary +#%patch3 -p1 -b .icuXXXX.virama.prevnext.patch +#%patch4 -p1 -b .icu6213.worstcase.patch %build cd source @@ -95,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT %doc license.html readme.html %{_bindir}/derb %{_bindir}/genbrk +%{_bindir}/gencfu %{_bindir}/gencnval %{_bindir}/genctd %{_bindir}/genrb @@ -137,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT %doc source/__docs/%{name}/html/* %changelog +* Sun May 03 2009 Caolan McNamara - 4.2-0.1.d03 +- 4.2 release candidate +- drop resolved icu.icu6008.arm.padding.patch +- drop resolved icu.icu6439.bare.elif.patch + * Tue Feb 24 2009 Fedora Release Engineering - 4.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/icu/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- sources 16 Jan 2009 10:57:59 -0000 1.16 +++ sources 3 May 2009 13:08:06 -0000 1.17 @@ -1,2 +1,2 @@ 89354abfe0d663d6b7b9274c6cd35238 icu-config -2f6ecca935948f7db92d925d88d0d078 icu4c-4_0_1-src.tgz +a45027185f350b7ae5496beb9f0b96aa icu4c-4_2_d03-src.tgz --- icu.icu6008.arm.padding.patch DELETED --- --- icu.icu6439.bare.elif.patch DELETED --- From than at fedoraproject.org Sun May 3 13:10:09 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 13:10:09 +0000 (UTC) Subject: rpms/kdebase/F-11 .cvsignore, 1.85, 1.86 kdebase.spec, 1.373, 1.374 sources, 1.108, 1.109 Message-ID: <20090503131009.0B35C700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9867 Modified Files: .cvsignore kdebase.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-11/.cvsignore,v retrieving revision 1.85 retrieving revision 1.86 diff -u -p -r1.85 -r1.86 --- .cvsignore 30 Mar 2009 17:22:17 -0000 1.85 +++ .cvsignore 3 May 2009 13:09:37 -0000 1.86 @@ -1 +1,2 @@ kdebase-4.2.2.tar.bz2 +kdebase-4.2.3.tar.bz2 Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v retrieving revision 1.373 retrieving revision 1.374 diff -u -p -r1.373 -r1.374 --- kdebase.spec 21 Apr 2009 15:37:06 -0000 1.373 +++ kdebase.spec 3 May 2009 13:09:38 -0000 1.374 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -29,7 +29,6 @@ Patch1: kdebase-4.1.70-konsole-session Patch2: kdebase-4.2.1-home-icon.patch # upstream patches -Patch100: kdebase-4.2.2-konsole-flowcontrol.patch %ifnarch s390 s390x Requires: eject @@ -125,7 +124,6 @@ Requires: kdelibs4-devel kdepimlibs4-dev %patch0 -p1 -b .nsplugins-paths %patch1 -p1 -b .konsole-session %patch2 -p1 -b .home-icon -%patch100 -p1 -b .konsole-flowcontrol # 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 @@ -317,6 +315,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 21 2009 Luk???? Tinkl - 4.2.2-3 - #496447 - fix disabling konsole's flow control Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-11/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -p -r1.108 -r1.109 --- sources 30 Mar 2009 17:22:17 -0000 1.108 +++ sources 3 May 2009 13:09:38 -0000 1.109 @@ -1 +1 @@ -7f6b0d5051f251d0f34ee797a8e2b54a kdebase-4.2.2.tar.bz2 +8779d4bd85d356300e22dc34bbeb06f9 kdebase-4.2.3.tar.bz2 From tejas at fedoraproject.org Sun May 3 13:23:37 2009 From: tejas at fedoraproject.org (Tejas Dinkar) Date: Sun, 3 May 2009 13:23:37 +0000 (UTC) Subject: rpms/choqok/devel choqok-0.5-tweetall.patch, NONE, 1.1 choqok.spec, 1.1, 1.2 Message-ID: <20090503132337.E5D98700DA@cvs1.fedora.phx.redhat.com> Author: tejas Update of /cvs/pkgs/rpms/choqok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12819 Modified Files: choqok.spec Added Files: choqok-0.5-tweetall.patch Log Message: Backport of Commit 954645 choqok-0.5-tweetall.patch: --- NEW FILE choqok-0.5-tweetall.patch --- diff --git src/choqok.kcfg src/choqok.kcfg index 742b97e..6d01846 100644 --- src/choqok.kcfg (revision 953420) +++ src/choqok.kcfg (working copy) @@ -44,6 +44,9 @@ true + + false + QSize(280,140) diff --git src/quicktwit.cpp src/quicktwit.cpp index ed31f5c..97b262f 100644 --- src/quicktwit.cpp (revision 953420) +++ src/quicktwit.cpp (working copy) @@ -47,6 +47,9 @@ QuickTwit::QuickTwit( QWidget* parent ): KDialog( parent ) this->resize( Settings::quickTweetSize() ); txtStatus->setFocus( Qt::OtherFocusReason ); + ui.checkAll->setChecked( Settings::quickTweetAll() ); + checkAll( Settings::quickTweetAll() ); + this->setCaption( i18n( "Quick Tweet" ) ); ui.lblCounter->setText( QString::number( MAX_STATUS_SIZE ) ); @@ -65,6 +68,7 @@ QuickTwit::QuickTwit( QWidget* parent ): KDialog( parent ) QuickTwit::~QuickTwit() { + Settings::setQuickTweetAll(ui.checkAll->isChecked()); Settings::setQuickTweetSize( this->size() ); Settings::self()->writeConfig(); kDebug(); diff --git src/settings.kcfgc src/settings.kcfgc index 776bff1..c85b6ef 100644 --- src/settings.kcfgc (revision 953420) +++ src/settings.kcfgc (working copy) @@ -1,5 +1,5 @@ File=choqok.kcfg ClassName=Settings Singleton=true -Mutators=quickTweetSize,notifyType,updateInterval,position,searchWindowSize,searchWindowPosition +Mutators=quickTweetSize,quickTweetAll,notifyType,updateInterval,position,searchWindowSize,searchWindowPosition UseEnumTypes=true Index: choqok.spec =================================================================== RCS file: /cvs/pkgs/rpms/choqok/devel/choqok.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- choqok.spec 10 Apr 2009 02:34:28 -0000 1.1 +++ choqok.spec 3 May 2009 13:23:06 -0000 1.2 @@ -1,12 +1,14 @@ Summary: Choqok KDE Micro-Blogging Client Name: choqok Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: Applications/Internet URL: http://choqok.gnufolks.org/ Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.5Norooz/choqok-0.5.tar.bz2 +Patch0: choqok-0.5-tweetall.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.6 @@ -20,6 +22,7 @@ Choqok currently supports Twitter.com an %prep %setup -q +%patch0 -p0 -b .tweetall %build @@ -50,6 +53,8 @@ rm -rf %{buildroot} %{_kde4_sharedir}/config.kcfg/choqok.kcfg %changelog +* Fri Apr 10 2009 Tejas Dinkar - 0.5-3 +- Added the TweetAll patch, remove this by 0.6 * Fri Mar 27 2009 Tejas Dinkar - 0.5-2 - Added AUTHORS changelog and TODO to doc * Fri Mar 27 2009 Tejas Dinkar - 0.5-1 From than at fedoraproject.org Sun May 3 13:28:51 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 13:28:51 +0000 (UTC) Subject: rpms/kdebase-runtime/F-11 .cvsignore, 1.30, 1.31 kdebase-runtime.spec, 1.110, 1.111 sources, 1.31, 1.32 kdebase-runtime-4.2.2-persistent_notify.patch, 1.1, NONE Message-ID: <20090503132851.7C890700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-runtime/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13907 Modified Files: .cvsignore kdebase-runtime.spec sources Removed Files: kdebase-runtime-4.2.2-persistent_notify.patch Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- .cvsignore 30 Mar 2009 17:48:08 -0000 1.30 +++ .cvsignore 3 May 2009 13:28:20 -0000 1.31 @@ -1 +1,2 @@ kdebase-runtime-4.2.2.tar.bz2 +kdebase-runtime-4.2.3.tar.bz2 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -p -r1.110 -r1.111 --- kdebase-runtime.spec 17 Apr 2009 00:24:55 -0000 1.110 +++ kdebase-runtime.spec 3 May 2009 13:28:20 -0000 1.111 @@ -7,8 +7,8 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -23,7 +23,6 @@ Patch2: kdebase-runtime-4.1.1-kne Patch3: kdebase-runtime-4.1.1-iconthemes-inherit.patch ## Upstream patches -Patch100: kdebase-runtime-4.2.2-persistent_notify.patch #ifarch noarch ## icons now provided by standalone oxygen-icon-theme @@ -128,7 +127,6 @@ BuildArch: noarch %patch3 -p1 -b .iconthemes-inherit # upstream patches -%patch100 -p2 -b .persistent_knotify %build @@ -389,6 +387,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Thu Apr 16 2009 Rex Dieter - 4.2.2-4 - fix persistent systray notifications Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- sources 30 Mar 2009 17:48:08 -0000 1.31 +++ sources 3 May 2009 13:28:20 -0000 1.32 @@ -1 +1 @@ -cff3fbdb98faeec0ae65d8caea7a5b0f kdebase-runtime-4.2.2.tar.bz2 +7ca748e533e3d19f933f9b45f1b1a547 kdebase-runtime-4.2.3.tar.bz2 --- kdebase-runtime-4.2.2-persistent_notify.patch DELETED --- From than at fedoraproject.org Sun May 3 13:32:06 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 13:32:06 +0000 (UTC) Subject: rpms/kdebase/F-11 kdebase-4.2.2-konsole-flowcontrol.patch,1.1,NONE Message-ID: <20090503133206.3579B700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14605 Removed Files: kdebase-4.2.2-konsole-flowcontrol.patch Log Message: 4.2.3 --- kdebase-4.2.2-konsole-flowcontrol.patch DELETED --- From caolanm at fedoraproject.org Sun May 3 14:06:33 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 3 May 2009 14:06:33 +0000 (UTC) Subject: rpms/flute/devel flute.spec,1.4,1.5 Message-ID: <20090503140634.044BA700DA@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/flute/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20198 Modified Files: flute.spec Log Message: post-release tuned for OpenOffice.org report-designer Index: flute.spec =================================================================== RCS file: /cvs/pkgs/rpms/flute/devel/flute.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- flute.spec 9 Mar 2009 10:28:08 -0000 1.4 +++ flute.spec 3 May 2009 14:06:01 -0000 1.5 @@ -2,12 +2,12 @@ %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: flute -Version: 1.3 -Release: 5.20061107jfree%{?dist} +Version: 1.3.0 +Release: 1.OOo31%{?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 +Source0: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}-OOo31.zip URL: http://www.w3.org/Style/CSS/SAC/ BuildRequires: ant, java-devel, jpackage-utils, sac BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,22 +31,22 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n flute-1.3-jfree-20061107 +%setup -q -c find . -name "*.jar" -exec rm -f {} \; +mkdir -p lib build-jar-repository -s -p lib sac %build -cd ant -ant compile javadoc +ant jar 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 +cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif @@ -67,7 +67,10 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name} %changelog -* Mon May 09 2009 Caolan McNamara - 1.3-5.20061107jfree +* Sun May 03 2009 Caolan McNamara - 1.3.0-1.OOo31 +- post-release tuned for OpenOffice.org report-designer + +* Mon Mar 09 2009 Caolan McNamara - 1.3-5.20061107jfree - better adherence to versioning guidelines * Tue Feb 24 2009 Fedora Release Engineering - 1.3-5 From tejas at fedoraproject.org Sun May 3 16:23:59 2009 From: tejas at fedoraproject.org (Tejas Dinkar) Date: Sun, 3 May 2009 16:23:59 +0000 (UTC) Subject: rpms/choqok/F-11 choqok-0.5-tweetall.patch, NONE, 1.1 choqok.spec, 1.1, 1.2 Message-ID: <20090503162400.11E1A700DA@cvs1.fedora.phx.redhat.com> Author: tejas Update of /cvs/pkgs/rpms/choqok/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10627/F-11 Modified Files: choqok.spec Added Files: choqok-0.5-tweetall.patch Log Message: Added The Patch to Stable Versions as Well choqok-0.5-tweetall.patch: --- NEW FILE choqok-0.5-tweetall.patch --- diff --git src/choqok.kcfg src/choqok.kcfg index 742b97e..6d01846 100644 --- src/choqok.kcfg (revision 953420) +++ src/choqok.kcfg (working copy) @@ -44,6 +44,9 @@ true + + false + QSize(280,140) diff --git src/quicktwit.cpp src/quicktwit.cpp index ed31f5c..97b262f 100644 --- src/quicktwit.cpp (revision 953420) +++ src/quicktwit.cpp (working copy) @@ -47,6 +47,9 @@ QuickTwit::QuickTwit( QWidget* parent ): KDialog( parent ) this->resize( Settings::quickTweetSize() ); txtStatus->setFocus( Qt::OtherFocusReason ); + ui.checkAll->setChecked( Settings::quickTweetAll() ); + checkAll( Settings::quickTweetAll() ); + this->setCaption( i18n( "Quick Tweet" ) ); ui.lblCounter->setText( QString::number( MAX_STATUS_SIZE ) ); @@ -65,6 +68,7 @@ QuickTwit::QuickTwit( QWidget* parent ): KDialog( parent ) QuickTwit::~QuickTwit() { + Settings::setQuickTweetAll(ui.checkAll->isChecked()); Settings::setQuickTweetSize( this->size() ); Settings::self()->writeConfig(); kDebug(); diff --git src/settings.kcfgc src/settings.kcfgc index 776bff1..c85b6ef 100644 --- src/settings.kcfgc (revision 953420) +++ src/settings.kcfgc (working copy) @@ -1,5 +1,5 @@ File=choqok.kcfg ClassName=Settings Singleton=true -Mutators=quickTweetSize,notifyType,updateInterval,position,searchWindowSize,searchWindowPosition +Mutators=quickTweetSize,quickTweetAll,notifyType,updateInterval,position,searchWindowSize,searchWindowPosition UseEnumTypes=true Index: choqok.spec =================================================================== RCS file: /cvs/pkgs/rpms/choqok/F-11/choqok.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- choqok.spec 10 Apr 2009 02:38:37 -0000 1.1 +++ choqok.spec 3 May 2009 16:23:28 -0000 1.2 @@ -1,12 +1,14 @@ Summary: Choqok KDE Micro-Blogging Client Name: choqok Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: Applications/Internet URL: http://choqok.gnufolks.org/ Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.5Norooz/choqok-0.5.tar.bz2 +Patch0: choqok-0.5-tweetall.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.6 @@ -20,6 +22,7 @@ Choqok currently supports Twitter.com an %prep %setup -q +%patch0 -p0 -b .tweetall %build @@ -50,6 +53,8 @@ rm -rf %{buildroot} %{_kde4_sharedir}/config.kcfg/choqok.kcfg %changelog +* Fri Apr 10 2009 Tejas Dinkar - 0.5-3 +- Added the TweetAll patch, remove this by 0.6 * Fri Mar 27 2009 Tejas Dinkar - 0.5-2 - Added AUTHORS changelog and TODO to doc * Fri Mar 27 2009 Tejas Dinkar - 0.5-1 From tejas at fedoraproject.org Sun May 3 16:23:59 2009 From: tejas at fedoraproject.org (Tejas Dinkar) Date: Sun, 3 May 2009 16:23:59 +0000 (UTC) Subject: rpms/choqok/F-10 choqok-0.5-tweetall.patch, NONE, 1.1 choqok.spec, 1.1, 1.2 Message-ID: <20090503162400.18DBA70131@cvs1.fedora.phx.redhat.com> Author: tejas Update of /cvs/pkgs/rpms/choqok/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10627/F-10 Modified Files: choqok.spec Added Files: choqok-0.5-tweetall.patch Log Message: Added The Patch to Stable Versions as Well choqok-0.5-tweetall.patch: --- NEW FILE choqok-0.5-tweetall.patch --- diff --git src/choqok.kcfg src/choqok.kcfg index 742b97e..6d01846 100644 --- src/choqok.kcfg (revision 953420) +++ src/choqok.kcfg (working copy) @@ -44,6 +44,9 @@ true + + false + QSize(280,140) diff --git src/quicktwit.cpp src/quicktwit.cpp index ed31f5c..97b262f 100644 --- src/quicktwit.cpp (revision 953420) +++ src/quicktwit.cpp (working copy) @@ -47,6 +47,9 @@ QuickTwit::QuickTwit( QWidget* parent ): KDialog( parent ) this->resize( Settings::quickTweetSize() ); txtStatus->setFocus( Qt::OtherFocusReason ); + ui.checkAll->setChecked( Settings::quickTweetAll() ); + checkAll( Settings::quickTweetAll() ); + this->setCaption( i18n( "Quick Tweet" ) ); ui.lblCounter->setText( QString::number( MAX_STATUS_SIZE ) ); @@ -65,6 +68,7 @@ QuickTwit::QuickTwit( QWidget* parent ): KDialog( parent ) QuickTwit::~QuickTwit() { + Settings::setQuickTweetAll(ui.checkAll->isChecked()); Settings::setQuickTweetSize( this->size() ); Settings::self()->writeConfig(); kDebug(); diff --git src/settings.kcfgc src/settings.kcfgc index 776bff1..c85b6ef 100644 --- src/settings.kcfgc (revision 953420) +++ src/settings.kcfgc (working copy) @@ -1,5 +1,5 @@ File=choqok.kcfg ClassName=Settings Singleton=true -Mutators=quickTweetSize,notifyType,updateInterval,position,searchWindowSize,searchWindowPosition +Mutators=quickTweetSize,quickTweetAll,notifyType,updateInterval,position,searchWindowSize,searchWindowPosition UseEnumTypes=true Index: choqok.spec =================================================================== RCS file: /cvs/pkgs/rpms/choqok/F-10/choqok.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- choqok.spec 10 Apr 2009 02:38:37 -0000 1.1 +++ choqok.spec 3 May 2009 16:23:28 -0000 1.2 @@ -1,12 +1,14 @@ Summary: Choqok KDE Micro-Blogging Client Name: choqok Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: Applications/Internet URL: http://choqok.gnufolks.org/ Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.5Norooz/choqok-0.5.tar.bz2 +Patch0: choqok-0.5-tweetall.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.6 @@ -20,6 +22,7 @@ Choqok currently supports Twitter.com an %prep %setup -q +%patch0 -p0 -b .tweetall %build @@ -50,6 +53,8 @@ rm -rf %{buildroot} %{_kde4_sharedir}/config.kcfg/choqok.kcfg %changelog +* Fri Apr 10 2009 Tejas Dinkar - 0.5-3 +- Added the TweetAll patch, remove this by 0.6 * Fri Mar 27 2009 Tejas Dinkar - 0.5-2 - Added AUTHORS changelog and TODO to doc * Fri Mar 27 2009 Tejas Dinkar - 0.5-1 From tejas at fedoraproject.org Sun May 3 16:23:59 2009 From: tejas at fedoraproject.org (Tejas Dinkar) Date: Sun, 3 May 2009 16:23:59 +0000 (UTC) Subject: rpms/choqok/F-9 choqok-0.5-tweetall.patch, NONE, 1.1 choqok.spec, 1.1, 1.2 Message-ID: <20090503162400.225A370139@cvs1.fedora.phx.redhat.com> Author: tejas Update of /cvs/pkgs/rpms/choqok/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10627/F-9 Modified Files: choqok.spec Added Files: choqok-0.5-tweetall.patch Log Message: Added The Patch to Stable Versions as Well choqok-0.5-tweetall.patch: --- NEW FILE choqok-0.5-tweetall.patch --- diff --git src/choqok.kcfg src/choqok.kcfg index 742b97e..6d01846 100644 --- src/choqok.kcfg (revision 953420) +++ src/choqok.kcfg (working copy) @@ -44,6 +44,9 @@ true + + false + QSize(280,140) diff --git src/quicktwit.cpp src/quicktwit.cpp index ed31f5c..97b262f 100644 --- src/quicktwit.cpp (revision 953420) +++ src/quicktwit.cpp (working copy) @@ -47,6 +47,9 @@ QuickTwit::QuickTwit( QWidget* parent ): KDialog( parent ) this->resize( Settings::quickTweetSize() ); txtStatus->setFocus( Qt::OtherFocusReason ); + ui.checkAll->setChecked( Settings::quickTweetAll() ); + checkAll( Settings::quickTweetAll() ); + this->setCaption( i18n( "Quick Tweet" ) ); ui.lblCounter->setText( QString::number( MAX_STATUS_SIZE ) ); @@ -65,6 +68,7 @@ QuickTwit::QuickTwit( QWidget* parent ): KDialog( parent ) QuickTwit::~QuickTwit() { + Settings::setQuickTweetAll(ui.checkAll->isChecked()); Settings::setQuickTweetSize( this->size() ); Settings::self()->writeConfig(); kDebug(); diff --git src/settings.kcfgc src/settings.kcfgc index 776bff1..c85b6ef 100644 --- src/settings.kcfgc (revision 953420) +++ src/settings.kcfgc (working copy) @@ -1,5 +1,5 @@ File=choqok.kcfg ClassName=Settings Singleton=true -Mutators=quickTweetSize,notifyType,updateInterval,position,searchWindowSize,searchWindowPosition +Mutators=quickTweetSize,quickTweetAll,notifyType,updateInterval,position,searchWindowSize,searchWindowPosition UseEnumTypes=true Index: choqok.spec =================================================================== RCS file: /cvs/pkgs/rpms/choqok/F-9/choqok.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- choqok.spec 10 Apr 2009 02:38:37 -0000 1.1 +++ choqok.spec 3 May 2009 16:23:29 -0000 1.2 @@ -1,12 +1,14 @@ Summary: Choqok KDE Micro-Blogging Client Name: choqok Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: Applications/Internet URL: http://choqok.gnufolks.org/ Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.5Norooz/choqok-0.5.tar.bz2 +Patch0: choqok-0.5-tweetall.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.6 @@ -20,6 +22,7 @@ Choqok currently supports Twitter.com an %prep %setup -q +%patch0 -p0 -b .tweetall %build @@ -50,6 +53,8 @@ rm -rf %{buildroot} %{_kde4_sharedir}/config.kcfg/choqok.kcfg %changelog +* Fri Apr 10 2009 Tejas Dinkar - 0.5-3 +- Added the TweetAll patch, remove this by 0.6 * Fri Mar 27 2009 Tejas Dinkar - 0.5-2 - Added AUTHORS changelog and TODO to doc * Fri Mar 27 2009 Tejas Dinkar - 0.5-1 From remi at fedoraproject.org Sun May 3 16:37:09 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sun, 3 May 2009 16:37:09 +0000 (UTC) Subject: rpms/php-pear-PHPUnit/F-11 php-pear-PHPUnit.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <20090503163709.4E950700DA@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-PHPUnit/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13488 Modified Files: php-pear-PHPUnit.spec sources Log Message: update to 3.3.16 Index: php-pear-PHPUnit.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/F-11/php-pear-PHPUnit.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- php-pear-PHPUnit.spec 26 Feb 2009 22:05:04 -0000 1.15 +++ php-pear-PHPUnit.spec 3 May 2009 16:36:38 -0000 1.16 @@ -1,10 +1,10 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%define pear_name PHPUnit -%define channel pear.phpunit.de +%global pear_name PHPUnit +%global channel pear.phpunit.de Name: php-pear-PHPUnit -Version: 3.3.4 -Release: 2%{?dist} +Version: 3.3.16 +Release: 1%{?dist} Summary: Regression testing framework for unit tests Group: Development/Libraries @@ -14,19 +14,21 @@ Source0: http://pear.phpunit.de/g BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php-pear >= 1:1.4.9-1.2 -BuildRequires: php-channel-phpunit -Requires: php >= 5.1.4 php-pear(PEAR) >= 1.5.0 -Requires: php-channel-phpunit php-xml - -Requires(hint): php-pear(Image_GraphViz) >= 1.2.1 -Requires(hint): php-pear(Log) -#Requires(hint): php-pear(Testing_Selenium) >= 0.2.0 -Requires(hint): php-json -Requires(hint): php-pecl(Xdebug) >= 2.0.0 +BuildRequires: php-pear(PEAR) >= 1.7.1 +BuildRequires: php-channel(pear.phpunit.de) + +Requires: php-common >= 5.1.4 php-xml +Requires: php-pear(PEAR) >= 1.7.1 +Requires: php-channel(pear.phpunit.de) Requires(post): %{__pear} Requires(postun): %{__pear} +# Optionnal dependencies +Requires: php-pear(Image_GraphViz) >= 1.2.1 +Requires: php-pear(Log) +Requires: php-json php-pdo +Requires: php-pecl(Xdebug) >= 2.0.0 + Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description @@ -39,8 +41,8 @@ for the creation, execution and analysis %prep %setup -qc -[ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +# package.xml is V2 +mv package.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} @@ -54,7 +56,7 @@ cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir # Install Package -%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml +%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Move documentation mkdir -p docdir @@ -65,7 +67,7 @@ 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} +install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean @@ -80,7 +82,7 @@ if [ $1 -gt 1 ] ; then fi %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then @@ -92,13 +94,18 @@ fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/%{pear_name}/* -%{pear_xmldir}/%{pear_name}.xml +%{pear_xmldir}/%{name}.xml %{pear_testdir}/%{pear_name} %{pear_phpdir}/%{pear_name} %{_bindir}/phpunit %changelog +* Sat May 02 2009 Remi Collet - 3.3.16-1 +- Upstream sync +- Fix requires (remove hint) and raise PEAR version to 1.7.1 +- rename %%{pear_name}.xml to %%{name}.xml + * Thu Feb 26 2009 Fedora Release Engineering - 3.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/F-11/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 8 Nov 2008 18:36:30 -0000 1.12 +++ sources 3 May 2009 16:36:38 -0000 1.13 @@ -1 +1 @@ -973eb6ba8b5158ca597ce10b7b511216 PHPUnit-3.3.4.tgz +1bafa52c00d773c84931d43e37532729 PHPUnit-3.3.16.tgz From mtasaka at fedoraproject.org Sun May 3 16:41:10 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 3 May 2009 16:41:10 +0000 (UTC) Subject: rpms/jd/F-10 .cvsignore, 1.363, 1.364 jd.spec, 1.421, 1.422 sources, 1.364, 1.365 Message-ID: <20090503164110.B981A700DA@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14317/F-10 Modified Files: .cvsignore jd.spec sources Log Message: Update to the latest Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v retrieving revision 1.363 retrieving revision 1.364 diff -u -p -r1.363 -r1.364 --- .cvsignore 29 Apr 2009 14:18:28 -0000 1.363 +++ .cvsignore 3 May 2009 16:40:39 -0000 1.364 @@ -1 +1 @@ -jd-2.4.0-beta090429.tgz +jd-2.4.0-svn2803_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v retrieving revision 1.421 retrieving revision 1.422 diff -u -p -r1.421 -r1.422 --- jd.spec 29 Apr 2009 14:18:29 -0000 1.421 +++ jd.spec 3 May 2009 16:40:39 -0000 1.422 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.4.0 -%define strtag beta090429 +%define strtag svn2803_trunk %define repoid 39686 # Define this if this is pre-version %define pre_release 1 @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 2 +%define vendor_rel 3 %define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary @@ -138,6 +138,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %{icondir}/%{name}.png %changelog +* Mon Mar 4 2009 Mamoru Tasaka +- rev 2803 + * Wed Apr 29 2009 Mamoru Tasaka - 2.4.0-0.2.beta090429 - 2.4.0 beta 090429 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/sources,v retrieving revision 1.364 retrieving revision 1.365 diff -u -p -r1.364 -r1.365 --- sources 29 Apr 2009 14:18:29 -0000 1.364 +++ sources 3 May 2009 16:40:39 -0000 1.365 @@ -1 +1 @@ -b68b190ac919f9c307c27fa3ccf47297 jd-2.4.0-beta090429.tgz +7be090c9f16174cdca21aaa981792849 jd-2.4.0-svn2803_trunk.tgz From mtasaka at fedoraproject.org Sun May 3 16:41:11 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 3 May 2009 16:41:11 +0000 (UTC) Subject: rpms/jd/F-11 .cvsignore, 1.356, 1.357 jd.spec, 1.416, 1.417 sources, 1.357, 1.358 Message-ID: <20090503164111.125A9700DA@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14317/F-11 Modified Files: .cvsignore jd.spec sources Log Message: Update to the latest Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v retrieving revision 1.356 retrieving revision 1.357 diff -u -p -r1.356 -r1.357 --- .cvsignore 29 Apr 2009 14:18:29 -0000 1.356 +++ .cvsignore 3 May 2009 16:40:40 -0000 1.357 @@ -1 +1 @@ -jd-2.4.0-beta090429.tgz +jd-2.4.0-svn2803_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v retrieving revision 1.416 retrieving revision 1.417 diff -u -p -r1.416 -r1.417 --- jd.spec 29 Apr 2009 14:18:29 -0000 1.416 +++ jd.spec 3 May 2009 16:40:40 -0000 1.417 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.4.0 -%define strtag beta090429 +%define strtag svn2803_trunk %define repoid 39686 # Define this if this is pre-version %define pre_release 1 @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 2 +%define vendor_rel 3 %define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary @@ -138,6 +138,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %{icondir}/%{name}.png %changelog +* Mon Mar 4 2009 Mamoru Tasaka +- rev 2803 + * Wed Apr 29 2009 Mamoru Tasaka - 2.4.0-0.2.beta090429 - 2.4.0 beta 090429 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-11/sources,v retrieving revision 1.357 retrieving revision 1.358 diff -u -p -r1.357 -r1.358 --- sources 29 Apr 2009 14:18:29 -0000 1.357 +++ sources 3 May 2009 16:40:40 -0000 1.358 @@ -1 +1 @@ -b68b190ac919f9c307c27fa3ccf47297 jd-2.4.0-beta090429.tgz +7be090c9f16174cdca21aaa981792849 jd-2.4.0-svn2803_trunk.tgz From mtasaka at fedoraproject.org Sun May 3 16:41:11 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 3 May 2009 16:41:11 +0000 (UTC) Subject: rpms/jd/F-9 .cvsignore, 1.363, 1.364 jd.spec, 1.412, 1.413 sources, 1.364, 1.365 Message-ID: <20090503164111.EF14D700DA@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14317/F-9 Modified Files: .cvsignore jd.spec sources Log Message: Update to the latest Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.363 retrieving revision 1.364 diff -u -p -r1.363 -r1.364 --- .cvsignore 29 Apr 2009 14:18:30 -0000 1.363 +++ .cvsignore 3 May 2009 16:40:41 -0000 1.364 @@ -1 +1 @@ -jd-2.4.0-beta090429.tgz +jd-2.4.0-svn2803_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.412 retrieving revision 1.413 diff -u -p -r1.412 -r1.413 --- jd.spec 29 Apr 2009 14:18:30 -0000 1.412 +++ jd.spec 3 May 2009 16:40:41 -0000 1.413 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.4.0 -%define strtag beta090429 +%define strtag svn2803_trunk %define repoid 39686 # Define this if this is pre-version %define pre_release 1 @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 2 +%define vendor_rel 3 %define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary @@ -138,6 +138,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %{icondir}/%{name}.png %changelog +* Mon Mar 4 2009 Mamoru Tasaka +- rev 2803 + * Wed Apr 29 2009 Mamoru Tasaka - 2.4.0-0.2.beta090429 - 2.4.0 beta 090429 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.364 retrieving revision 1.365 diff -u -p -r1.364 -r1.365 --- sources 29 Apr 2009 14:18:30 -0000 1.364 +++ sources 3 May 2009 16:40:41 -0000 1.365 @@ -1 +1 @@ -b68b190ac919f9c307c27fa3ccf47297 jd-2.4.0-beta090429.tgz +7be090c9f16174cdca21aaa981792849 jd-2.4.0-svn2803_trunk.tgz From mtasaka at fedoraproject.org Sun May 3 16:41:12 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 3 May 2009 16:41:12 +0000 (UTC) Subject: rpms/jd/devel .cvsignore, 1.353, 1.354 jd.spec, 1.413, 1.414 sources, 1.354, 1.355 Message-ID: <20090503164112.0ECC4700DA@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14317/devel Modified Files: .cvsignore jd.spec sources Log Message: Update to the latest Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.353 retrieving revision 1.354 diff -u -p -r1.353 -r1.354 --- .cvsignore 29 Apr 2009 14:18:30 -0000 1.353 +++ .cvsignore 3 May 2009 16:40:41 -0000 1.354 @@ -1 +1 @@ -jd-2.4.0-beta090429.tgz +jd-2.4.0-svn2803_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.413 retrieving revision 1.414 diff -u -p -r1.413 -r1.414 --- jd.spec 29 Apr 2009 14:18:30 -0000 1.413 +++ jd.spec 3 May 2009 16:40:41 -0000 1.414 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.4.0 -%define strtag beta090429 +%define strtag svn2803_trunk %define repoid 39686 # Define this if this is pre-version %define pre_release 1 @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 2 +%define vendor_rel 3 %define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary @@ -138,6 +138,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %{icondir}/%{name}.png %changelog +* Mon Mar 4 2009 Mamoru Tasaka +- rev 2803 + * Wed Apr 29 2009 Mamoru Tasaka - 2.4.0-0.2.beta090429 - 2.4.0 beta 090429 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.354 retrieving revision 1.355 diff -u -p -r1.354 -r1.355 --- sources 29 Apr 2009 14:18:30 -0000 1.354 +++ sources 3 May 2009 16:40:41 -0000 1.355 @@ -1 +1 @@ -b68b190ac919f9c307c27fa3ccf47297 jd-2.4.0-beta090429.tgz +7be090c9f16174cdca21aaa981792849 jd-2.4.0-svn2803_trunk.tgz From remi at fedoraproject.org Sun May 3 16:45:45 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sun, 3 May 2009 16:45:45 +0000 (UTC) Subject: rpms/php-pear-PHPUnit/F-10 php-pear-PHPUnit.spec, 1.14, 1.15 sources, 1.12, 1.13 Message-ID: <20090503164545.2ED0F700DA@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-PHPUnit/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15176 Modified Files: php-pear-PHPUnit.spec sources Log Message: update to 3.3.16 Index: php-pear-PHPUnit.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/F-10/php-pear-PHPUnit.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- php-pear-PHPUnit.spec 8 Nov 2008 18:36:30 -0000 1.14 +++ php-pear-PHPUnit.spec 3 May 2009 16:45:14 -0000 1.15 @@ -1,9 +1,9 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%define pear_name PHPUnit -%define channel pear.phpunit.de +%global pear_name PHPUnit +%global channel pear.phpunit.de Name: php-pear-PHPUnit -Version: 3.3.4 +Version: 3.3.16 Release: 1%{?dist} Summary: Regression testing framework for unit tests @@ -14,19 +14,21 @@ Source0: http://pear.phpunit.de/g BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php-pear >= 1:1.4.9-1.2 -BuildRequires: php-channel-phpunit -Requires: php >= 5.1.4 php-pear(PEAR) >= 1.5.0 -Requires: php-channel-phpunit php-xml - -Requires(hint): php-pear(Image_GraphViz) >= 1.2.1 -Requires(hint): php-pear(Log) -#Requires(hint): php-pear(Testing_Selenium) >= 0.2.0 -Requires(hint): php-json -Requires(hint): php-pecl(Xdebug) >= 2.0.0 +BuildRequires: php-pear(PEAR) >= 1.7.1 +BuildRequires: php-channel(pear.phpunit.de) + +Requires: php-common >= 5.1.4 php-xml +Requires: php-pear(PEAR) >= 1.7.1 +Requires: php-channel(pear.phpunit.de) Requires(post): %{__pear} Requires(postun): %{__pear} +# Optionnal dependencies +Requires: php-pear(Image_GraphViz) >= 1.2.1 +Requires: php-pear(Log) +Requires: php-json php-pdo +Requires: php-pecl(Xdebug) >= 2.0.0 + Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description @@ -39,8 +41,8 @@ for the creation, execution and analysis %prep %setup -qc -[ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +# package.xml is V2 +mv package.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} @@ -54,7 +56,7 @@ cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir # Install Package -%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml +%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Move documentation mkdir -p docdir @@ -65,7 +67,7 @@ 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} +install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean @@ -80,7 +82,7 @@ if [ $1 -gt 1 ] ; then fi %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then @@ -92,13 +94,21 @@ fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/%{pear_name}/* -%{pear_xmldir}/%{pear_name}.xml +%{pear_xmldir}/%{name}.xml %{pear_testdir}/%{pear_name} %{pear_phpdir}/%{pear_name} %{_bindir}/phpunit %changelog +* Sat May 02 2009 Remi Collet - 3.3.16-1 +- Upstream sync +- Fix requires (remove hint) and raise PEAR version to 1.7.1 +- rename %%{pear_name}.xml to %%{name}.xml + +* Thu Feb 26 2009 Fedora Release Engineering - 3.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Nov 8 2008 Christopher Stone 3.3.4-1 - Upstream sync Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/F-10/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 8 Nov 2008 18:36:30 -0000 1.12 +++ sources 3 May 2009 16:45:14 -0000 1.13 @@ -1 +1 @@ -973eb6ba8b5158ca597ce10b7b511216 PHPUnit-3.3.4.tgz +1bafa52c00d773c84931d43e37532729 PHPUnit-3.3.16.tgz From mtasaka at fedoraproject.org Sun May 3 16:46:44 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 3 May 2009 16:46:44 +0000 (UTC) Subject: rpms/jd/F-10 jd.spec,1.422,1.423 Message-ID: <20090503164644.18872700DA@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15371/F-10 Modified Files: jd.spec Log Message: orz... Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v retrieving revision 1.422 retrieving revision 1.423 diff -u -p -r1.422 -r1.423 --- jd.spec 3 May 2009 16:40:39 -0000 1.422 +++ jd.spec 3 May 2009 16:46:13 -0000 1.423 @@ -138,7 +138,7 @@ gtk-update-icon-cache %{_datadir}/icons/ %{icondir}/%{name}.png %changelog -* Mon Mar 4 2009 Mamoru Tasaka +* Mon May 4 2009 Mamoru Tasaka - rev 2803 * Wed Apr 29 2009 Mamoru Tasaka - 2.4.0-0.2.beta090429 From mtasaka at fedoraproject.org Sun May 3 16:46:44 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 3 May 2009 16:46:44 +0000 (UTC) Subject: rpms/jd/F-11 jd.spec,1.417,1.418 Message-ID: <20090503164644.50421700DA@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15371/F-11 Modified Files: jd.spec Log Message: orz... Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v retrieving revision 1.417 retrieving revision 1.418 diff -u -p -r1.417 -r1.418 --- jd.spec 3 May 2009 16:40:40 -0000 1.417 +++ jd.spec 3 May 2009 16:46:14 -0000 1.418 @@ -138,7 +138,7 @@ gtk-update-icon-cache %{_datadir}/icons/ %{icondir}/%{name}.png %changelog -* Mon Mar 4 2009 Mamoru Tasaka +* Mon May 4 2009 Mamoru Tasaka - rev 2803 * Wed Apr 29 2009 Mamoru Tasaka - 2.4.0-0.2.beta090429 From mtasaka at fedoraproject.org Sun May 3 16:46:44 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 3 May 2009 16:46:44 +0000 (UTC) Subject: rpms/jd/F-9 jd.spec,1.413,1.414 Message-ID: <20090503164644.A179C700DA@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15371/F-9 Modified Files: jd.spec Log Message: orz... Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.413 retrieving revision 1.414 diff -u -p -r1.413 -r1.414 --- jd.spec 3 May 2009 16:40:41 -0000 1.413 +++ jd.spec 3 May 2009 16:46:14 -0000 1.414 @@ -138,7 +138,7 @@ gtk-update-icon-cache %{_datadir}/icons/ %{icondir}/%{name}.png %changelog -* Mon Mar 4 2009 Mamoru Tasaka +* Mon May 4 2009 Mamoru Tasaka - rev 2803 * Wed Apr 29 2009 Mamoru Tasaka - 2.4.0-0.2.beta090429 From mtasaka at fedoraproject.org Sun May 3 16:46:44 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 3 May 2009 16:46:44 +0000 (UTC) Subject: rpms/jd/devel jd.spec,1.414,1.415 Message-ID: <20090503164644.E22D8700DA@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15371/devel Modified Files: jd.spec Log Message: orz... Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.414 retrieving revision 1.415 diff -u -p -r1.414 -r1.415 --- jd.spec 3 May 2009 16:40:41 -0000 1.414 +++ jd.spec 3 May 2009 16:46:14 -0000 1.415 @@ -138,7 +138,7 @@ gtk-update-icon-cache %{_datadir}/icons/ %{icondir}/%{name}.png %changelog -* Mon Mar 4 2009 Mamoru Tasaka +* Mon May 4 2009 Mamoru Tasaka - rev 2803 * Wed Apr 29 2009 Mamoru Tasaka - 2.4.0-0.2.beta090429 From remi at fedoraproject.org Sun May 3 16:51:38 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sun, 3 May 2009 16:51:38 +0000 (UTC) Subject: rpms/php-pear-PHPUnit/F-9 php-pear-PHPUnit.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <20090503165138.330A9700DA@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-PHPUnit/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16723 Modified Files: php-pear-PHPUnit.spec sources Log Message: update to 3.3.16 Index: php-pear-PHPUnit.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/F-9/php-pear-PHPUnit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- php-pear-PHPUnit.spec 9 Oct 2008 16:26:57 -0000 1.11 +++ php-pear-PHPUnit.spec 3 May 2009 16:51:07 -0000 1.12 @@ -1,9 +1,9 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%define pear_name PHPUnit -%define channel pear.phpunit.de +%global pear_name PHPUnit +%global channel pear.phpunit.de Name: php-pear-PHPUnit -Version: 3.2.21 +Version: 3.3.16 Release: 1%{?dist} Summary: Regression testing framework for unit tests @@ -14,22 +14,22 @@ Source0: http://pear.phpunit.de/g BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php-pear >= 1:1.4.9-1.2 -BuildRequires: php-channel-phpunit -Requires: php >= 5.1.4 php-pear(PEAR) >= 1.5.0 -Requires: php-channel-phpunit php-xml - -Requires(hint): php-pear(Image_GraphViz) >= 1.2.1 -Requires(hint): php-pear(Log) -#Requires(hint): php-pear(Testing_Selenium) >= 0.2.0 -Requires(hint): php-json -Requires(hint): php-pecl(Xdebug) >= 2.0.0 +BuildRequires: php-pear(PEAR) >= 1.7.1 +BuildRequires: php-channel(pear.phpunit.de) + +Requires: php-common >= 5.1.4 php-xml +Requires: php-pear(PEAR) >= 1.7.1 +Requires: php-channel(pear.phpunit.de) Requires(post): %{__pear} Requires(postun): %{__pear} +# Optionnal dependencies +Requires: php-pear(Image_GraphViz) >= 1.2.1 +Requires: php-pear(Log) +Requires: php-json php-pdo +Requires: php-pecl(Xdebug) >= 2.0.0 + Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear(%{pear_name}2) < 3.0.0 -Provides: php-pear(%{pear_name}2) = %{version} %description PHPUnit is a family of PEAR packages that supports the development of @@ -41,8 +41,8 @@ for the creation, execution and analysis %prep %setup -qc -[ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +# package.xml is V2 +mv package.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} @@ -56,7 +56,7 @@ cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir # Install Package -%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml +%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Move documentation mkdir -p docdir @@ -67,7 +67,7 @@ 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} +install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean @@ -82,7 +82,7 @@ if [ $1 -gt 1 ] ; then fi %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then @@ -94,13 +94,31 @@ fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/%{pear_name}/* -%{pear_xmldir}/%{pear_name}.xml +%{pear_xmldir}/%{name}.xml %{pear_testdir}/%{pear_name} %{pear_phpdir}/%{pear_name} %{_bindir}/phpunit %changelog +* Sat May 02 2009 Remi Collet - 3.3.16-1 +- Upstream sync +- Fix requires (remove hint) and raise PEAR version to 1.7.1 +- rename %%{pear_name}.xml to %%{name}.xml + +* Thu Feb 26 2009 Fedora Release Engineering - 3.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 8 2008 Christopher Stone 3.3.4-1 +- Upstream sync + +* Thu Oct 23 2008 Christopher Stone 3.3.2-1 +- Upstream sync +- Remove no longer needed Obsolete/Provides + +* Thu Oct 09 2008 Christopher Stone 3.3.1-1 +- Upstream sync + * Thu Oct 09 2008 Christopher Stone 3.2.21-1 - Upstream sync - Add php-xml to Requires (bz #464758) Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHPUnit/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 9 Oct 2008 16:23:53 -0000 1.9 +++ sources 3 May 2009 16:51:07 -0000 1.10 @@ -1 +1 @@ -183b09907e341006e549476efaa18442 PHPUnit-3.2.21.tgz +1bafa52c00d773c84931d43e37532729 PHPUnit-3.3.16.tgz From cheekyboinc at fedoraproject.org Sun May 3 17:22:31 2009 From: cheekyboinc at fedoraproject.org (Stefan Posdzich) Date: Sun, 3 May 2009 17:22:31 +0000 (UTC) Subject: rpms/maxr/devel .cvsignore, 1.2, 1.3 maxr.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090503172231.8F544700DA@cvs1.fedora.phx.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/maxr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21893 Modified Files: .cvsignore maxr.spec sources Log Message: New Upstream Release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/maxr/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 20 Feb 2009 14:43:18 -0000 1.2 +++ .cvsignore 3 May 2009 17:22:00 -0000 1.3 @@ -1 +1 @@ -maxr-0.2.4.tar.gz +maxr-0.2.5.tar.gz Index: maxr.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxr/devel/maxr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- maxr.spec 25 Feb 2009 23:55:17 -0000 1.2 +++ maxr.spec 3 May 2009 17:22:00 -0000 1.3 @@ -1,6 +1,6 @@ Name: maxr -Version: 0.2.4 -Release: 3%{?dist} +Version: 0.2.5 +Release: 1%{?dist} Summary: A classic turn-based strategy game Group: Amusements/Games @@ -28,15 +28,20 @@ Gold, which is used to purchase upgrades turnbased strategy with battle chess character. - %prep %setup -q # Needed because of this rpmlint warning "W: wrong-file-end-of-line-encoding" sed -i 's/\r//' CHANGELOG # Convert everything to UTF-8 +# COPYING.README iconv -f iso-8859-1 -t utf-8 -o COPYING.README.utf8 COPYING.README touch -c -r COPYING.README COPYING.README.utf8 mv -f COPYING.README.utf8 COPYING.README +# ABOUT +iconv -f iso-8859-1 -t utf-8 -o ABOUT.utf8 ABOUT +touch -c -r ABOUT ABOUT.utf8 +mv -f ABOUT.utf8 ABOUT + %build %configure @@ -84,6 +89,9 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun May 03 2009 Stefan Posdzich - 0.2.5-1 +- New Upstream Release + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/maxr/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 20 Feb 2009 14:43:18 -0000 1.2 +++ sources 3 May 2009 17:22:00 -0000 1.3 @@ -1 +1 @@ -e9ff4a514f08579283e55cfdedff171b maxr-0.2.4.tar.gz +a1425820ac15aeea4089fc6b045cf588 maxr-0.2.5.tar.gz From hadess at fedoraproject.org Sun May 3 17:28:06 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Sun, 3 May 2009 17:28:06 +0000 (UTC) Subject: rpms/obexd/F-11 .cvsignore, 1.8, 1.9 obexd.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <20090503172806.ABC1E700DA@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/obexd/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23591 Modified Files: .cvsignore obexd.spec sources Log Message: * Sun May 03 2009 Bastien Nocera 0.12-1 - Update to 0.12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/obexd/F-11/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 25 Apr 2009 12:54:30 -0000 1.8 +++ .cvsignore 3 May 2009 17:27:36 -0000 1.9 @@ -1 +1 @@ -obexd-0.11.tar.gz +obexd-0.12.tar.gz Index: obexd.spec =================================================================== RCS file: /cvs/pkgs/rpms/obexd/F-11/obexd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- obexd.spec 25 Apr 2009 12:54:31 -0000 1.8 +++ obexd.spec 3 May 2009 17:27:36 -0000 1.9 @@ -1,5 +1,5 @@ Name: obexd -Version: 0.11 +Version: 0.12 Release: 1%{?dist} Summary: D-Bus service for Obex Client access @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dbus-1/services/obex-client.service %changelog +* Sun May 03 2009 Bastien Nocera 0.12-1 +- Update to 0.12 + * Sat Apr 25 2009 Bastien Nocera 0.11-1 - Update to 0.11 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/obexd/F-11/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 25 Apr 2009 12:54:31 -0000 1.8 +++ sources 3 May 2009 17:27:36 -0000 1.9 @@ -1 +1 @@ -15cc666cd60505d8522a8206dce563dd obexd-0.11.tar.gz +a6ba1aeeb7f64075e57ea6ee696ccc68 obexd-0.12.tar.gz From wtogami at fedoraproject.org Sun May 3 17:42:23 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Sun, 3 May 2009 17:42:23 +0000 (UTC) Subject: rpms/xsane/F-11 xsane.spec,1.68,1.69 Message-ID: <20090503174223.D9649700DA@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/xsane/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25661 Modified Files: xsane.spec Log Message: rebuild to make it work (gcc miscompile?) (Without rebuild, it fails to start with my genesys driver Canoscan LIDE 50.) Index: xsane.spec =================================================================== RCS file: /cvs/pkgs/rpms/xsane/F-11/xsane.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -p -r1.68 -r1.69 --- xsane.spec 2 Mar 2009 14:42:09 -0000 1.68 +++ xsane.spec 3 May 2009 17:41:52 -0000 1.69 @@ -3,7 +3,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.996 -Release: 6%{?dist} +Release: 7%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop Source2: xsane.conf.in @@ -113,6 +113,9 @@ fi %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %changelog +* Sun May 03 2009 Warren Togami - 0.996-7 +- rebuild to make it work (gcc miscompile?) + * Mon Mar 02 2009 Nils Philippsen - 0.996-6 - rebuild against new sane-backends (just in case) From cheekyboinc at fedoraproject.org Sun May 3 17:50:38 2009 From: cheekyboinc at fedoraproject.org (Stefan Posdzich) Date: Sun, 3 May 2009 17:50:38 +0000 (UTC) Subject: rpms/maxr/F-9 .cvsignore,1.2,1.3 maxr.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <20090503175038.C3869700DA@cvs1.fedora.phx.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/maxr/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27017 Modified Files: .cvsignore maxr.spec sources Log Message: New Upstream Release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 20 Feb 2009 14:48:20 -0000 1.2 +++ .cvsignore 3 May 2009 17:50:08 -0000 1.3 @@ -1 +1 @@ -maxr-0.2.4.tar.gz +maxr-0.2.5.tar.gz Index: maxr.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-9/maxr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- maxr.spec 20 Feb 2009 14:48:20 -0000 1.1 +++ maxr.spec 3 May 2009 17:50:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: maxr -Version: 0.2.4 -Release: 2%{?dist} +Version: 0.2.5 +Release: 1%{?dist} Summary: A classic turn-based strategy game Group: Amusements/Games @@ -28,15 +28,20 @@ Gold, which is used to purchase upgrades turnbased strategy with battle chess character. - %prep %setup -q # Needed because of this rpmlint warning "W: wrong-file-end-of-line-encoding" sed -i 's/\r//' CHANGELOG # Convert everything to UTF-8 +# COPYING.README iconv -f iso-8859-1 -t utf-8 -o COPYING.README.utf8 COPYING.README touch -c -r COPYING.README COPYING.README.utf8 mv -f COPYING.README.utf8 COPYING.README +# ABOUT +iconv -f iso-8859-1 -t utf-8 -o ABOUT.utf8 ABOUT +touch -c -r ABOUT ABOUT.utf8 +mv -f ABOUT.utf8 ABOUT + %build %configure @@ -84,6 +89,9 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun May 03 2009 Stefan Posdzich - 0.2.5-1 +- New Upstream Release + * Wed Feb 18 2009 Stefan Posdzich - 0.2.4-2 - added: license FDL - removed: automake Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 20 Feb 2009 14:48:20 -0000 1.2 +++ sources 3 May 2009 17:50:08 -0000 1.3 @@ -1 +1 @@ -e9ff4a514f08579283e55cfdedff171b maxr-0.2.4.tar.gz +a1425820ac15aeea4089fc6b045cf588 maxr-0.2.5.tar.gz From cheekyboinc at fedoraproject.org Sun May 3 17:52:41 2009 From: cheekyboinc at fedoraproject.org (Stefan Posdzich) Date: Sun, 3 May 2009 17:52:41 +0000 (UTC) Subject: rpms/maxr/F-10 .cvsignore, 1.2, 1.3 maxr.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090503175241.1AF94700DA@cvs1.fedora.phx.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/maxr/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27460 Modified Files: .cvsignore maxr.spec sources Log Message: New Upstream Release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 20 Feb 2009 14:52:34 -0000 1.2 +++ .cvsignore 3 May 2009 17:52:09 -0000 1.3 @@ -1 +1 @@ -maxr-0.2.4.tar.gz +maxr-0.2.5.tar.gz Index: maxr.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-10/maxr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- maxr.spec 20 Feb 2009 14:52:34 -0000 1.1 +++ maxr.spec 3 May 2009 17:52:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: maxr -Version: 0.2.4 -Release: 2%{?dist} +Version: 0.2.5 +Release: 1%{?dist} Summary: A classic turn-based strategy game Group: Amusements/Games @@ -28,15 +28,20 @@ Gold, which is used to purchase upgrades turnbased strategy with battle chess character. - %prep %setup -q # Needed because of this rpmlint warning "W: wrong-file-end-of-line-encoding" sed -i 's/\r//' CHANGELOG # Convert everything to UTF-8 +# COPYING.README iconv -f iso-8859-1 -t utf-8 -o COPYING.README.utf8 COPYING.README touch -c -r COPYING.README COPYING.README.utf8 mv -f COPYING.README.utf8 COPYING.README +# ABOUT +iconv -f iso-8859-1 -t utf-8 -o ABOUT.utf8 ABOUT +touch -c -r ABOUT ABOUT.utf8 +mv -f ABOUT.utf8 ABOUT + %build %configure @@ -84,6 +89,9 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun May 03 2009 Stefan Posdzich - 0.2.5-1 +- New Upstream Release + * Wed Feb 18 2009 Stefan Posdzich - 0.2.4-2 - added: license FDL - removed: automake Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 20 Feb 2009 14:52:34 -0000 1.2 +++ sources 3 May 2009 17:52:10 -0000 1.3 @@ -1 +1 @@ -e9ff4a514f08579283e55cfdedff171b maxr-0.2.4.tar.gz +a1425820ac15aeea4089fc6b045cf588 maxr-0.2.5.tar.gz From cheekyboinc at fedoraproject.org Sun May 3 17:55:38 2009 From: cheekyboinc at fedoraproject.org (Stefan Posdzich) Date: Sun, 3 May 2009 17:55:38 +0000 (UTC) Subject: rpms/maxr/F-11 .cvsignore, 1.2, 1.3 maxr.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090503175538.56A43700DA@cvs1.fedora.phx.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/maxr/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28055 Modified Files: .cvsignore maxr.spec sources Log Message: New Upstream Release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 20 Feb 2009 14:43:18 -0000 1.2 +++ .cvsignore 3 May 2009 17:55:07 -0000 1.3 @@ -1 +1 @@ -maxr-0.2.4.tar.gz +maxr-0.2.5.tar.gz Index: maxr.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-11/maxr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- maxr.spec 25 Feb 2009 23:55:17 -0000 1.2 +++ maxr.spec 3 May 2009 17:55:07 -0000 1.3 @@ -1,6 +1,6 @@ Name: maxr -Version: 0.2.4 -Release: 3%{?dist} +Version: 0.2.5 +Release: 1%{?dist} Summary: A classic turn-based strategy game Group: Amusements/Games @@ -28,15 +28,20 @@ Gold, which is used to purchase upgrades turnbased strategy with battle chess character. - %prep %setup -q # Needed because of this rpmlint warning "W: wrong-file-end-of-line-encoding" sed -i 's/\r//' CHANGELOG # Convert everything to UTF-8 +# COPYING.README iconv -f iso-8859-1 -t utf-8 -o COPYING.README.utf8 COPYING.README touch -c -r COPYING.README COPYING.README.utf8 mv -f COPYING.README.utf8 COPYING.README +# ABOUT +iconv -f iso-8859-1 -t utf-8 -o ABOUT.utf8 ABOUT +touch -c -r ABOUT ABOUT.utf8 +mv -f ABOUT.utf8 ABOUT + %build %configure @@ -84,6 +89,9 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun May 03 2009 Stefan Posdzich - 0.2.5-1 +- New Upstream Release + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/maxr/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 20 Feb 2009 14:43:18 -0000 1.2 +++ sources 3 May 2009 17:55:07 -0000 1.3 @@ -1 +1 @@ -e9ff4a514f08579283e55cfdedff171b maxr-0.2.4.tar.gz +a1425820ac15aeea4089fc6b045cf588 maxr-0.2.5.tar.gz From s4504kr at fedoraproject.org Sun May 3 18:18:05 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Sun, 3 May 2009 18:18:05 +0000 (UTC) Subject: rpms/fedora-ksplice/devel fedora-ksplice.spec,1.3,1.4 Message-ID: <20090503181805.8069D700DA@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/fedora-ksplice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32507 Modified Files: fedora-ksplice.spec Log Message: Set debug_package to %{nil} Index: fedora-ksplice.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-ksplice/devel/fedora-ksplice.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- fedora-ksplice.spec 29 Apr 2009 19:52:46 -0000 1.3 +++ fedora-ksplice.spec 3 May 2009 18:17:34 -0000 1.4 @@ -1,6 +1,8 @@ +%global debug_package %{nil} + Name: fedora-ksplice Version: 0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Script Collection for Using KSplice on Fedora Linux Group: System Environment/Kernel @@ -50,7 +52,10 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING README %changelog -* Wed Apr 29 2009 Jochen Schmitt - 0.5-5 +* Sun May 3 2009 Jochen Schmitt 0.5-6 +- Set debug_package to %%{nil} (#498787) + +* Wed Apr 29 2009 Jochen Schmitt 0.5-5 - Build only for x86_64 and %%{ix86} * Wed Apr 29 2009 Jochen Schmitt 0.5-4 From s4504kr at fedoraproject.org Sun May 3 18:23:26 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Sun, 3 May 2009 18:23:26 +0000 (UTC) Subject: rpms/fedora-ksplice/F-11 fedora-ksplice.spec,1.3,1.4 Message-ID: <20090503182326.C55A9700DA@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/fedora-ksplice/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv925 Modified Files: fedora-ksplice.spec Log Message: Set debug_package to %{nil} Index: fedora-ksplice.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-ksplice/F-11/fedora-ksplice.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- fedora-ksplice.spec 29 Apr 2009 19:59:58 -0000 1.3 +++ fedora-ksplice.spec 3 May 2009 18:22:56 -0000 1.4 @@ -1,6 +1,8 @@ +%global debug_package %{nil} + Name: fedora-ksplice Version: 0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Script Collection for Using KSplice on Fedora Linux Group: System Environment/Kernel @@ -50,7 +52,10 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING README %changelog -* Wed Apr 29 2009 Jochen Schmitt - 0.5-5 +* Sun May 3 2009 Jochen Schmitt 0.5-6 +- Set debug_package to %%{nil} (#498787) + +* Wed Apr 29 2009 Jochen Schmitt 0.5-5 - Build only for x86_64 and %%{ix86} * Wed Apr 29 2009 Jochen Schmitt 0.5-4 From mbarnes at fedoraproject.org Sun May 3 18:28:31 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Sun, 3 May 2009 18:28:31 +0000 (UTC) Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.28, 1.29 gnome-python2-desktop.spec, 1.58, 1.59 sources, 1.28, 1.29 Message-ID: <20090503182831.E499170131@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1795 Modified Files: .cvsignore gnome-python2-desktop.spec sources Log Message: * Sun May 03 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - New subpackage: gnome-python2-brasero Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- .cvsignore 14 Mar 2009 22:22:37 -0000 1.28 +++ .cvsignore 3 May 2009 18:28:01 -0000 1.29 @@ -1 +1 @@ -gnome-python-desktop-2.26.0.tar.bz2 +gnome-python-desktop-2.27.1.tar.bz2 Index: gnome-python2-desktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- gnome-python2-desktop.spec 24 Apr 2009 07:59:41 -0000 1.58 +++ gnome-python2-desktop.spec 3 May 2009 18:28:01 -0000 1.59 @@ -1,6 +1,6 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Last updated for version 2.25.1 +# Last updated for version 2.27.1 # The order here corresponds to that in configure.ac, # for easier comparison. Please do not alphabetize. %define pygtk_version 2.10.3 @@ -13,6 +13,7 @@ %define libwnck_version 2.19.3 %define libgtop_version 2.13.0 %define nautilus_cd_burner_version 2.15.3 +%define brasero_version 0.9.0 %define gnome_media_version 2.10.0 %define gconf2_version 2.10.0 %define metacity_version 2.21.5 @@ -27,8 +28,8 @@ ### Abstract ### Name: gnome-python2-desktop -Version: 2.26.0 -Release: 3%{?dist} +Version: 2.27.1 +Release: 1%{?dist} License: GPLv2+ Group: Development/Languages Summary: The sources for additional PyGNOME Python extension modules @@ -41,6 +42,7 @@ Requires: gnome-python2-canvas >= %{gnom ### Build Dependencies ### +BuildRequires: brasero-devel >= %{brasero_version} BuildRequires: bug-buddy >= %{bug_buddy_version} BuildRequires: evince-devel >= %{evince_version} BuildRequires: evolution-data-server-devel >= %{eds_version} @@ -88,6 +90,16 @@ Requires: gnome-python2-gnome This module contains a wrapper that allows GNOME Panel applets to be written in Python. +%package -n gnome-python2-brasero +Summary: Python bindings for interacting with brasero +License: LGPLv2 +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: brasero-libs >= %{brasero_version} + +%description -n gnome-python2-brasero +This module contains a wrapper that allows the use of brasero via Python. + %package -n gnome-python2-bugbuddy Summary: Python bindings for interacting with bug-buddy Group: Development/Languages @@ -264,6 +276,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{python_sitearch}/gtk-2.0/gnome/applet.* %{python_sitearch}/gtk-2.0/gnomeapplet.so +%files -n gnome-python2-brasero +%defattr(-,root,root,-) +%{python_sitearch}/gtk-2.0/braseromedia.so + %files -n gnome-python2-bugbuddy %defattr(-,root,root,-) %{python_sitearch}/gtk-2.0/bugbuddy.py* @@ -328,6 +344,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/gtk-2.0/gnomekeyring.so %changelog +* Sun May 03 2009 Matthew Barnes - 2.27.1-1.fc12 +- Update to 2.27.1 +- New subpackage: gnome-python2-brasero + * Fri Apr 24 2009 Denis Leroy - 2.26.0-3 - Removed cd-burner subpackage Require on nautilus-cd-burn Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- sources 14 Mar 2009 22:22:37 -0000 1.28 +++ sources 3 May 2009 18:28:01 -0000 1.29 @@ -1 +1 @@ -fbcf4ef5ec4a8c4eec4d390c5889c80f gnome-python-desktop-2.26.0.tar.bz2 +da0c8ec5a63da4233c99e10568f3a9a0 gnome-python-desktop-2.27.1.tar.bz2 From s4504kr at fedoraproject.org Sun May 3 18:29:22 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Sun, 3 May 2009 18:29:22 +0000 (UTC) Subject: rpms/fedora-ksplice/F-10 fedora-ksplice.spec,1.2,1.3 Message-ID: <20090503182922.65FDA70131@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/fedora-ksplice/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2231 Modified Files: fedora-ksplice.spec Log Message: Set debug_package to %{nil} Index: fedora-ksplice.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-ksplice/F-10/fedora-ksplice.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- fedora-ksplice.spec 29 Apr 2009 20:08:59 -0000 1.2 +++ fedora-ksplice.spec 3 May 2009 18:28:52 -0000 1.3 @@ -1,6 +1,8 @@ +%global debug_package %{nil} + Name: fedora-ksplice Version: 0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Script Collection for Using KSplice on Fedora Linux Group: System Environment/Kernel @@ -50,7 +52,10 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING README %changelog -* Wed Apr 29 2009 Jochen Schmitt - 0.5-5 +* Sun May 3 2009 Jochen Schmitt 0.5-6 +- Set debug_package to %%{nil} (#498787) + +* Wed Apr 29 2009 Jochen Schmitt 0.5-5 - Build only for x86_64 and %%{ix86} * Wed Apr 29 2009 Jochen Schmitt 0.5-4 From hadess at fedoraproject.org Sun May 3 18:37:56 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Sun, 3 May 2009 18:37:56 +0000 (UTC) Subject: rpms/obexd/devel .cvsignore, 1.8, 1.9 obexd.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <20090503183756.9603B700DA@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/obexd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4053 Modified Files: .cvsignore obexd.spec sources Log Message: * Sun May 03 2009 Bastien Nocera 0.12-1 - Update to 0.12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 25 Apr 2009 13:04:23 -0000 1.8 +++ .cvsignore 3 May 2009 18:37:25 -0000 1.9 @@ -1 +1 @@ -obexd-0.11.tar.gz +obexd-0.12.tar.gz Index: obexd.spec =================================================================== RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- obexd.spec 25 Apr 2009 13:04:23 -0000 1.8 +++ obexd.spec 3 May 2009 18:37:25 -0000 1.9 @@ -1,5 +1,5 @@ Name: obexd -Version: 0.11 +Version: 0.12 Release: 1%{?dist} Summary: D-Bus service for Obex Client access @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dbus-1/services/obex-client.service %changelog +* Sun May 03 2009 Bastien Nocera 0.12-1 +- Update to 0.12 + * Sat Apr 25 2009 Bastien Nocera 0.11-1 - Update to 0.11 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 25 Apr 2009 13:04:23 -0000 1.8 +++ sources 3 May 2009 18:37:25 -0000 1.9 @@ -1 +1 @@ -15cc666cd60505d8522a8206dce563dd obexd-0.11.tar.gz +a6ba1aeeb7f64075e57ea6ee696ccc68 obexd-0.12.tar.gz From vpv at fedoraproject.org Sun May 3 18:49:07 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sun, 3 May 2009 18:49:07 +0000 (UTC) Subject: rpms/moin/devel moin.spec,1.26,1.27 Message-ID: <20090503184907.90061700DA@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/moin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5706 Modified Files: moin.spec Log Message: Add comment about CVE-2009-1482 already having been fixed before the CVE number even existed Index: moin.spec =================================================================== RCS file: /cvs/pkgs/rpms/moin/devel/moin.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- moin.spec 22 Apr 2009 17:50:13 -0000 1.26 +++ moin.spec 3 May 2009 18:48:36 -0000 1.27 @@ -9,6 +9,8 @@ Group: Applications/Internet URL: http://moinmo.in/ Source0: http://static.moinmo.in/files/moin-%{version}.tar.gz Source1: README-rpm +# This is the same as CVE-2009-1482. CVE-2008-0781 was the CVE number for this +# vulnerability in 1.5 and I fixed it in 1.8 before it had the new CVE number. Patch0: 001_CVE-2008-0781_attach_file_XSS.patch Patch1: 002_CVE-2008-0781_attach_file_XSS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -56,7 +58,8 @@ editable web pages. %changelog * Wed Apr 22 2009 Ville-Pekka Vainio 1.8.2-2 -- Fix CVE-2008-0781 with two patches from upstream +- Fix CVE-2008-0781 (also known as CVE-2009-1482) with two patches from + upstream * Tue Apr 14 2009 Ville-Pekka Vainio 1.8.2-1 - Update to 1.8.2 From vpv at fedoraproject.org Sun May 3 18:50:27 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sun, 3 May 2009 18:50:27 +0000 (UTC) Subject: rpms/moin/F-11 moin.spec,1.26,1.27 Message-ID: <20090503185027.2C55A700DA@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/moin/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5978 Modified Files: moin.spec Log Message: Add comment about CVE-2009-1482 already having been fixed before the CVE number even existed Index: moin.spec =================================================================== RCS file: /cvs/pkgs/rpms/moin/F-11/moin.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- moin.spec 22 Apr 2009 17:53:50 -0000 1.26 +++ moin.spec 3 May 2009 18:49:56 -0000 1.27 @@ -9,6 +9,8 @@ Group: Applications/Internet URL: http://moinmo.in/ Source0: http://static.moinmo.in/files/moin-%{version}.tar.gz Source1: README-rpm +# This is the same as CVE-2009-1482. CVE-2008-0781 was the CVE number for this +# vulnerability in 1.5 and I fixed it in 1.8 before it had the new CVE number. Patch0: 001_CVE-2008-0781_attach_file_XSS.patch Patch1: 002_CVE-2008-0781_attach_file_XSS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -56,7 +58,8 @@ editable web pages. %changelog * Wed Apr 22 2009 Ville-Pekka Vainio 1.8.2-2 -- Fix CVE-2008-0781 with two patches from upstream +- Fix CVE-2008-0781 (also known as CVE-2009-1482) with two patches from + upstream * Tue Apr 14 2009 Ville-Pekka Vainio 1.8.2-1 - Update to 1.8.2 From cweyl at fedoraproject.org Sun May 3 18:59:37 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 3 May 2009 18:59:37 +0000 (UTC) Subject: rpms/perl-Mouse/devel .cvsignore, 1.7, 1.8 perl-Mouse.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <20090503185937.EAE59700DA@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Mouse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7686 Modified Files: .cvsignore perl-Mouse.spec sources Log Message: * Sun May 03 2009 Chris Weyl 0.22-1 - update to 0.22 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Mouse/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 2 Apr 2009 07:38:43 -0000 1.7 +++ .cvsignore 3 May 2009 18:59:05 -0000 1.8 @@ -1 +1 @@ -Mouse-0.19.tar.gz +Mouse-0.22.tar.gz Index: perl-Mouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mouse/devel/perl-Mouse.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- perl-Mouse.spec 2 Apr 2009 07:38:43 -0000 1.8 +++ perl-Mouse.spec 3 May 2009 18:59:05 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Mouse -Version: 0.19 +Version: 0.22 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -82,6 +82,9 @@ rm -rf %{buildroot} %{_mandir}/man3/*.3* %changelog +* Sun May 03 2009 Chris Weyl 0.22-1 +- update to 0.22 + * Thu Apr 02 2009 Chris Weyl 0.19-1 - update to 0.19 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mouse/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 2 Apr 2009 07:38:43 -0000 1.7 +++ sources 3 May 2009 18:59:05 -0000 1.8 @@ -1 +1 @@ -eb21c9fbf790421a3358e3cbdb92ae5f Mouse-0.19.tar.gz +780ace6a75fd1837be6c5c4010e05cfd Mouse-0.22.tar.gz From cweyl at fedoraproject.org Sun May 3 19:01:15 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 3 May 2009 19:01:15 +0000 (UTC) Subject: rpms/perl-Mouse/F-11 perl-Mouse.spec,1.8,1.9 sources,1.7,1.8 Message-ID: <20090503190115.434D470135@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Mouse/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8289 Modified Files: perl-Mouse.spec sources Log Message: * Sun May 03 2009 Chris Weyl 0.22-1 - update to 0.22 Index: perl-Mouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mouse/F-11/perl-Mouse.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- perl-Mouse.spec 2 Apr 2009 07:38:43 -0000 1.8 +++ perl-Mouse.spec 3 May 2009 19:00:44 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Mouse -Version: 0.19 +Version: 0.22 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -82,6 +82,9 @@ rm -rf %{buildroot} %{_mandir}/man3/*.3* %changelog +* Sun May 03 2009 Chris Weyl 0.22-1 +- update to 0.22 + * Thu Apr 02 2009 Chris Weyl 0.19-1 - update to 0.19 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mouse/F-11/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 2 Apr 2009 07:38:43 -0000 1.7 +++ sources 3 May 2009 19:00:44 -0000 1.8 @@ -1 +1 @@ -eb21c9fbf790421a3358e3cbdb92ae5f Mouse-0.19.tar.gz +780ace6a75fd1837be6c5c4010e05cfd Mouse-0.22.tar.gz From cweyl at fedoraproject.org Sun May 3 19:01:27 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 3 May 2009 19:01:27 +0000 (UTC) Subject: rpms/perl-Mouse/F-10 perl-Mouse.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <20090503190127.5D62F70135@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Mouse/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8406 Modified Files: perl-Mouse.spec sources Log Message: * Sun May 03 2009 Chris Weyl 0.22-1 - update to 0.22 Index: perl-Mouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mouse/F-10/perl-Mouse.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- perl-Mouse.spec 2 Apr 2009 07:44:39 -0000 1.7 +++ perl-Mouse.spec 3 May 2009 19:00:56 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Mouse -Version: 0.19 +Version: 0.22 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -82,6 +82,9 @@ rm -rf %{buildroot} %{_mandir}/man3/*.3* %changelog +* Sun May 03 2009 Chris Weyl 0.22-1 +- update to 0.22 + * Thu Apr 02 2009 Chris Weyl 0.19-1 - update to 0.19 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mouse/F-10/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 2 Apr 2009 07:44:39 -0000 1.7 +++ sources 3 May 2009 19:00:57 -0000 1.8 @@ -1 +1 @@ -eb21c9fbf790421a3358e3cbdb92ae5f Mouse-0.19.tar.gz +780ace6a75fd1837be6c5c4010e05cfd Mouse-0.22.tar.gz From hadess at fedoraproject.org Sun May 3 19:26:09 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Sun, 3 May 2009 19:26:09 +0000 (UTC) Subject: rpms/totem/F-11 .cvsignore, 1.74, 1.75 sources, 1.74, 1.75 totem.spec, 1.236, 1.237 Message-ID: <20090503192610.18436700DA@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12816 Modified Files: .cvsignore sources totem.spec Log Message: * Sun May 03 2009 Bastien Nocera 2.26.2-1 - Update to 2.26.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem/F-11/.cvsignore,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- .cvsignore 1 Apr 2009 22:18:29 -0000 1.74 +++ .cvsignore 3 May 2009 19:25:38 -0000 1.75 @@ -1 +1 @@ -totem-2.26.1.tar.bz2 +totem-2.26.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem/F-11/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- sources 1 Apr 2009 22:18:30 -0000 1.74 +++ sources 3 May 2009 19:25:38 -0000 1.75 @@ -1 +1 @@ -410d14957f48ae179c03e5c663607536 totem-2.26.1.tar.bz2 +aa9905e84c7a15354baa2de529afde86 totem-2.26.2.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -p -r1.236 -r1.237 --- totem.spec 28 Apr 2009 10:05:20 -0000 1.236 +++ totem.spec 3 May 2009 19:25:38 -0000 1.237 @@ -8,8 +8,8 @@ Summary: Movie player for GNOME Name: totem -Version: 2.26.1 -Release: 4%{?dist} +Version: 2.26.2 +Release: 1%{?dist} License: GPLv2+ with exceptions Group: Applications/Multimedia URL: http://projects.gnome.org/totem/ @@ -483,6 +483,9 @@ fi %endif %changelog +* Sun May 03 2009 Bastien Nocera 2.26.2-1 +- Update to 2.26.2 + * Tue Apr 28 2009 Bastien Nocera 2.26.1-4 - Add missing pyxdg requires for the OpenSubtitles plugin (#497787) From pkgdb at fedoraproject.org Sun May 3 19:29:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:29:48 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503192948.ADB1310F89D@bastion2.fedora.phx.redhat.com> rishi has set the watchbugzilla acl on libical (Fedora devel) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:29:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:29:48 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503192948.D579110F8A1@bastion2.fedora.phx.redhat.com> rishi has set the watchcommits acl on libical (Fedora devel) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:29:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:29:49 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503192949.A99E210F8A4@bastion2.fedora.phx.redhat.com> rishi has set the commit acl on libical (Fedora devel) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:05 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193105.E735E10F893@bastion2.fedora.phx.redhat.com> rishi has set the watchbugzilla acl on libical (Fedora 9) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:07 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193107.EECC810F89E@bastion2.fedora.phx.redhat.com> rishi has set the watchcommits acl on libical (Fedora 9) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:09 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193109.9B56910F8A2@bastion2.fedora.phx.redhat.com> rishi has set the commit acl on libical (Fedora 9) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:17 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193117.96D9810F8A5@bastion2.fedora.phx.redhat.com> rishi has set the watchbugzilla acl on libical (Fedora 11) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:17 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193117.A7BB810F8A8@bastion2.fedora.phx.redhat.com> rishi has set the commit acl on libical (Fedora 11) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:20 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193120.2355510F8A9@bastion2.fedora.phx.redhat.com> rishi has set the watchcommits acl on libical (Fedora 11) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:21 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193121.E183510F8AC@bastion2.fedora.phx.redhat.com> rishi has set the watchcommits acl on libical (Fedora 10) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:24 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193124.5477F10F8AF@bastion2.fedora.phx.redhat.com> rishi has set the commit acl on libical (Fedora 10) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From pkgdb at fedoraproject.org Sun May 3 19:31:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 03 May 2009 19:31:25 +0000 Subject: [pkgdb] libical had acl change status Message-ID: <20090503193125.92B5F10F8B2@bastion2.fedora.phx.redhat.com> rishi has set the watchbugzilla acl on libical (Fedora 10) to Approved for robert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From kanarip at fedoraproject.org Sun May 3 19:32:38 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Sun, 3 May 2009 19:32:38 +0000 (UTC) Subject: rpms/rubygem-reststop/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rubygem-reststop.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090503193238.5DF4F70131@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-reststop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13952/devel Modified Files: .cvsignore import.log rubygem-reststop.spec sources Log Message: 0.4.0-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2008 23:51:37 -0000 1.2 +++ .cvsignore 3 May 2009 19:32:07 -0000 1.3 @@ -1 +1 @@ -reststop-0.3.0.gem +reststop-0.4.0.gem Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 27 Oct 2008 23:51:37 -0000 1.1 +++ import.log 3 May 2009 19:32:07 -0000 1.2 @@ -1 +1,2 @@ rubygem-reststop-0_3_0-1_fc9:HEAD:rubygem-reststop-0.3.0-1.fc9.src.rpm:1225151478 +rubygem-reststop-0_4_0-1_fc11:HEAD:rubygem-reststop-0.4.0-1.fc11.src.rpm:1241379091 Index: rubygem-reststop.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/devel/rubygem-reststop.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- rubygem-reststop.spec 25 Feb 2009 22:01:58 -0000 1.2 +++ rubygem-reststop.spec 3 May 2009 19:32:07 -0000 1.3 @@ -5,12 +5,12 @@ Summary: Convenient RESTfulness for all your Camping controller needs Name: rubygem-%{gemname} -Version: 0.3.0 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Group: Development/Languages License: LGPLv3 URL: http://rubyforge.org/projects/reststop/ -Source0: http://rubyforge.org/frs/download.php/38542/reststop-0.3.0.gem +Source0: http://gems.rubyforge.org/gems/%{gemname}/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems @@ -40,21 +40,22 @@ rm -rf %{buildroot} %files %defattr(-, root, root, -) -%{gemdir}/gems/%{gemname}-%{version}/ %doc %{gemdir}/doc/%{gemname}-%{version} %doc %{geminstdir}/examples/* +%doc %{geminstdir}/test %doc %{geminstdir}/CHANGELOG.txt %doc %{geminstdir}/LICENSE.txt %doc %{geminstdir}/Manifest.txt %doc %{geminstdir}/README.txt %doc %{geminstdir}/History.txt +%{geminstdir}/ %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sun May 03 2009 Jeroen van Meeuwen - 0.4.0-1 +- New upstream version * Fri Oct 18 2008 Jeroen van Meeuwen - 0.3.0-1 - Package for review Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2008 23:51:37 -0000 1.2 +++ sources 3 May 2009 19:32:07 -0000 1.3 @@ -1 +1 @@ -7e92c2a68467d94b63a85367a5dd1c7d reststop-0.3.0.gem +5a56441805b34cf3bbfb7a4a6917113e reststop-0.4.0.gem From kanarip at fedoraproject.org Sun May 3 19:35:21 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Sun, 3 May 2009 19:35:21 +0000 (UTC) Subject: rpms/rubygem-reststop/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rubygem-reststop.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090503193521.D79C7700DA@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-reststop/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14937/F-11 Modified Files: .cvsignore import.log rubygem-reststop.spec sources Log Message: 0.4.0-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2008 23:51:37 -0000 1.2 +++ .cvsignore 3 May 2009 19:34:50 -0000 1.3 @@ -1 +1 @@ -reststop-0.3.0.gem +reststop-0.4.0.gem Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-11/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 27 Oct 2008 23:51:37 -0000 1.1 +++ import.log 3 May 2009 19:34:51 -0000 1.2 @@ -1 +1,2 @@ rubygem-reststop-0_3_0-1_fc9:HEAD:rubygem-reststop-0.3.0-1.fc9.src.rpm:1225151478 +rubygem-reststop-0_4_0-1_fc11:F-11:rubygem-reststop-0.4.0-1.fc11.src.rpm:1241379232 Index: rubygem-reststop.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-11/rubygem-reststop.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- rubygem-reststop.spec 25 Feb 2009 22:01:58 -0000 1.2 +++ rubygem-reststop.spec 3 May 2009 19:34:51 -0000 1.3 @@ -5,12 +5,12 @@ Summary: Convenient RESTfulness for all your Camping controller needs Name: rubygem-%{gemname} -Version: 0.3.0 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Group: Development/Languages License: LGPLv3 URL: http://rubyforge.org/projects/reststop/ -Source0: http://rubyforge.org/frs/download.php/38542/reststop-0.3.0.gem +Source0: http://gems.rubyforge.org/gems/%{gemname}/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems @@ -40,21 +40,22 @@ rm -rf %{buildroot} %files %defattr(-, root, root, -) -%{gemdir}/gems/%{gemname}-%{version}/ %doc %{gemdir}/doc/%{gemname}-%{version} %doc %{geminstdir}/examples/* +%doc %{geminstdir}/test %doc %{geminstdir}/CHANGELOG.txt %doc %{geminstdir}/LICENSE.txt %doc %{geminstdir}/Manifest.txt %doc %{geminstdir}/README.txt %doc %{geminstdir}/History.txt +%{geminstdir}/ %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sun May 03 2009 Jeroen van Meeuwen - 0.4.0-1 +- New upstream version * Fri Oct 18 2008 Jeroen van Meeuwen - 0.3.0-1 - Package for review Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2008 23:51:37 -0000 1.2 +++ sources 3 May 2009 19:34:51 -0000 1.3 @@ -1 +1 @@ -7e92c2a68467d94b63a85367a5dd1c7d reststop-0.3.0.gem +5a56441805b34cf3bbfb7a4a6917113e reststop-0.4.0.gem From kanarip at fedoraproject.org Sun May 3 19:38:25 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Sun, 3 May 2009 19:38:25 +0000 (UTC) Subject: rpms/rubygem-reststop/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rubygem-reststop.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090503193825.19B24700DA@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-reststop/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15440/F-10 Modified Files: .cvsignore import.log rubygem-reststop.spec sources Log Message: 0.4.0-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2008 23:51:37 -0000 1.2 +++ .cvsignore 3 May 2009 19:37:53 -0000 1.3 @@ -1 +1 @@ -reststop-0.3.0.gem +reststop-0.4.0.gem Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 27 Oct 2008 23:51:37 -0000 1.1 +++ import.log 3 May 2009 19:37:54 -0000 1.2 @@ -1 +1,2 @@ rubygem-reststop-0_3_0-1_fc9:HEAD:rubygem-reststop-0.3.0-1.fc9.src.rpm:1225151478 +rubygem-reststop-0_4_0-1_fc11:F-10:rubygem-reststop-0.4.0-1.fc11.src.rpm:1241379414 Index: rubygem-reststop.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-10/rubygem-reststop.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-reststop.spec 27 Oct 2008 23:51:37 -0000 1.1 +++ rubygem-reststop.spec 3 May 2009 19:37:54 -0000 1.2 @@ -5,12 +5,12 @@ Summary: Convenient RESTfulness for all your Camping controller needs Name: rubygem-%{gemname} -Version: 0.3.0 +Version: 0.4.0 Release: 1%{?dist} Group: Development/Languages License: LGPLv3 URL: http://rubyforge.org/projects/reststop/ -Source0: http://rubyforge.org/frs/download.php/38542/reststop-0.3.0.gem +Source0: http://gems.rubyforge.org/gems/%{gemname}/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems @@ -40,18 +40,22 @@ rm -rf %{buildroot} %files %defattr(-, root, root, -) -%{gemdir}/gems/%{gemname}-%{version}/ %doc %{gemdir}/doc/%{gemname}-%{version} %doc %{geminstdir}/examples/* +%doc %{geminstdir}/test %doc %{geminstdir}/CHANGELOG.txt %doc %{geminstdir}/LICENSE.txt %doc %{geminstdir}/Manifest.txt %doc %{geminstdir}/README.txt %doc %{geminstdir}/History.txt +%{geminstdir}/ %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog +* Sun May 03 2009 Jeroen van Meeuwen - 0.4.0-1 +- New upstream version + * Fri Oct 18 2008 Jeroen van Meeuwen - 0.3.0-1 - Package for review Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2008 23:51:37 -0000 1.2 +++ sources 3 May 2009 19:37:54 -0000 1.3 @@ -1 +1 @@ -7e92c2a68467d94b63a85367a5dd1c7d reststop-0.3.0.gem +5a56441805b34cf3bbfb7a4a6917113e reststop-0.4.0.gem From kanarip at fedoraproject.org Sun May 3 19:41:41 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Sun, 3 May 2009 19:41:41 +0000 (UTC) Subject: rpms/rubygem-reststop/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rubygem-reststop.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090503194141.0FEA7700DA@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-reststop/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15987/F-9 Modified Files: .cvsignore import.log rubygem-reststop.spec sources Log Message: 0.4.0-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2008 23:52:57 -0000 1.2 +++ .cvsignore 3 May 2009 19:41:10 -0000 1.3 @@ -1 +1 @@ -reststop-0.3.0.gem +reststop-0.4.0.gem Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 27 Oct 2008 23:52:57 -0000 1.1 +++ import.log 3 May 2009 19:41:10 -0000 1.2 @@ -1 +1,2 @@ rubygem-reststop-0_3_0-1_fc9:F-9:rubygem-reststop-0.3.0-1.fc9.src.rpm:1225151559 +rubygem-reststop-0_4_0-1_fc11:F-9:rubygem-reststop-0.4.0-1.fc11.src.rpm:1241379601 Index: rubygem-reststop.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-9/rubygem-reststop.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-reststop.spec 27 Oct 2008 23:52:57 -0000 1.1 +++ rubygem-reststop.spec 3 May 2009 19:41:10 -0000 1.2 @@ -5,12 +5,12 @@ Summary: Convenient RESTfulness for all your Camping controller needs Name: rubygem-%{gemname} -Version: 0.3.0 +Version: 0.4.0 Release: 1%{?dist} Group: Development/Languages License: LGPLv3 URL: http://rubyforge.org/projects/reststop/ -Source0: http://rubyforge.org/frs/download.php/38542/reststop-0.3.0.gem +Source0: http://gems.rubyforge.org/gems/%{gemname}/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems @@ -40,18 +40,22 @@ rm -rf %{buildroot} %files %defattr(-, root, root, -) -%{gemdir}/gems/%{gemname}-%{version}/ %doc %{gemdir}/doc/%{gemname}-%{version} %doc %{geminstdir}/examples/* +%doc %{geminstdir}/test %doc %{geminstdir}/CHANGELOG.txt %doc %{geminstdir}/LICENSE.txt %doc %{geminstdir}/Manifest.txt %doc %{geminstdir}/README.txt %doc %{geminstdir}/History.txt +%{geminstdir}/ %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog +* Sun May 03 2009 Jeroen van Meeuwen - 0.4.0-1 +- New upstream version + * Fri Oct 18 2008 Jeroen van Meeuwen - 0.3.0-1 - Package for review Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-reststop/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2008 23:52:57 -0000 1.2 +++ sources 3 May 2009 19:41:10 -0000 1.3 @@ -1 +1 @@ -7e92c2a68467d94b63a85367a5dd1c7d reststop-0.3.0.gem +5a56441805b34cf3bbfb7a4a6917113e reststop-0.4.0.gem From kanarip at fedoraproject.org Sun May 3 20:16:14 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Sun, 3 May 2009 20:16:14 +0000 (UTC) Subject: rpms/rubygem-picnic/devel .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 rubygem-picnic.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090503201614.77AD2700DA@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-picnic/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21167/devel Modified Files: .cvsignore import.log rubygem-picnic.spec sources Log Message: 0.8.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 16 Mar 2009 12:26:28 -0000 1.3 +++ .cvsignore 3 May 2009 20:15:41 -0000 1.4 @@ -1 +1 @@ -picnic-0.7.1.gem +picnic-0.8.1.gem Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 16 Mar 2009 12:26:28 -0000 1.2 +++ import.log 3 May 2009 20:15:42 -0000 1.3 @@ -1,2 +1,3 @@ rubygem-picnic-0_6_5-2_fc9:HEAD:rubygem-picnic-0.6.5-2.fc9.src.rpm:1225151153 rubygem-picnic-0_7_1-1_fc10:HEAD:rubygem-picnic-0.7.1-1.fc10.src.rpm:1237206375 +rubygem-picnic-0_8_1-1_fc11:HEAD:rubygem-picnic-0.8.1-1.fc11.src.rpm:1241381665 Index: rubygem-picnic.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/devel/rubygem-picnic.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- rubygem-picnic.spec 16 Mar 2009 12:26:28 -0000 1.3 +++ rubygem-picnic.spec 3 May 2009 20:15:42 -0000 1.4 @@ -5,7 +5,7 @@ Summary: Easier distribution of Camping-based applications Name: rubygem-%{gemname} -Version: 0.7.1 +Version: 0.8.1 Release: 1%{?dist} Group: Development/Languages License: LGPLv3 @@ -37,6 +37,19 @@ gem install --local --install-dir %{buil --force --rdoc %{SOURCE0} # --force --rdoc %{gemname}-%{version}.gem +# Delete zero-length files +find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \; + +# Fix anything executable that does not have a shebang +for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do + [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file +done + +# Find files with a shebang that do not have executable permissions +for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do + [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file +done + %clean rm -rf %{buildroot} @@ -53,6 +66,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Jeroen van Meeuwen - 0.8.1-1 +- New upstream version + * Mon Mar 16 2009 Jeroen van Meeuwen - 0.7.1-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 16 Mar 2009 12:26:29 -0000 1.3 +++ sources 3 May 2009 20:15:42 -0000 1.4 @@ -1 +1 @@ -c34df9ef0662ff07f265637e31d2d2aa picnic-0.7.1.gem +891e1ebd7ec6438b8563673d4443122a picnic-0.8.1.gem From kanarip at fedoraproject.org Sun May 3 20:18:47 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Sun, 3 May 2009 20:18:47 +0000 (UTC) Subject: rpms/rubygem-picnic/F-11 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 rubygem-picnic.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090503201847.C2992700DA@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-picnic/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21610/F-11 Modified Files: .cvsignore import.log rubygem-picnic.spec sources Log Message: 0.8.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 16 Mar 2009 12:26:28 -0000 1.3 +++ .cvsignore 3 May 2009 20:18:17 -0000 1.4 @@ -1 +1 @@ -picnic-0.7.1.gem +picnic-0.8.1.gem Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-11/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 16 Mar 2009 12:26:28 -0000 1.2 +++ import.log 3 May 2009 20:18:17 -0000 1.3 @@ -1,2 +1,3 @@ rubygem-picnic-0_6_5-2_fc9:HEAD:rubygem-picnic-0.6.5-2.fc9.src.rpm:1225151153 rubygem-picnic-0_7_1-1_fc10:HEAD:rubygem-picnic-0.7.1-1.fc10.src.rpm:1237206375 +rubygem-picnic-0_8_1-1_fc11:F-11:rubygem-picnic-0.8.1-1.fc11.src.rpm:1241381846 Index: rubygem-picnic.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-11/rubygem-picnic.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- rubygem-picnic.spec 16 Mar 2009 12:26:28 -0000 1.3 +++ rubygem-picnic.spec 3 May 2009 20:18:17 -0000 1.4 @@ -5,7 +5,7 @@ Summary: Easier distribution of Camping-based applications Name: rubygem-%{gemname} -Version: 0.7.1 +Version: 0.8.1 Release: 1%{?dist} Group: Development/Languages License: LGPLv3 @@ -37,6 +37,19 @@ gem install --local --install-dir %{buil --force --rdoc %{SOURCE0} # --force --rdoc %{gemname}-%{version}.gem +# Delete zero-length files +find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \; + +# Fix anything executable that does not have a shebang +for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do + [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file +done + +# Find files with a shebang that do not have executable permissions +for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do + [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file +done + %clean rm -rf %{buildroot} @@ -53,6 +66,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Jeroen van Meeuwen - 0.8.1-1 +- New upstream version + * Mon Mar 16 2009 Jeroen van Meeuwen - 0.7.1-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 16 Mar 2009 12:26:29 -0000 1.3 +++ sources 3 May 2009 20:18:17 -0000 1.4 @@ -1 +1 @@ -c34df9ef0662ff07f265637e31d2d2aa picnic-0.7.1.gem +891e1ebd7ec6438b8563673d4443122a picnic-0.8.1.gem From kanarip at fedoraproject.org Sun May 3 20:21:29 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Sun, 3 May 2009 20:21:29 +0000 (UTC) Subject: rpms/rubygem-picnic/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rubygem-picnic.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090503202129.1FB51700DA@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-picnic/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22192/F-10 Modified Files: .cvsignore import.log rubygem-picnic.spec sources Log Message: 0.8.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2008 23:46:10 -0000 1.2 +++ .cvsignore 3 May 2009 20:20:58 -0000 1.3 @@ -1 +1 @@ -picnic-0.6.5.gem +picnic-0.8.1.gem Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 27 Oct 2008 23:46:10 -0000 1.1 +++ import.log 3 May 2009 20:20:58 -0000 1.2 @@ -1 +1,2 @@ rubygem-picnic-0_6_5-2_fc9:HEAD:rubygem-picnic-0.6.5-2.fc9.src.rpm:1225151153 +rubygem-picnic-0_8_1-1_fc11:F-10:rubygem-picnic-0.8.1-1.fc11.src.rpm:1241381985 Index: rubygem-picnic.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-10/rubygem-picnic.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-picnic.spec 27 Oct 2008 23:46:10 -0000 1.1 +++ rubygem-picnic.spec 3 May 2009 20:20:58 -0000 1.2 @@ -5,16 +5,16 @@ Summary: Easier distribution of Camping-based applications Name: rubygem-%{gemname} -Version: 0.6.5 -Release: 2%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Group: Development/Languages License: LGPLv3 URL: http://rubyforge.org/projects/picnic/ -Source0: http://rubyforge.org/frs/download.php/44038/picnic-0.6.5.gem +Source0: http://gems.rubyforce.org/gems/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems -Requires: rubygem(markaby) +Requires: rubygem(markaby) BuildRequires: rubygems #BuildRequires: rubygem-rake #BuildRequires: zip @@ -22,7 +22,9 @@ BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description -Picnic makes it easy(ier) to distribute and run Camping-based applications as well-behaved stand-alone Linux/Windows services +Picnic makes it easy(ier) to distribute and run +Camping-based applications as well-behaved stand-alone +Linux/Windows services %prep @@ -35,6 +37,19 @@ gem install --local --install-dir %{buil --force --rdoc %{SOURCE0} # --force --rdoc %{gemname}-%{version}.gem +# Delete zero-length files +find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \; + +# Fix anything executable that does not have a shebang +for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do + [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file +done + +# Find files with a shebang that do not have executable permissions +for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do + [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file +done + %clean rm -rf %{buildroot} @@ -51,6 +66,15 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Jeroen van Meeuwen - 0.8.1-1 +- New upstream version + +* Mon Mar 16 2009 Jeroen van Meeuwen - 0.7.1-1 +- New upstream version + +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Oct 25 2008 Jeroen van Meeuwen - 0.6.5-2 - Fix license (#467347) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2008 23:46:10 -0000 1.2 +++ sources 3 May 2009 20:20:58 -0000 1.3 @@ -1 +1 @@ -cdeb6aeb70947e3f7149dfc1b4897c45 picnic-0.6.5.gem +891e1ebd7ec6438b8563673d4443122a picnic-0.8.1.gem From kanarip at fedoraproject.org Sun May 3 20:24:02 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Sun, 3 May 2009 20:24:02 +0000 (UTC) Subject: rpms/rubygem-picnic/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rubygem-picnic.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090503202402.8D5FB700DA@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-picnic/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22654/F-9 Modified Files: .cvsignore import.log rubygem-picnic.spec sources Log Message: 0.8.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2008 23:47:29 -0000 1.2 +++ .cvsignore 3 May 2009 20:23:31 -0000 1.3 @@ -1 +1 @@ -picnic-0.6.5.gem +picnic-0.8.1.gem Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 27 Oct 2008 23:47:29 -0000 1.1 +++ import.log 3 May 2009 20:23:31 -0000 1.2 @@ -1 +1,2 @@ rubygem-picnic-0_6_5-2_fc9:F-9:rubygem-picnic-0.6.5-2.fc9.src.rpm:1225151231 +rubygem-picnic-0_8_1-1_fc11:F-9:rubygem-picnic-0.8.1-1.fc11.src.rpm:1241382163 Index: rubygem-picnic.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-9/rubygem-picnic.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-picnic.spec 27 Oct 2008 23:47:29 -0000 1.1 +++ rubygem-picnic.spec 3 May 2009 20:23:31 -0000 1.2 @@ -5,16 +5,16 @@ Summary: Easier distribution of Camping-based applications Name: rubygem-%{gemname} -Version: 0.6.5 -Release: 2%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Group: Development/Languages License: LGPLv3 URL: http://rubyforge.org/projects/picnic/ -Source0: http://rubyforge.org/frs/download.php/44038/picnic-0.6.5.gem +Source0: http://gems.rubyforce.org/gems/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems -Requires: rubygem(markaby) +Requires: rubygem(markaby) BuildRequires: rubygems #BuildRequires: rubygem-rake #BuildRequires: zip @@ -22,7 +22,9 @@ BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description -Picnic makes it easy(ier) to distribute and run Camping-based applications as well-behaved stand-alone Linux/Windows services +Picnic makes it easy(ier) to distribute and run +Camping-based applications as well-behaved stand-alone +Linux/Windows services %prep @@ -35,6 +37,19 @@ gem install --local --install-dir %{buil --force --rdoc %{SOURCE0} # --force --rdoc %{gemname}-%{version}.gem +# Delete zero-length files +find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \; + +# Fix anything executable that does not have a shebang +for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do + [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file +done + +# Find files with a shebang that do not have executable permissions +for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do + [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file +done + %clean rm -rf %{buildroot} @@ -51,6 +66,15 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Jeroen van Meeuwen - 0.8.1-1 +- New upstream version + +* Mon Mar 16 2009 Jeroen van Meeuwen - 0.7.1-1 +- New upstream version + +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Oct 25 2008 Jeroen van Meeuwen - 0.6.5-2 - Fix license (#467347) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-picnic/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2008 23:47:29 -0000 1.2 +++ sources 3 May 2009 20:23:32 -0000 1.3 @@ -1 +1 @@ -cdeb6aeb70947e3f7149dfc1b4897c45 picnic-0.6.5.gem +891e1ebd7ec6438b8563673d4443122a picnic-0.8.1.gem From than at fedoraproject.org Sun May 3 21:24:49 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 21:24:49 +0000 (UTC) Subject: rpms/kdebase-workspace/F-11 .cvsignore, 1.29, 1.30 kdebase-workspace.spec, 1.216, 1.217 sources, 1.35, 1.36 kdebase-workspace-4.2.2-kde#187699.patch, 1.2, NONE kdebase-workspace-4.2.3-plasma-notifications.patch, 1.1, NONE Message-ID: <20090503212449.DB5AF700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32490 Modified Files: .cvsignore kdebase-workspace.spec sources Removed Files: kdebase-workspace-4.2.2-kde#187699.patch kdebase-workspace-4.2.3-plasma-notifications.patch Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- .cvsignore 30 Mar 2009 18:20:48 -0000 1.29 +++ .cvsignore 3 May 2009 21:24:17 -0000 1.30 @@ -1 +1,2 @@ kdebase-workspace-4.2.2.tar.bz2 +kdebase-workspace-4.2.3.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v retrieving revision 1.216 retrieving revision 1.217 diff -u -p -r1.216 -r1.217 --- kdebase-workspace.spec 28 Apr 2009 17:13:16 -0000 1.216 +++ kdebase-workspace.spec 3 May 2009 21:24:17 -0000 1.217 @@ -6,9 +6,9 @@ Summary: K Desktop Environment - Workspace Name: kdebase-workspace -Version: 4.2.2 +Version: 4.2.3 -Release: 5%{?dist} +Release: 1%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -44,11 +44,6 @@ Patch102: kdebase-workspace-4.2.0-blueto Patch103: kdebase-workspace-4.2.0-kde#180576.patch #??4.3, https://bugs.kde.org/show_bug.cgi?id=184152 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch -# http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU -Patch106: kdebase-workspace-4.2.2-kde#187699.patch -#??#497657 - kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1 -#??(https://bugs.kde.org/show_bug.cgi?id=190786) -Patch107: kdebase-workspace-4.2.3-plasma-notifications.patch # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace? @@ -244,8 +239,6 @@ popd %endif %patch103 -p1 -b .kde#180576 %patch105 -p0 -b .desktopnumbers -%patch106 -p1 -b .kde#187699 -%patch107 -p1 -b .plasma-notifications %build @@ -520,6 +513,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 28 2009 Luk???? Tinkl - 4.2.2-5 - #497657 - kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- sources 30 Mar 2009 18:20:48 -0000 1.35 +++ sources 3 May 2009 21:24:17 -0000 1.36 @@ -1 +1 @@ -ac494815044eefc3a181488871225eda kdebase-workspace-4.2.2.tar.bz2 +f58d388883d73c69a0a719819625b171 kdebase-workspace-4.2.3.tar.bz2 --- kdebase-workspace-4.2.2-kde#187699.patch DELETED --- --- kdebase-workspace-4.2.3-plasma-notifications.patch DELETED --- From xavierb at fedoraproject.org Sun May 3 21:26:18 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Sun, 3 May 2009 21:26:18 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser/devel import.log, NONE, 1.1 perl-HTML-StripScripts-Parser.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090503212618.D3511700DA@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv374/devel Modified Files: .cvsignore sources Added Files: import.log perl-HTML-StripScripts-Parser.spec Log Message: Initial import. --- NEW FILE import.log --- perl-HTML-StripScripts-Parser-1_02-1_fc10:HEAD:perl-HTML-StripScripts-Parser-1.02-1.fc10.src.rpm:1241385897 --- NEW FILE perl-HTML-StripScripts-Parser.spec --- Name: perl-HTML-StripScripts-Parser Version: 1.02 Release: 1%{?dist} Summary: XSS filter using HTML::Parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-StripScripts-Parser/ Source0: http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-Parser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Parser) >= 3.56 BuildRequires: perl(HTML::StripScripts) >= 1.04 BuildRequires: perl(Test::More) Requires: perl(HTML::Parser) >= 3.56 Requires: perl(HTML::StripScripts) >= 1.04 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This class provides an easy interface to HTML::StripScripts, using HTML::Parser to parse the HTML. %prep %setup -q -n HTML-StripScripts-Parser-%{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 * Fri Apr 24 2009 Xavier Bachelot 1.02-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:56:54 -0000 1.1 +++ .cvsignore 3 May 2009 21:25:48 -0000 1.2 @@ -0,0 +1 @@ +HTML-StripScripts-Parser-1.02.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:56:54 -0000 1.1 +++ sources 3 May 2009 21:25:48 -0000 1.2 @@ -0,0 +1 @@ +0fb38dc2c632844883f3e716b056a88a HTML-StripScripts-Parser-1.02.tar.gz From than at fedoraproject.org Sun May 3 21:31:15 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 21:31:15 +0000 (UTC) Subject: rpms/kdebindings/F-11 .cvsignore, 1.55, 1.56 kdebindings.spec, 1.194, 1.195 sources, 1.61, 1.62 kdebindings-qyoto-includes.patch, 1.1, NONE Message-ID: <20090503213115.1D4F0700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebindings/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1344 Modified Files: .cvsignore kdebindings.spec sources Removed Files: kdebindings-qyoto-includes.patch Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdebindings/F-11/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -p -r1.55 -r1.56 --- .cvsignore 31 Mar 2009 11:18:31 -0000 1.55 +++ .cvsignore 3 May 2009 21:30:43 -0000 1.56 @@ -1 +1,2 @@ kdebindings-4.2.2.tar.bz2 +kdebindings-4.2.3.tar.bz2 Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/F-11/kdebindings.spec,v retrieving revision 1.194 retrieving revision 1.195 diff -u -p -r1.194 -r1.195 --- kdebindings.spec 21 Apr 2009 03:00:16 -0000 1.194 +++ kdebindings.spec 3 May 2009 21:30:43 -0000 1.195 @@ -28,8 +28,8 @@ %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") Name: kdebindings -Version: 4.2.2 -Release: 5%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -41,7 +41,6 @@ Source1: http://websvn.kde.org/*checkout # patch to disable examples (trouble with them installing to the buildroot) Patch0: kdebindings-qyoto-examples.patch # upstream patches -Patch99: kdebindings-qyoto-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -242,7 +241,6 @@ Falcon plugin for the Kross archtecture %prep %setup -q %patch0 -%patch99 %build @@ -480,6 +478,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 21 2009 Kevin Kofler - 4.2.2-5 - F11+: enable csharp on ppc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebindings/F-11/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- sources 31 Mar 2009 11:18:31 -0000 1.61 +++ sources 3 May 2009 21:30:44 -0000 1.62 @@ -1 +1 @@ -56adf7d276957d87102457165739f764 kdebindings-4.2.2.tar.bz2 +1c0e2a30461fb64654d0cc4e104f4dde kdebindings-4.2.3.tar.bz2 --- kdebindings-qyoto-includes.patch DELETED --- From than at fedoraproject.org Sun May 3 21:37:50 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 21:37:50 +0000 (UTC) Subject: rpms/kdeedu/F-11 .cvsignore, 1.62, 1.63 kdeedu.spec, 1.176, 1.177 sources, 1.64, 1.65 Message-ID: <20090503213750.1967070135@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdeedu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2394 Modified Files: .cvsignore kdeedu.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeedu/F-11/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- .cvsignore 31 Mar 2009 11:51:19 -0000 1.62 +++ .cvsignore 3 May 2009 21:37:18 -0000 1.63 @@ -1 +1,2 @@ kdeedu-4.2.2.tar.bz2 +kdeedu-4.2.3.tar.bz2 Index: kdeedu.spec =================================================================== RCS file: /cvs/extras/rpms/kdeedu/F-11/kdeedu.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -p -r1.176 -r1.177 --- kdeedu.spec 2 Apr 2009 15:11:59 -0000 1.176 +++ kdeedu.spec 3 May 2009 21:37:18 -0000 1.177 @@ -13,7 +13,7 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} License: GPLv2 @@ -452,6 +452,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Mar 31 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeedu/F-11/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -p -r1.64 -r1.65 --- sources 31 Mar 2009 11:51:19 -0000 1.64 +++ sources 3 May 2009 21:37:18 -0000 1.65 @@ -1 +1 @@ -132724e6d8d874372c218ed138cb2091 kdeedu-4.2.2.tar.bz2 +c71070469471fc8283c582b8285c44b8 kdeedu-4.2.3.tar.bz2 From xavierb at fedoraproject.org Sun May 3 21:44:24 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Sun, 3 May 2009 21:44:24 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser/F-10 perl-HTML-StripScripts-Parser.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090503214424.AC05D700DA@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4105/F-10 Modified Files: sources Added Files: perl-HTML-StripScripts-Parser.spec Log Message: Import into F-9, F-10 and F-11 --- NEW FILE perl-HTML-StripScripts-Parser.spec --- Name: perl-HTML-StripScripts-Parser Version: 1.02 Release: 1%{?dist} Summary: XSS filter using HTML::Parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-StripScripts-Parser/ Source0: http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-Parser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Parser) >= 3.56 BuildRequires: perl(HTML::StripScripts) >= 1.04 BuildRequires: perl(Test::More) Requires: perl(HTML::Parser) >= 3.56 Requires: perl(HTML::StripScripts) >= 1.04 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This class provides an easy interface to HTML::StripScripts, using HTML::Parser to parse the HTML. %prep %setup -q -n HTML-StripScripts-Parser-%{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 * Fri Apr 24 2009 Xavier Bachelot 1.02-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:56:54 -0000 1.1 +++ sources 3 May 2009 21:43:54 -0000 1.2 @@ -0,0 +1 @@ +0fb38dc2c632844883f3e716b056a88a HTML-StripScripts-Parser-1.02.tar.gz From xavierb at fedoraproject.org Sun May 3 21:44:25 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Sun, 3 May 2009 21:44:25 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser/F-9 perl-HTML-StripScripts-Parser.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090503214425.161F0700DA@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4105/F-9 Modified Files: sources Added Files: perl-HTML-StripScripts-Parser.spec Log Message: Import into F-9, F-10 and F-11 --- NEW FILE perl-HTML-StripScripts-Parser.spec --- Name: perl-HTML-StripScripts-Parser Version: 1.02 Release: 1%{?dist} Summary: XSS filter using HTML::Parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-StripScripts-Parser/ Source0: http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-Parser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Parser) >= 3.56 BuildRequires: perl(HTML::StripScripts) >= 1.04 BuildRequires: perl(Test::More) Requires: perl(HTML::Parser) >= 3.56 Requires: perl(HTML::StripScripts) >= 1.04 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This class provides an easy interface to HTML::StripScripts, using HTML::Parser to parse the HTML. %prep %setup -q -n HTML-StripScripts-Parser-%{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 * Fri Apr 24 2009 Xavier Bachelot 1.02-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:56:54 -0000 1.1 +++ sources 3 May 2009 21:43:54 -0000 1.2 @@ -0,0 +1 @@ +0fb38dc2c632844883f3e716b056a88a HTML-StripScripts-Parser-1.02.tar.gz From xavierb at fedoraproject.org Sun May 3 21:44:24 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Sun, 3 May 2009 21:44:24 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser/F-11 perl-HTML-StripScripts-Parser.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090503214424.CFAC5700DA@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4105/F-11 Modified Files: sources Added Files: perl-HTML-StripScripts-Parser.spec Log Message: Import into F-9, F-10 and F-11 --- NEW FILE perl-HTML-StripScripts-Parser.spec --- Name: perl-HTML-StripScripts-Parser Version: 1.02 Release: 1%{?dist} Summary: XSS filter using HTML::Parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-StripScripts-Parser/ Source0: http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-Parser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Parser) >= 3.56 BuildRequires: perl(HTML::StripScripts) >= 1.04 BuildRequires: perl(Test::More) Requires: perl(HTML::Parser) >= 3.56 Requires: perl(HTML::StripScripts) >= 1.04 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This class provides an easy interface to HTML::StripScripts, using HTML::Parser to parse the HTML. %prep %setup -q -n HTML-StripScripts-Parser-%{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 * Fri Apr 24 2009 Xavier Bachelot 1.02-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:56:54 -0000 1.1 +++ sources 3 May 2009 21:43:54 -0000 1.2 @@ -0,0 +1 @@ +0fb38dc2c632844883f3e716b056a88a HTML-StripScripts-Parser-1.02.tar.gz From than at fedoraproject.org Sun May 3 21:44:38 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 21:44:38 +0000 (UTC) Subject: rpms/kdegames/F-11 .cvsignore, 1.64, 1.65 kdegames.spec, 1.126, 1.127 sources, 1.68, 1.69 Message-ID: <20090503214438.BA5E1700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdegames/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4132 Modified Files: .cvsignore kdegames.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdegames/F-11/.cvsignore,v retrieving revision 1.64 retrieving revision 1.65 diff -u -p -r1.64 -r1.65 --- .cvsignore 31 Mar 2009 12:05:56 -0000 1.64 +++ .cvsignore 3 May 2009 21:44:08 -0000 1.65 @@ -1 +1,2 @@ kdegames-4.2.2.tar.bz2 +kdegames-4.2.3.tar.bz2 Index: kdegames.spec =================================================================== RCS file: /cvs/extras/rpms/kdegames/F-11/kdegames.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- kdegames.spec 8 Apr 2009 22:45:28 -0000 1.126 +++ kdegames.spec 3 May 2009 21:44:08 -0000 1.127 @@ -2,8 +2,8 @@ Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 -Version: 4.2.2 -Release: 6%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 URL: http://www.kde.org/ @@ -199,6 +199,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 08 2009 Kevin Kofler - 4.2.2-6 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegames/F-11/sources,v retrieving revision 1.68 retrieving revision 1.69 diff -u -p -r1.68 -r1.69 --- sources 31 Mar 2009 12:05:56 -0000 1.68 +++ sources 3 May 2009 21:44:08 -0000 1.69 @@ -1 +1 @@ -d78bba18dcf6bcdf86f77b26596f4c71 kdegames-4.2.2.tar.bz2 +85a1dfe811e0704eb7ef65e0c371f863 kdegames-4.2.3.tar.bz2 From than at fedoraproject.org Sun May 3 21:50:02 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 21:50:02 +0000 (UTC) Subject: rpms/kdegraphics/F-11 .cvsignore, 1.59, 1.60 kdegraphics.spec, 1.198, 1.199 sources, 1.65, 1.66 Message-ID: <20090503215002.1DCFD700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdegraphics/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5168 Modified Files: .cvsignore kdegraphics.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-11/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- .cvsignore 31 Mar 2009 12:12:57 -0000 1.59 +++ .cvsignore 3 May 2009 21:49:31 -0000 1.60 @@ -1 +1,2 @@ kdegraphics-4.2.2.tar.bz2 +kdegraphics-4.2.3.tar.bz2 Index: kdegraphics.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-11/kdegraphics.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -p -r1.198 -r1.199 --- kdegraphics.spec 27 Apr 2009 15:43:23 -0000 1.198 +++ kdegraphics.spec 3 May 2009 21:49:31 -0000 1.199 @@ -6,8 +6,8 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.2.2 -Release: 5%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -242,6 +242,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Apr 27 2009 Rex Dieter 4.2.2-5 - kio_msits subpkg, help avoid kchmviewer conflicts (#484861) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-11/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -p -r1.65 -r1.66 --- sources 31 Mar 2009 12:12:57 -0000 1.65 +++ sources 3 May 2009 21:49:31 -0000 1.66 @@ -1 +1 @@ -92ccbd703885a1f7788e4f27f281a75c kdegraphics-4.2.2.tar.bz2 +29e9a466cd2b282a5139aeca8cc312a2 kdegraphics-4.2.3.tar.bz2 From than at fedoraproject.org Sun May 3 21:56:48 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 21:56:48 +0000 (UTC) Subject: rpms/kdelibs/F-11 .cvsignore, 1.70, 1.71 kdelibs.spec, 1.474, 1.475 sources, 1.87, 1.88 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.5, NONE kdelibs-4.2.2-bidi-kde#189161.patch, 1.1, NONE kdelibs-4.2.2-kde#180785-2.patch, 1.1, NONE kdelibs-4.2.2-kde#180785.patch, 1.1, NONE kdelibs-4.2.2-kio_http.patch, 1.1, NONE kdelibs-4.2.2-kjob.patch, 1.1, NONE kdelibs-4.2.2-plasma-focus.patch, 1.2, NONE Message-ID: <20090503215648.CFC1B700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6455 Modified Files: .cvsignore kdelibs.spec sources Removed Files: kdelibs-4.2.0-kjs-gcc44-crash.patch kdelibs-4.2.2-bidi-kde#189161.patch kdelibs-4.2.2-kde#180785-2.patch kdelibs-4.2.2-kde#180785.patch kdelibs-4.2.2-kio_http.patch kdelibs-4.2.2-kjob.patch kdelibs-4.2.2-plasma-focus.patch Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-11/.cvsignore,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- .cvsignore 1 Apr 2009 10:18:07 -0000 1.70 +++ .cvsignore 3 May 2009 21:56:18 -0000 1.71 @@ -1 +1,2 @@ kdelibs-4.2.2.tar.bz2 +kdelibs-4.2.3.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v retrieving revision 1.474 retrieving revision 1.475 diff -u -p -r1.474 -r1.475 --- kdelibs.spec 28 Apr 2009 12:20:37 -0000 1.474 +++ kdelibs.spec 3 May 2009 21:56:18 -0000 1.475 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries -Version: 4.2.2 -Release: 13%{?dist} +Version: 4.2.3 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -80,18 +80,10 @@ Patch18: kdelibs-4.1.72-kstandarddirs.pa Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) -Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch -Patch100: kdelibs-4.2.2-kio_http.patch -Patch101: kdelibs-4.2.2-kjob.patch -Patch102: kdelibs-4.2.2-bidi-kde#189161.patch -Patch103: kdelibs-4.2.2-kde#180785.patch -Patch104: kdelibs-4.2.2-kde#180785-2.patch -Patch105: kdelibs-4.2.2-plasma-focus.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -226,17 +218,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi %patch20 -p1 -b .xxcmake %patch22 -p1 -b .kdepimlibs-cmake %patch23 -p1 -b .gcc44 -%patch24 -p1 -b .kjs-gcc44-crash %patch25 -p1 -b .gcc44-misc # upstream patches # 4.2 -%patch100 -p0 -b .kio_http -%patch101 -p0 -b .kjob -%patch102 -p4 -b .bidi-kde#189161 -%patch103 -p4 -b .kde#180785 -%patch104 -p4 -b .kde#180785-2 -%patch105 -p1 -b .kickoff-focus # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -422,6 +407,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 28 2009 Luk???? Tinkl - 4.2.2-13 - upstream patch to fix GCC4.4 crashes in kjs (kdebug:189809) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-11/sources,v retrieving revision 1.87 retrieving revision 1.88 diff -u -p -r1.87 -r1.88 --- sources 1 Apr 2009 10:18:07 -0000 1.87 +++ sources 3 May 2009 21:56:18 -0000 1.88 @@ -1 +1 @@ -ff54817efef952e8812c607f5089c2e1 kdelibs-4.2.2.tar.bz2 +73f76b0521dff7d9aaf1057499624a8d kdelibs-4.2.3.tar.bz2 --- kdelibs-4.2.0-kjs-gcc44-crash.patch DELETED --- --- kdelibs-4.2.2-bidi-kde#189161.patch DELETED --- --- kdelibs-4.2.2-kde#180785-2.patch DELETED --- --- kdelibs-4.2.2-kde#180785.patch DELETED --- --- kdelibs-4.2.2-kio_http.patch DELETED --- --- kdelibs-4.2.2-kjob.patch DELETED --- --- kdelibs-4.2.2-plasma-focus.patch DELETED --- From than at fedoraproject.org Sun May 3 21:59:16 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 21:59:16 +0000 (UTC) Subject: rpms/kdemultimedia/F-11 .cvsignore, 1.61, 1.62 kdemultimedia.spec, 1.140, 1.141 sources, 1.63, 1.64 Message-ID: <20090503215916.496BE700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdemultimedia/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6882 Modified Files: .cvsignore kdemultimedia.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/F-11/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- .cvsignore 31 Mar 2009 12:21:18 -0000 1.61 +++ .cvsignore 3 May 2009 21:58:45 -0000 1.62 @@ -1 +1,2 @@ kdemultimedia-4.2.2.tar.bz2 +kdemultimedia-4.2.3.tar.bz2 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/F-11/kdemultimedia.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -p -r1.140 -r1.141 --- kdemultimedia.spec 1 Apr 2009 18:43:39 -0000 1.140 +++ kdemultimedia.spec 3 May 2009 21:58:45 -0000 1.141 @@ -1,7 +1,7 @@ Name: kdemultimedia Epoch: 6 -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications Group: Applications/Multimedia @@ -151,6 +151,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/F-11/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- sources 31 Mar 2009 12:21:18 -0000 1.63 +++ sources 3 May 2009 21:58:45 -0000 1.64 @@ -1 +1 @@ -ebdf9ccc9eae935eda5f78d56773ee9a kdemultimedia-4.2.2.tar.bz2 +5f34bb1467a015a524e3ecbdd05b167c kdemultimedia-4.2.3.tar.bz2 From than at fedoraproject.org Sun May 3 22:03:15 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 22:03:15 +0000 (UTC) Subject: rpms/kdenetwork/F-11 .cvsignore, 1.64, 1.65 kdenetwork.spec, 1.182, 1.183 sources, 1.71, 1.72 Message-ID: <20090503220315.F26CE700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdenetwork/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7634 Modified Files: .cvsignore kdenetwork.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/F-11/.cvsignore,v retrieving revision 1.64 retrieving revision 1.65 diff -u -p -r1.64 -r1.65 --- .cvsignore 31 Mar 2009 12:28:15 -0000 1.64 +++ .cvsignore 3 May 2009 22:02:45 -0000 1.65 @@ -1 +1,2 @@ kdenetwork-4.2.2.tar.bz2 +kdenetwork-4.2.3.tar.bz2 Index: kdenetwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -p -r1.182 -r1.183 --- kdenetwork.spec 1 Apr 2009 18:48:49 -0000 1.182 +++ kdenetwork.spec 3 May 2009 22:02:45 -0000 1.183 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Network Applications Name: kdenetwork Epoch: 7 -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} License: GPLv2 @@ -177,6 +177,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/F-11/sources,v retrieving revision 1.71 retrieving revision 1.72 diff -u -p -r1.71 -r1.72 --- sources 31 Mar 2009 12:28:15 -0000 1.71 +++ sources 3 May 2009 22:02:45 -0000 1.72 @@ -1 +1 @@ -72193b5eb050ef45fad76422a15e0e1a kdenetwork-4.2.2.tar.bz2 +7d77ab0322f96251a8d3baf7e4f6990e kdenetwork-4.2.3.tar.bz2 From caolanm at fedoraproject.org Sun May 3 22:07:56 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 3 May 2009 22:07:56 +0000 (UTC) Subject: rpms/flute/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <20090503220756.D8845700DA@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/flute/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8362 Modified Files: .cvsignore sources Log Message: commit sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flute/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 23 Jul 2008 17:55:07 -0000 1.2 +++ .cvsignore 3 May 2009 22:07:26 -0000 1.3 @@ -1 +1 @@ -flute-1.3-jfree-20061107.tar.gz +flute-1.3.0-OOo31.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flute/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 23 Jul 2008 17:55:07 -0000 1.2 +++ sources 3 May 2009 22:07:26 -0000 1.3 @@ -1 +1 @@ -aadb9c5131b308676765271848cf4bd2 flute-1.3-jfree-20061107.tar.gz +1209a788dff31ccb5304a82a35a80ad3 flute-1.3.0-OOo31.zip From than at fedoraproject.org Sun May 3 22:09:03 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 22:09:03 +0000 (UTC) Subject: rpms/kdepim/F-11 .cvsignore, 1.60, 1.61 kdepim.spec, 1.215, 1.216 sources, 1.68, 1.69 Message-ID: <20090503220903.5CB97700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8582 Modified Files: .cvsignore kdepim.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdepim/F-11/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- .cvsignore 31 Mar 2009 15:03:24 -0000 1.60 +++ .cvsignore 3 May 2009 22:08:32 -0000 1.61 @@ -1 +1,2 @@ kdepim-4.2.2.tar.bz2 +kdepim-4.2.3.tar.bz2 Index: kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v retrieving revision 1.215 retrieving revision 1.216 diff -u -p -r1.215 -r1.216 --- kdepim.spec 13 Apr 2009 16:13:36 -0000 1.215 +++ kdepim.spec 3 May 2009 22:08:33 -0000 1.216 @@ -5,8 +5,8 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 Group: Applications/Productivity @@ -14,7 +14,6 @@ URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kdepim-4.1.80-libqgpgme-link-fix.patch # 4.2 upstream patches -Patch100: kdepim-4.2.2-korganizer-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -90,7 +89,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}% %patch0 -p1 -b .libqgpgme-link-fix # upstream patches -%patch100 -p0 -b .crash %build mkdir -p %{_target_platform} @@ -187,6 +185,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Apr 13 2009 Rex Dieter - 4.2.2-4 - drop extraneous BR's, including libmal-devel (not currently used) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepim/F-11/sources,v retrieving revision 1.68 retrieving revision 1.69 diff -u -p -r1.68 -r1.69 --- sources 31 Mar 2009 15:03:24 -0000 1.68 +++ sources 3 May 2009 22:08:33 -0000 1.69 @@ -1 +1 @@ -964208d570845c75e0c482bb3d33892f kdepim-4.2.2.tar.bz2 +a141915b7e97ad16e5601281ab3e4976 kdepim-4.2.3.tar.bz2 From than at fedoraproject.org Sun May 3 22:10:45 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 22:10:45 +0000 (UTC) Subject: rpms/kdepim/F-11 kdepim-4.2.2-korganizer-crash.patch,1.1,NONE Message-ID: <20090503221045.25ACA70135@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8905 Removed Files: kdepim-4.2.2-korganizer-crash.patch Log Message: 4.2.3 --- kdepim-4.2.2-korganizer-crash.patch DELETED --- From rrankin at fedoraproject.org Sun May 3 22:12:45 2009 From: rrankin at fedoraproject.org (Roy Rankin) Date: Sun, 3 May 2009 22:12:45 +0000 (UTC) Subject: rpms/gputils/devel .cvsignore, 1.6, 1.7 gputils.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <20090503221245.E7F6A700DA@cvs1.fedora.phx.redhat.com> Author: rrankin Update of /cvs/pkgs/rpms/gputils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9437 Modified Files: .cvsignore gputils.spec sources Log Message: New upstream version 0.13.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gputils/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 15 Sep 2008 01:32:57 -0000 1.6 +++ .cvsignore 3 May 2009 22:12:15 -0000 1.7 @@ -1 +1 @@ -gputils-0.13.6.tar.gz +gputils-0.13.7.tar.gz Index: gputils.spec =================================================================== RCS file: /cvs/pkgs/rpms/gputils/devel/gputils.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- gputils.spec 25 Feb 2009 00:48:12 -0000 1.16 +++ gputils.spec 3 May 2009 22:12:15 -0000 1.17 @@ -1,6 +1,6 @@ Name: gputils -Version: 0.13.6 -Release: 2%{?dist} +Version: 0.13.7 +Release: 1%{?dist} Summary: Development utilities for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Outils de d??veloppement pour les microcontr??leurs PIC (TM) de Microchip (TM) @@ -52,6 +52,12 @@ Voir la documentation pour une liste ?? %{_mandir}/fr/man1/* %changelog +* Mon May 04 2009 Roy Rankin 0.13.7-1 + - New upstream version with + Added support for all processors supported by MPLAB 8.20 (except eeprom16 and related). + Added support for "LIST M=?" directive. + Fixed several bugs. + * Tue Feb 24 2009 Fedora Release Engineering - 0.13.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gputils/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 15 Sep 2008 01:32:57 -0000 1.6 +++ sources 3 May 2009 22:12:15 -0000 1.7 @@ -1 +1 @@ -a95744578c6f7d616235434be1dc3603 gputils-0.13.6.tar.gz +242e33919e9c318d6ac58b6db291d20e gputils-0.13.7.tar.gz From than at fedoraproject.org Sun May 3 22:14:05 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 22:14:05 +0000 (UTC) Subject: rpms/kdepimlibs/F-11 .cvsignore, 1.35, 1.36 kdepimlibs.spec, 1.84, 1.85 sources, 1.34, 1.35 Message-ID: <20090503221405.5BE19700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdepimlibs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10244 Modified Files: .cvsignore kdepimlibs.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/F-11/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- .cvsignore 31 Mar 2009 15:22:18 -0000 1.35 +++ .cvsignore 3 May 2009 22:13:34 -0000 1.36 @@ -1 +1,2 @@ kdepimlibs-4.2.2.tar.bz2 +kdepimlibs-4.2.3.tar.bz2 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/F-11/kdepimlibs.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -p -r1.84 -r1.85 --- kdepimlibs.spec 6 Apr 2009 00:27:46 -0000 1.84 +++ kdepimlibs.spec 3 May 2009 22:13:35 -0000 1.85 @@ -12,8 +12,8 @@ %define akonadi_version 1.1.1 Name: kdepimlibs -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -209,6 +209,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Apr 06 2009 Kevin Kofler - 4.2.2-3 - fix libkcal devel symlink hack Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/F-11/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- sources 31 Mar 2009 15:22:18 -0000 1.34 +++ sources 3 May 2009 22:13:35 -0000 1.35 @@ -1 +1 @@ -62562a3025138a08ffdf08e6466b5065 kdepimlibs-4.2.2.tar.bz2 +7b5250a44291c42c5fa4110da19890bb kdepimlibs-4.2.3.tar.bz2 From xavierb at fedoraproject.org Sun May 3 22:21:55 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Sun, 3 May 2009 22:21:55 +0000 (UTC) Subject: rpms/perl-HTML-StripScripts-Parser/EL-5 import.log, NONE, 1.1 perl-HTML-StripScripts-Parser.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090503222155.E4488700DA@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11834/EL-5 Modified Files: .cvsignore sources Added Files: import.log perl-HTML-StripScripts-Parser.spec Log Message: Initial EL-5 import. --- NEW FILE import.log --- perl-HTML-StripScripts-Parser-1_00-1_fc10:EL-5:perl-HTML-StripScripts-Parser-1.00-1.fc10.src.rpm:1241389237 --- NEW FILE perl-HTML-StripScripts-Parser.spec --- Name: perl-HTML-StripScripts-Parser Version: 1.00 Release: 1%{?dist} Summary: XSS filter using HTML::Parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-StripScripts-Parser/ Source0: http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-Parser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Parser) >= 3.25 BuildRequires: perl(HTML::StripScripts) >= 0.991 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(HTML::Parser) >= 3.25 Requires: perl(HTML::StripScripts) >= 0.991 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This class provides an easy interface to HTML::StripScripts, using HTML::Parser to parse the HTML. %prep %setup -q -n HTML-StripScripts-Parser-%{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 * Sat Apr 25 2009 Xavier Bachelot 1.00-1 - Specfile autogenerated by cpanspec 1.77. - Fix BR:s. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:56:54 -0000 1.1 +++ .cvsignore 3 May 2009 22:21:25 -0000 1.2 @@ -0,0 +1 @@ +HTML-StripScripts-Parser-1.00.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:56:54 -0000 1.1 +++ sources 3 May 2009 22:21:25 -0000 1.2 @@ -0,0 +1 @@ +dace01fae5b82adbf720116068058e06 HTML-StripScripts-Parser-1.00.tar.gz From than at fedoraproject.org Sun May 3 22:21:57 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 22:21:57 +0000 (UTC) Subject: rpms/kdesdk/F-11 .cvsignore, 1.56, 1.57 kdesdk.spec, 1.141, 1.142 sources, 1.58, 1.59 kdesdk-4.2.1-blockquote.patch, 1.2, NONE Message-ID: <20090503222157.BBE6A700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdesdk/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11901 Modified Files: .cvsignore kdesdk.spec sources Removed Files: kdesdk-4.2.1-blockquote.patch Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesdk/F-11/.cvsignore,v retrieving revision 1.56 retrieving revision 1.57 diff -u -p -r1.56 -r1.57 --- .cvsignore 31 Mar 2009 15:36:55 -0000 1.56 +++ .cvsignore 3 May 2009 22:21:27 -0000 1.57 @@ -1 +1,2 @@ kdesdk-4.2.2.tar.bz2 +kdesdk-4.2.3.tar.bz2 Index: kdesdk.spec =================================================================== RCS file: /cvs/extras/rpms/kdesdk/F-11/kdesdk.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -p -r1.141 -r1.142 --- kdesdk.spec 1 Apr 2009 19:11:49 -0000 1.141 +++ kdesdk.spec 3 May 2009 22:21:27 -0000 1.142 @@ -1,6 +1,6 @@ Name: kdesdk -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) Group: User Interface/Desktops @@ -11,7 +11,6 @@ Source0: ftp://ftp.kde.org/pub/kd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # upstreamable patches -Patch50: kdesdk-4.2.1-blockquote.patch BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: plasma-devel >= %{version} @@ -77,8 +76,6 @@ xml2pot %prep %setup -q -%patch50 -p1 -b .blockquote - %build mkdir -p %{_target_platform} @@ -226,6 +223,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesdk/F-11/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- sources 31 Mar 2009 15:36:55 -0000 1.58 +++ sources 3 May 2009 22:21:27 -0000 1.59 @@ -1 +1 @@ -018767d862229899f4a648a6c36fd0f6 kdesdk-4.2.2.tar.bz2 +a69a3199da0707dc9c2abaf357b341cb kdesdk-4.2.3.tar.bz2 --- kdesdk-4.2.1-blockquote.patch DELETED --- From than at fedoraproject.org Sun May 3 22:24:01 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 22:24:01 +0000 (UTC) Subject: rpms/kdetoys/F-11 .cvsignore, 1.33, 1.34 kdetoys.spec, 1.50, 1.51 sources, 1.31, 1.32 Message-ID: <20090503222401.1A75E700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdetoys/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12336 Modified Files: .cvsignore kdetoys.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdetoys/F-11/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- .cvsignore 31 Mar 2009 15:39:10 -0000 1.33 +++ .cvsignore 3 May 2009 22:23:30 -0000 1.34 @@ -1 +1,2 @@ kdetoys-4.2.2.tar.bz2 +kdetoys-4.2.3.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/extras/rpms/kdetoys/F-11/kdetoys.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- kdetoys.spec 1 Apr 2009 19:15:14 -0000 1.50 +++ kdetoys.spec 3 May 2009 22:23:30 -0000 1.51 @@ -1,8 +1,8 @@ Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 Group: Amusements/Graphics @@ -89,6 +89,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/F-11/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- sources 31 Mar 2009 15:39:11 -0000 1.31 +++ sources 3 May 2009 22:23:30 -0000 1.32 @@ -1 +1 @@ -dcc17b3d719c7ddb48f75b64f34af261 kdetoys-4.2.2.tar.bz2 +5548b13e12ba84230bda3f6d972afaa0 kdetoys-4.2.3.tar.bz2 From than at fedoraproject.org Sun May 3 22:26:48 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 3 May 2009 22:26:48 +0000 (UTC) Subject: rpms/kdeutils/F-11 .cvsignore, 1.61, 1.62 kdeutils.spec, 1.174, 1.175 sources, 1.62, 1.63 kdeutils-4.2.2-ark.patch, 1.1, NONE Message-ID: <20090503222648.4FBC2700DA@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdeutils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12952 Modified Files: .cvsignore kdeutils.spec sources Removed Files: kdeutils-4.2.2-ark.patch Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-11/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- .cvsignore 31 Mar 2009 15:44:42 -0000 1.61 +++ .cvsignore 3 May 2009 22:26:17 -0000 1.62 @@ -1 +1,2 @@ kdeutils-4.2.2.tar.bz2 +kdeutils-4.2.3.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-11/kdeutils.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -p -r1.174 -r1.175 --- kdeutils.spec 16 Apr 2009 16:03:31 -0000 1.174 +++ kdeutils.spec 3 May 2009 22:26:17 -0000 1.175 @@ -5,8 +5,8 @@ Name: kdeutils Epoch: 6 -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -20,7 +20,6 @@ Patch0: kdeutils-4.2.0-kjots-wit %endif Patch1: kdeutils-4.2.2-pykde4.patch # upstream fixes -Patch100: kdeutils-4.2.2-ark.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -97,7 +96,6 @@ rm -rf kdepim-%{version} %patch1 -p1 -b .pykde4 # upstream fixes -%patch100 -p1 -b .ark %build @@ -202,6 +200,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Thu Apr 16 2009 Rex Dieter - 4.2.2-4 - revert -printer-applet dep changes (and drop for f11+) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-11/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- sources 31 Mar 2009 15:44:42 -0000 1.62 +++ sources 3 May 2009 22:26:17 -0000 1.63 @@ -1 +1,2 @@ 3df5186f9dacddbce48a1c7eb35515cd kdeutils-4.2.2.tar.bz2 +8fddacea28f6c0a6c2ac2462750b7e50 kdeutils-4.2.3.tar.bz2 --- kdeutils-4.2.2-ark.patch DELETED --- From rrankin at fedoraproject.org Sun May 3 22:28:39 2009 From: rrankin at fedoraproject.org (Roy Rankin) Date: Sun, 3 May 2009 22:28:39 +0000 (UTC) Subject: rpms/gputils/F-10 .cvsignore, 1.6, 1.7 gputils.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <20090503222839.41751700DA@cvs1.fedora.phx.redhat.com> Author: rrankin Update of /cvs/pkgs/rpms/gputils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13233 Modified Files: .cvsignore gputils.spec sources Log Message: New upstream version 0.13.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gputils/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 15 Sep 2008 01:32:57 -0000 1.6 +++ .cvsignore 3 May 2009 22:28:08 -0000 1.7 @@ -1 +1 @@ -gputils-0.13.6.tar.gz +gputils-0.13.7.tar.gz Index: gputils.spec =================================================================== RCS file: /cvs/pkgs/rpms/gputils/F-10/gputils.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- gputils.spec 15 Sep 2008 01:32:57 -0000 1.15 +++ gputils.spec 3 May 2009 22:28:08 -0000 1.16 @@ -1,5 +1,5 @@ Name: gputils -Version: 0.13.6 +Version: 0.13.7 Release: 1%{?dist} Summary: Development utilities for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Outils de d??veloppement pour les microcontr??leurs PIC (TM) de Microchip (TM) @@ -52,6 +52,15 @@ Voir la documentation pour une liste ?? %{_mandir}/fr/man1/* %changelog +* Mon May 04 2009 Roy Rankin 0.13.7-1 + - New upstream version with + Added support for all processors supported by MPLAB 8.20 (except eeprom16 and related). + Added support for "LIST M=?" directive. + Fixed several bugs. + +* Tue Feb 24 2009 Fedora Release Engineering - 0.13.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Sep 15 2008 Roy Rankin 0.13.6-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gputils/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 15 Sep 2008 01:32:57 -0000 1.6 +++ sources 3 May 2009 22:28:08 -0000 1.7 @@ -1 +1 @@ -a95744578c6f7d616235434be1dc3603 gputils-0.13.6.tar.gz +242e33919e9c318d6ac58b6db291d20e gputils-0.13.7.tar.gz From transif at fedoraproject.org Sun May 3 23:40:30 2009 From: transif at fedoraproject.org (Transifex System User) Date: Sun, 3 May 2009 23:40:30 +0000 (UTC) Subject: comps/po pt.po,1.19,1.20 Message-ID: <20090503234030.61ED7700DA@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23237/po Modified Files: pt.po Log Message: Sending translation for Portuguese View full diff with command: /usr/bin/cvs -f diff -kk -u -p -N -r 1.19 -r 1.20 pt.po Index: pt.po =================================================================== RCS file: /cvs/pkgs/comps/po/pt.po,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- pt.po 29 Apr 2009 20:00:22 -0000 1.19 +++ pt.po 3 May 2009 23:39:57 -0000 1.20 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: comps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-03-30 01:38+0100\n" +"POT-Creation-Date: 2009-05-03 19:10+0000\n" +"PO-Revision-Date: 2009-05-04 00:43+0100\n" "Last-Translator: Rui Gouveia \n" "Language-Team: pt \n" "MIME-Version: 1.0\n" @@ -50,198 +50,320 @@ msgstr "" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\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 ../comps-f11.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 +#: ../comps-f11.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "Um ambiente de trabalho leve que funciona em m??quinas lentas." -#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.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:3 +#: ../comps-f11.xml.in.h:3 +#: ../comps-el4.xml.in.h:1 #: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Ferramentas de Administra????o" -#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 -#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4 +#: ../comps-f7.xml.in.h:3 +#: ../comps-f8.xml.in.h:3 +#: ../comps-f9.xml.in.h:3 +#: ../comps-f10.xml.in.h:4 +#: ../comps-f11.xml.in.h:4 msgid "Afrikaans Support" msgstr "Suporte a Afrikaans" -#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 -#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5 +#: ../comps-f7.xml.in.h:4 +#: ../comps-f8.xml.in.h:4 +#: ../comps-f9.xml.in.h:4 +#: ../comps-f10.xml.in.h:5 +#: ../comps-f11.xml.in.h:5 msgid "Albanian Support" msgstr "Suporte a 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:6 ../comps-f11.xml.in.h:7 ../comps-el4.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:6 +#: ../comps-f11.xml.in.h:7 +#: ../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-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 +#: ../comps-f7.xml.in.h:6 +#: ../comps-f8.xml.in.h:6 +#: ../comps-f9.xml.in.h:6 +#: ../comps-f10.xml.in.h:7 +#: ../comps-f11.xml.in.h:8 msgid "Applications to perform a variety of tasks" msgstr "Aplica????es para efectuar 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:8 ../comps-f11.xml.in.h:9 ../comps-el4.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:8 +#: ../comps-f11.xml.in.h:9 +#: ../comps-el4.xml.in.h:4 #: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Suporte a ??rabe" -#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.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:9 +#: ../comps-f11.xml.in.h:10 +#: ../comps-el4.xml.in.h:5 #: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "Suporte a Arm??nio" -#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 -#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 +#: ../comps-f7.xml.in.h:9 +#: ../comps-f8.xml.in.h:9 +#: ../comps-f9.xml.in.h:9 +#: ../comps-f10.xml.in.h:10 +#: ../comps-f11.xml.in.h:11 msgid "Assamese Support" msgstr "Suporte a Assamese" -#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.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:11 +#: ../comps-f11.xml.in.h:12 +#: ../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-f10.xml.in.h:12 ../comps-f11.xml.in.h:14 +#: ../comps-f7.xml.in.h:11 +#: ../comps-f8.xml.in.h:11 +#: ../comps-f9.xml.in.h:11 +#: ../comps-f10.xml.in.h:12 +#: ../comps-f11.xml.in.h:14 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:13 ../comps-f11.xml.in.h:15 ../comps-el4.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:13 +#: ../comps-f11.xml.in.h:15 +#: ../comps-el4.xml.in.h:7 #: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Sistema de Base" -#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 -#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16 +#: ../comps-f7.xml.in.h:13 +#: ../comps-f8.xml.in.h:13 +#: ../comps-f9.xml.in.h:13 +#: ../comps-f10.xml.in.h:14 +#: ../comps-f11.xml.in.h:16 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-f10.xml.in.h:15 ../comps-f11.xml.in.h:17 +#: ../comps-f7.xml.in.h:14 +#: ../comps-f8.xml.in.h:14 +#: ../comps-f9.xml.in.h:14 +#: ../comps-f10.xml.in.h:15 +#: ../comps-f11.xml.in.h:17 msgid "Basque Support" msgstr "Suporte a Basco" -#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 -#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18 +#: ../comps-f7.xml.in.h:15 +#: ../comps-f8.xml.in.h:15 +#: ../comps-f9.xml.in.h:15 +#: ../comps-f10.xml.in.h:16 +#: ../comps-f11.xml.in.h:18 msgid "Belarusian Support" msgstr "Suporte a Bielorrusso" -#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 -#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19 +#: ../comps-f7.xml.in.h:16 +#: ../comps-f8.xml.in.h:16 +#: ../comps-f9.xml.in.h:16 +#: ../comps-f10.xml.in.h:17 +#: ../comps-f11.xml.in.h:19 msgid "Bengali Support" msgstr "Suporte a Bengali" -#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 -#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20 +#: ../comps-f7.xml.in.h:17 +#: ../comps-f8.xml.in.h:17 +#: ../comps-f9.xml.in.h:17 [...2409 lines suppressed...] -#, fuzzy msgid "Maltese Support" -msgstr "Suporte a Malaio" +msgstr "Suporte a Malt??s" #: ../comps-f11.xml.in.h:134 -#, fuzzy msgid "Manx Support" -msgstr "Suporte a Malaio" +msgstr "Suporte a Manx" #: ../comps-f11.xml.in.h:137 msgid "MinGW cross-compiler" @@ -1437,52 +2012,36 @@ msgid "Online Help and Documentation" msgstr "Ajuda e Documenta????o Online" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "Suporte a Espanhol" +msgstr "Suporte a Sanscrito" #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "Suporte a Ucraniano" +msgstr "Suporte a Sardenho" #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" msgstr "Ambientes de Trabalho Sugar" #: ../comps-f11.xml.in.h:183 -msgid "" -"Support for cross-compiling programs to 32 bit Windows targets, testing " -"them, and building installers, all from within Fedora." -msgstr "" -"Suporte para compila????o, testes e instaladores de programas de 32 bits para " -"plataforma Windows, tudo a partir do Fedora." +msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora." +msgstr "Suporte para compila????o, testes e instaladores de programas de 32 bits para plataforma Windows, tudo a partir do Fedora." #: ../comps-f11.xml.in.h:186 -msgid "" -"Support for developing software using the Objective CAML programming " -"language and libraries." -msgstr "" -"Suporte para desenvolver programas na linguagem e bibliotecas de programa????o " -"Objective CAML" +msgid "Support for developing software using the Objective CAML programming language and libraries." +msgstr "Suporte para desenvolver programas na linguagem e bibliotecas de programa????o Objective CAML" #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "Suporte a Swati" +msgstr "Suporte a Swahili" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "Suporte a Telugu" +msgstr "Suporte a Tetum" #: ../comps-f11.xml.in.h:223 -msgid "" -"This group is a collection of tools used in the design, modification, " -"manipulation, and packaging of fonts." -msgstr "" -"Este grupo ?? uma colec????o de ferramentas utilizadas no desenho, modifica????o, " -"manipula????o e cria????o de pacotes de fontes." +msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts." +msgstr "Este grupo ?? uma colec????o de ferramentas utilizadas no desenho, modifica????o, manipula????o e cria????o de pacotes de fontes." #: ../comps-f11.xml.in.h:235 msgid "Turkmen Support" @@ -1492,78 +2051,67 @@ msgstr "Suporte a Turquemeno" msgid "Upper Sorbian Support" msgstr "Suporte a S??rbio Alto" -#: ../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 a Liga????es Telef??nicas" -#: ../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 ?? uma poderosa interface gr??fica que inclui um painel, um ambiente de " -"trabalho, ??cones de sistema e um gestor de ficheiros 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 interface gr??fica poderosa que inclui um painel, um ambiente de " -"trabalho, os ??cones de sistema e um gestor de ficheiros 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 "" -"Normalmente chamados editores de texto, estes programas permite-lhe criar e " -"editar ficheiros. 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 "GNOME ?? uma poderosa interface gr??fica que inclui um painel, um ambiente de trabalho, ??cones de sistema e um gestor de ficheiros 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 interface gr??fica poderosa que inclui um painel, um ambiente de trabalho, os ??cones de sistema e um gestor de ficheiros 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 "Normalmente chamados editores de texto, estes programas permite-lhe criar e editar ficheiros. 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-lhe criar a 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-lhe criar a 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 colec????o de servidores de rede para fins 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." -msgstr "" -"Este grupo ?? uma colec????o de ferramentas e recursos para 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 ?? uma colec????o de ferramentas e recursos para 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 ?? uma colec????o de ferramentas e recursos para ambientes Japoneses." +#: ../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 ?? uma colec????o de ferramentas e recursos para 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 ?? uma colec????o de ferramentas e recursos para 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 ?? uma colec????o de ferramentas e recursos para 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." -msgstr "" -"Este grupo ?? uma colec????o de ferramentas e recursos para ambientes Checos." +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "Este grupo ?? uma colec????o de ferramentas e recursos para ambientes Checos." + From denisarnaud at fedoraproject.org Mon May 4 00:03:52 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:03:52 +0000 (UTC) Subject: rpms/rmol/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rmol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090504000352.C177F700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26137/devel Modified Files: .cvsignore import.log rmol.spec sources Log Message: Synchronisation with upstream (new version 0.20.0). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 14 Apr 2009 20:33:34 -0000 1.2 +++ .cvsignore 4 May 2009 00:03:22 -0000 1.3 @@ -1 +1 @@ -rmol-0.19.0.tar.gz +rmol-0.20.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 14 Apr 2009 20:33:34 -0000 1.1 +++ import.log 4 May 2009 00:03:22 -0000 1.2 @@ -1 +1,2 @@ rmol-0_19_0-1_fc10:HEAD:rmol-0.19.0-1.fc10.src.rpm:1239741024 +rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241395329 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/rmol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rmol.spec 14 Apr 2009 20:33:34 -0000 1.1 +++ rmol.spec 4 May 2009 00:03:22 -0000 1.2 @@ -2,7 +2,7 @@ %define mydocs __tmp_docdir # Name: rmol -Version: 0.19.0 +Version: 0.20.0 Release: 1%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la # chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico @@ -103,6 +103,8 @@ fi %{_bindir}/%{name} %{_libdir}/lib*.so.* %{_mandir}/man3/%{name}.3.* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/samples/*.csv %files devel %defattr(-,root,root,-) @@ -121,6 +123,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-1 +- Upstream integration + * Sun Mar 25 2009 Denis Arnaud 0.19.0-1 - RPM release for Fedora 10 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 14 Apr 2009 20:33:34 -0000 1.2 +++ sources 4 May 2009 00:03:22 -0000 1.3 @@ -1 +1 @@ -6d124af07a5cea807f47acab699a38c5 rmol-0.19.0.tar.gz +1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:06:07 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:06:07 +0000 (UTC) Subject: rpms/rmol/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rmol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090504000607.B14A6700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26568/F-10 Modified Files: .cvsignore import.log rmol.spec sources Log Message: Synchronised with the new upstream version (0.20.0). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 14 Apr 2009 20:50:15 -0000 1.2 +++ .cvsignore 4 May 2009 00:05:37 -0000 1.3 @@ -1 +1 @@ -rmol-0.19.0.tar.gz +rmol-0.20.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 14 Apr 2009 20:50:15 -0000 1.1 +++ import.log 4 May 2009 00:05:37 -0000 1.2 @@ -1 +1,2 @@ rmol-0_19_0-1_fc10:F-10:rmol-0.19.0-1.fc10.src.rpm:1239742169 +rmol-0_20_0-1_fc10:F-10:rmol-0.20.0-1.fc10.src.rpm:1241395493 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/rmol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rmol.spec 14 Apr 2009 20:50:15 -0000 1.1 +++ rmol.spec 4 May 2009 00:05:37 -0000 1.2 @@ -2,7 +2,7 @@ %define mydocs __tmp_docdir # Name: rmol -Version: 0.19.0 +Version: 0.20.0 Release: 1%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la # chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico @@ -103,6 +103,8 @@ fi %{_bindir}/%{name} %{_libdir}/lib*.so.* %{_mandir}/man3/%{name}.3.* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/samples/*.csv %files devel %defattr(-,root,root,-) @@ -121,6 +123,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-1 +- Upstream integration + * Sun Mar 25 2009 Denis Arnaud 0.19.0-1 - RPM release for Fedora 10 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 14 Apr 2009 20:50:15 -0000 1.2 +++ sources 4 May 2009 00:05:37 -0000 1.3 @@ -1 +1 @@ -6d124af07a5cea807f47acab699a38c5 rmol-0.19.0.tar.gz +1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:07:42 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:07:42 +0000 (UTC) Subject: rpms/rmol/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rmol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090504000742.49999700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26967/F-11 Modified Files: .cvsignore import.log rmol.spec sources Log Message: Synchronised with the new upstream version (0.20.0). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 14 Apr 2009 20:52:33 -0000 1.2 +++ .cvsignore 4 May 2009 00:07:11 -0000 1.3 @@ -1 +1 @@ -rmol-0.19.0.tar.gz +rmol-0.20.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 14 Apr 2009 20:52:33 -0000 1.1 +++ import.log 4 May 2009 00:07:11 -0000 1.2 @@ -1 +1,2 @@ rmol-0_19_0-1_fc10:F-11:rmol-0.19.0-1.fc10.src.rpm:1239742308 +rmol-0_20_0-1_fc10:F-11:rmol-0.20.0-1.fc10.src.rpm:1241395605 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/rmol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rmol.spec 14 Apr 2009 20:52:34 -0000 1.1 +++ rmol.spec 4 May 2009 00:07:12 -0000 1.2 @@ -2,7 +2,7 @@ %define mydocs __tmp_docdir # Name: rmol -Version: 0.19.0 +Version: 0.20.0 Release: 1%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la # chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico @@ -103,6 +103,8 @@ fi %{_bindir}/%{name} %{_libdir}/lib*.so.* %{_mandir}/man3/%{name}.3.* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/samples/*.csv %files devel %defattr(-,root,root,-) @@ -121,6 +123,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-1 +- Upstream integration + * Sun Mar 25 2009 Denis Arnaud 0.19.0-1 - RPM release for Fedora 10 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 14 Apr 2009 20:52:34 -0000 1.2 +++ sources 4 May 2009 00:07:12 -0000 1.3 @@ -1 +1 @@ -6d124af07a5cea807f47acab699a38c5 rmol-0.19.0.tar.gz +1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:09:10 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:09:10 +0000 (UTC) Subject: rpms/rmol/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rmol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090504000910.D6FBE700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27266/F-9 Modified Files: .cvsignore import.log rmol.spec sources Log Message: Synchronised with the new upstream version (0.20.0). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 14 Apr 2009 20:47:44 -0000 1.2 +++ .cvsignore 4 May 2009 00:08:40 -0000 1.3 @@ -1 +1 @@ -rmol-0.19.0.tar.gz +rmol-0.20.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 14 Apr 2009 20:47:45 -0000 1.1 +++ import.log 4 May 2009 00:08:40 -0000 1.2 @@ -1 +1,2 @@ rmol-0_19_0-1_fc10:F-9:rmol-0.19.0-1.fc10.src.rpm:1239741478 +rmol-0_20_0-1_fc10:F-9:rmol-0.20.0-1.fc10.src.rpm:1241395692 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/rmol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rmol.spec 14 Apr 2009 20:47:45 -0000 1.1 +++ rmol.spec 4 May 2009 00:08:40 -0000 1.2 @@ -2,7 +2,7 @@ %define mydocs __tmp_docdir # Name: rmol -Version: 0.19.0 +Version: 0.20.0 Release: 1%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la # chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico @@ -103,6 +103,8 @@ fi %{_bindir}/%{name} %{_libdir}/lib*.so.* %{_mandir}/man3/%{name}.3.* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/samples/*.csv %files devel %defattr(-,root,root,-) @@ -121,6 +123,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-1 +- Upstream integration + * Sun Mar 25 2009 Denis Arnaud 0.19.0-1 - RPM release for Fedora 10 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 14 Apr 2009 20:47:45 -0000 1.2 +++ sources 4 May 2009 00:08:40 -0000 1.3 @@ -1 +1 @@ -6d124af07a5cea807f47acab699a38c5 rmol-0.19.0.tar.gz +1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:11:02 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:11:02 +0000 (UTC) Subject: rpms/rmol/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rmol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090504001102.F0A2B700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27576/EL-5 Modified Files: .cvsignore import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 14 Apr 2009 20:57:41 -0000 1.2 +++ .cvsignore 4 May 2009 00:10:31 -0000 1.3 @@ -1 +1 @@ -rmol-0.19.0.tar.gz +rmol-0.20.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 14 Apr 2009 20:57:41 -0000 1.1 +++ import.log 4 May 2009 00:10:32 -0000 1.2 @@ -1 +1,2 @@ rmol-0_19_0-1_fc10:EL-5:rmol-0.19.0-1.fc10.src.rpm:1239742618 +rmol-0_20_0-1_fc10:EL-5:rmol-0.20.0-1.fc10.src.rpm:1241395787 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/rmol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rmol.spec 14 Apr 2009 20:57:41 -0000 1.1 +++ rmol.spec 4 May 2009 00:10:32 -0000 1.2 @@ -2,7 +2,7 @@ %define mydocs __tmp_docdir # Name: rmol -Version: 0.19.0 +Version: 0.20.0 Release: 1%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la # chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico @@ -103,6 +103,8 @@ fi %{_bindir}/%{name} %{_libdir}/lib*.so.* %{_mandir}/man3/%{name}.3.* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/samples/*.csv %files devel %defattr(-,root,root,-) @@ -121,6 +123,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-1 +- Upstream integration + * Sun Mar 25 2009 Denis Arnaud 0.19.0-1 - RPM release for Fedora 10 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 14 Apr 2009 20:57:41 -0000 1.2 +++ sources 4 May 2009 00:10:32 -0000 1.3 @@ -1 +1 @@ -6d124af07a5cea807f47acab699a38c5 rmol-0.19.0.tar.gz +1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:12:34 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:12:34 +0000 (UTC) Subject: rpms/rmol/EL-4 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rmol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090504001234.ADA05700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27969/EL-4 Modified Files: .cvsignore import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 14 Apr 2009 20:55:42 -0000 1.2 +++ .cvsignore 4 May 2009 00:12:04 -0000 1.3 @@ -1 +1 @@ -rmol-0.19.0.tar.gz +rmol-0.20.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 14 Apr 2009 20:55:42 -0000 1.1 +++ import.log 4 May 2009 00:12:04 -0000 1.2 @@ -1 +1,2 @@ rmol-0_19_0-1_fc10:EL-4:rmol-0.19.0-1.fc10.src.rpm:1239742482 +rmol-0_20_0-1_fc10:EL-4:rmol-0.20.0-1.fc10.src.rpm:1241395895 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/rmol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rmol.spec 14 Apr 2009 20:55:42 -0000 1.1 +++ rmol.spec 4 May 2009 00:12:04 -0000 1.2 @@ -2,7 +2,7 @@ %define mydocs __tmp_docdir # Name: rmol -Version: 0.19.0 +Version: 0.20.0 Release: 1%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la # chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico @@ -103,6 +103,8 @@ fi %{_bindir}/%{name} %{_libdir}/lib*.so.* %{_mandir}/man3/%{name}.3.* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/samples/*.csv %files devel %defattr(-,root,root,-) @@ -121,6 +123,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-1 +- Upstream integration + * Sun Mar 25 2009 Denis Arnaud 0.19.0-1 - RPM release for Fedora 10 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 14 Apr 2009 20:55:42 -0000 1.2 +++ sources 4 May 2009 00:12:04 -0000 1.3 @@ -1 +1 @@ -6d124af07a5cea807f47acab699a38c5 rmol-0.19.0.tar.gz +1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:23:19 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:23:19 +0000 (UTC) Subject: rpms/rmol/devel import.log,1.2,1.3 sources,1.3,1.4 Message-ID: <20090504002319.639DA700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29918/devel Modified Files: import.log sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 4 May 2009 00:03:22 -0000 1.2 +++ import.log 4 May 2009 00:22:49 -0000 1.3 @@ -1,2 +1,3 @@ rmol-0_19_0-1_fc10:HEAD:rmol-0.19.0-1.fc10.src.rpm:1239741024 rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241395329 +rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241396502 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 May 2009 00:03:22 -0000 1.3 +++ sources 4 May 2009 00:22:49 -0000 1.4 @@ -1 +1 @@ -1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz +350e73b0e5cd714a2deec11702fbc314 rmol-0.20.0.tar.gz From rdieter at fedoraproject.org Mon May 4 00:44:35 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 00:44:35 +0000 (UTC) Subject: rpms/qt/devel qt-x11-opensource-src-4.5.1-mysql_config-1.patch, NONE, 1.1 qt.spec, 1.272, 1.273 Message-ID: <20090504004435.8FE65700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32302 Modified Files: qt.spec Added Files: qt-x11-opensource-src-4.5.1-mysql_config-1.patch Log Message: * Sun May 03 2009 Rex Dieter - 4.5.1-8 - fix invalid assumptions about mysql_config --libs (bug #440673) qt-x11-opensource-src-4.5.1-mysql_config-1.patch: --- NEW FILE qt-x11-opensource-src-4.5.1-mysql_config-1.patch --- diff -up qt-x11-opensource-src-4.5.1/configure.rex qt-x11-opensource-src-4.5.1/configure --- qt-x11-opensource-src-4.5.1/configure.rex 2009-04-21 18:57:35.000000000 -0500 +++ qt-x11-opensource-src-4.5.1/configure 2009-05-03 17:46:30.236077416 -0500 @@ -4334,8 +4334,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config` if [ -x "$CFG_MYSQL_CONFIG" ]; then QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` - QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` - QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` + QT_LFLAGS_MYSQL_R="-L`$CFG_MYSQL_CONFIG --plugindir 2>/dev/null`/.. -lmysqlclient_r" + QT_LFLAGS_MYSQL="-L`$CFG_MYSQL_CONFIG --plugindir 2>/dev/null`/.. -lmysqlclient" QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` fi Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -p -r1.272 -r1.273 --- qt.spec 29 Apr 2009 23:52:15 -0000 1.272 +++ qt.spec 4 May 2009 00:44:04 -0000 1.273 @@ -12,7 +12,7 @@ Epoch: 1 Name: qt4 %endif Version: 4.5.1 -Release: 7%{?dist} +Release: 8%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -51,6 +51,11 @@ Patch52: qt-4.5-sparc64.patch # should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint # crash with Qt 4.5 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch +# fix invalid assumptions about mysql_config --libs +# http://bugzilla.redhat.com/440673 +# well, not quite upstreamable yet, not but it's a first try... +# until mysql_config can export a usable linker flags +Patch54: qt-x11-opensource-src-4.5.1-mysql_config-1.patch ## qt-copy patches %define qt_copy 20090424 @@ -347,6 +352,7 @@ test -x apply_patches && ./apply_patches %patch51 -p1 -b .qdoc3 %patch52 -p1 -b .sparc64 %patch53 -p1 -b .qatomic-inline-asm +%patch54 -p1 -b .mysql_config # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -821,6 +827,9 @@ gtk-update-icon-cache -q %{_datadir}/ico %changelog +* Sun May 03 2009 Rex Dieter - 4.5.1-8 +- fix invalid assumptions about mysql_config --libs (bug #440673) + * Wed Apr 29 2009 Rex Dieter - 4.5.1-7 - -devel: Provides: qt4-devel%%{?_isa} ... From denisarnaud at fedoraproject.org Mon May 4 00:44:48 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:44:48 +0000 (UTC) Subject: rpms/rmol/devel import.log, 1.3, 1.4 rmol.spec, 1.2, 1.3 sources, 1.4, 1.5 Message-ID: <20090504004448.1C84F700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32359/devel Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 4 May 2009 00:22:49 -0000 1.3 +++ import.log 4 May 2009 00:44:17 -0000 1.4 @@ -1,3 +1,4 @@ rmol-0_19_0-1_fc10:HEAD:rmol-0.19.0-1.fc10.src.rpm:1239741024 rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241395329 rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241396502 +rmol-0_20_0-2_fc10:HEAD:rmol-0.20.0-2.fc10.src.rpm:1241397825 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/rmol.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- rmol.spec 4 May 2009 00:03:22 -0000 1.2 +++ rmol.spec 4 May 2009 00:44:17 -0000 1.3 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 +BuildRequires: libicu-devel #Requires: %description @@ -123,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-2 +- Added dependency on libicu-devel for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 4 May 2009 00:22:49 -0000 1.4 +++ sources 4 May 2009 00:44:17 -0000 1.5 @@ -1 +1 @@ -350e73b0e5cd714a2deec11702fbc314 rmol-0.20.0.tar.gz +9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:46:22 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:46:22 +0000 (UTC) Subject: rpms/rmol/F-11 import.log, 1.2, 1.3 rmol.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090504004622.0565D700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32766/F-11 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 4 May 2009 00:07:11 -0000 1.2 +++ import.log 4 May 2009 00:45:51 -0000 1.3 @@ -1,2 +1,3 @@ rmol-0_19_0-1_fc10:F-11:rmol-0.19.0-1.fc10.src.rpm:1239742308 rmol-0_20_0-1_fc10:F-11:rmol-0.20.0-1.fc10.src.rpm:1241395605 +rmol-0_20_0-2_fc10:F-11:rmol-0.20.0-2.fc10.src.rpm:1241397927 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/rmol.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- rmol.spec 4 May 2009 00:07:12 -0000 1.2 +++ rmol.spec 4 May 2009 00:45:51 -0000 1.3 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 +BuildRequires: libicu-devel #Requires: %description @@ -123,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-2 +- Added dependency on libicu-devel for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 May 2009 00:07:12 -0000 1.3 +++ sources 4 May 2009 00:45:51 -0000 1.4 @@ -1 +1 @@ -1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz +9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:47:48 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:47:48 +0000 (UTC) Subject: rpms/rmol/F-10 import.log, 1.2, 1.3 rmol.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090504004748.98A50700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv882/F-10 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 4 May 2009 00:05:37 -0000 1.2 +++ import.log 4 May 2009 00:47:18 -0000 1.3 @@ -1,2 +1,3 @@ rmol-0_19_0-1_fc10:F-10:rmol-0.19.0-1.fc10.src.rpm:1239742169 rmol-0_20_0-1_fc10:F-10:rmol-0.20.0-1.fc10.src.rpm:1241395493 +rmol-0_20_0-2_fc10:F-10:rmol-0.20.0-2.fc10.src.rpm:1241398013 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/rmol.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- rmol.spec 4 May 2009 00:05:37 -0000 1.2 +++ rmol.spec 4 May 2009 00:47:18 -0000 1.3 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 +BuildRequires: libicu-devel #Requires: %description @@ -123,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-2 +- Added dependency on libicu-devel for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 May 2009 00:05:37 -0000 1.3 +++ sources 4 May 2009 00:47:18 -0000 1.4 @@ -1 +1 @@ -1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz +9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:49:18 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:49:18 +0000 (UTC) Subject: rpms/rmol/F-9 import.log,1.2,1.3 rmol.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <20090504004918.5E9D0700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1722/F-9 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 4 May 2009 00:08:40 -0000 1.2 +++ import.log 4 May 2009 00:48:48 -0000 1.3 @@ -1,2 +1,3 @@ rmol-0_19_0-1_fc10:F-9:rmol-0.19.0-1.fc10.src.rpm:1239741478 rmol-0_20_0-1_fc10:F-9:rmol-0.20.0-1.fc10.src.rpm:1241395692 +rmol-0_20_0-2_fc10:F-9:rmol-0.20.0-2.fc10.src.rpm:1241398101 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/rmol.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- rmol.spec 4 May 2009 00:08:40 -0000 1.2 +++ rmol.spec 4 May 2009 00:48:48 -0000 1.3 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 +BuildRequires: libicu-devel #Requires: %description @@ -123,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-2 +- Added dependency on libicu-devel for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 May 2009 00:08:40 -0000 1.3 +++ sources 4 May 2009 00:48:48 -0000 1.4 @@ -1 +1 @@ -1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz +9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:50:45 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:50:45 +0000 (UTC) Subject: rpms/rmol/EL-5 import.log, 1.2, 1.3 rmol.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090504005045.81684700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1962/EL-5 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 4 May 2009 00:10:32 -0000 1.2 +++ import.log 4 May 2009 00:50:15 -0000 1.3 @@ -1,2 +1,3 @@ rmol-0_19_0-1_fc10:EL-5:rmol-0.19.0-1.fc10.src.rpm:1239742618 rmol-0_20_0-1_fc10:EL-5:rmol-0.20.0-1.fc10.src.rpm:1241395787 +rmol-0_20_0-2_fc10:EL-5:rmol-0.20.0-2.fc10.src.rpm:1241398190 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/rmol.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- rmol.spec 4 May 2009 00:10:32 -0000 1.2 +++ rmol.spec 4 May 2009 00:50:15 -0000 1.3 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 +BuildRequires: libicu-devel #Requires: %description @@ -123,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-2 +- Added dependency on libicu-devel for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 May 2009 00:10:32 -0000 1.3 +++ sources 4 May 2009 00:50:15 -0000 1.4 @@ -1 +1 @@ -1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz +9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 00:52:21 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 00:52:21 +0000 (UTC) Subject: rpms/rmol/EL-4 import.log, 1.2, 1.3 rmol.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090504005221.05895700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2266/EL-4 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 4 May 2009 00:12:04 -0000 1.2 +++ import.log 4 May 2009 00:51:50 -0000 1.3 @@ -1,2 +1,3 @@ rmol-0_19_0-1_fc10:EL-4:rmol-0.19.0-1.fc10.src.rpm:1239742482 rmol-0_20_0-1_fc10:EL-4:rmol-0.20.0-1.fc10.src.rpm:1241395895 +rmol-0_20_0-2_fc10:EL-4:rmol-0.20.0-2.fc10.src.rpm:1241398272 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/rmol.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- rmol.spec 4 May 2009 00:12:04 -0000 1.2 +++ rmol.spec 4 May 2009 00:51:50 -0000 1.3 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 +BuildRequires: libicu-devel #Requires: %description @@ -123,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-2 +- Added dependency on libicu-devel for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-1 - Upstream integration Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 May 2009 00:12:04 -0000 1.3 +++ sources 4 May 2009 00:51:50 -0000 1.4 @@ -1 +1 @@ -1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz +9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 01:00:15 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 01:00:15 +0000 (UTC) Subject: rpms/rmol/devel import.log, 1.4, 1.5 rmol.spec, 1.3, 1.4 sources, 1.5, 1.6 Message-ID: <20090504010015.510E2700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3446/devel Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-3 - Added dependency on libicu for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- import.log 4 May 2009 00:44:17 -0000 1.4 +++ import.log 4 May 2009 00:59:44 -0000 1.5 @@ -2,3 +2,4 @@ rmol-0_19_0-1_fc10:HEAD:rmol-0.19.0-1.fc rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241395329 rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241396502 rmol-0_20_0-2_fc10:HEAD:rmol-0.20.0-2.fc10.src.rpm:1241397825 +rmol-0_20_0-3_fc10:HEAD:rmol-0.20.0-3.fc10.src.rpm:1241398758 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/rmol.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- rmol.spec 4 May 2009 00:44:17 -0000 1.3 +++ rmol.spec 4 May 2009 00:59:44 -0000 1.4 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 -BuildRequires: libicu-devel +BuildRequires: libicu #Requires: %description @@ -124,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-3 +- Added dependency on libicu for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 4 May 2009 00:44:17 -0000 1.5 +++ sources 4 May 2009 00:59:44 -0000 1.6 @@ -1 +1 @@ -9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz +54a9a51ff3dc9a1990e924068c807304 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 01:02:06 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 01:02:06 +0000 (UTC) Subject: rpms/rmol/F-11 import.log, 1.3, 1.4 rmol.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090504010206.3BAFF700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3894/F-11 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-3 - Added dependency on libicu for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 4 May 2009 00:45:51 -0000 1.3 +++ import.log 4 May 2009 01:01:35 -0000 1.4 @@ -1,3 +1,4 @@ rmol-0_19_0-1_fc10:F-11:rmol-0.19.0-1.fc10.src.rpm:1239742308 rmol-0_20_0-1_fc10:F-11:rmol-0.20.0-1.fc10.src.rpm:1241395605 rmol-0_20_0-2_fc10:F-11:rmol-0.20.0-2.fc10.src.rpm:1241397927 +rmol-0_20_0-3_fc10:F-11:rmol-0.20.0-3.fc10.src.rpm:1241398864 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/rmol.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- rmol.spec 4 May 2009 00:45:51 -0000 1.3 +++ rmol.spec 4 May 2009 01:01:35 -0000 1.4 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 -BuildRequires: libicu-devel +BuildRequires: libicu #Requires: %description @@ -124,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-3 +- Added dependency on libicu for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 4 May 2009 00:45:51 -0000 1.4 +++ sources 4 May 2009 01:01:35 -0000 1.5 @@ -1 +1 @@ -9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz +54a9a51ff3dc9a1990e924068c807304 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 01:03:36 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 01:03:36 +0000 (UTC) Subject: rpms/rmol/F-10 import.log, 1.3, 1.4 rmol.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090504010336.0DD1E700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4267/F-10 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-3 - Added dependency on libicu for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 4 May 2009 00:47:18 -0000 1.3 +++ import.log 4 May 2009 01:03:05 -0000 1.4 @@ -1,3 +1,4 @@ rmol-0_19_0-1_fc10:F-10:rmol-0.19.0-1.fc10.src.rpm:1239742169 rmol-0_20_0-1_fc10:F-10:rmol-0.20.0-1.fc10.src.rpm:1241395493 rmol-0_20_0-2_fc10:F-10:rmol-0.20.0-2.fc10.src.rpm:1241398013 +rmol-0_20_0-3_fc10:F-10:rmol-0.20.0-3.fc10.src.rpm:1241398959 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/rmol.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- rmol.spec 4 May 2009 00:47:18 -0000 1.3 +++ rmol.spec 4 May 2009 01:03:05 -0000 1.4 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 -BuildRequires: libicu-devel +BuildRequires: libicu #Requires: %description @@ -124,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-3 +- Added dependency on libicu for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 4 May 2009 00:47:18 -0000 1.4 +++ sources 4 May 2009 01:03:05 -0000 1.5 @@ -1 +1 @@ -9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz +54a9a51ff3dc9a1990e924068c807304 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 01:05:17 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 01:05:17 +0000 (UTC) Subject: rpms/rmol/F-9 import.log,1.3,1.4 rmol.spec,1.3,1.4 sources,1.4,1.5 Message-ID: <20090504010517.BD9E5700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4600/F-9 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-3 - Added dependency on libicu for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 4 May 2009 00:48:48 -0000 1.3 +++ import.log 4 May 2009 01:04:47 -0000 1.4 @@ -1,3 +1,4 @@ rmol-0_19_0-1_fc10:F-9:rmol-0.19.0-1.fc10.src.rpm:1239741478 rmol-0_20_0-1_fc10:F-9:rmol-0.20.0-1.fc10.src.rpm:1241395692 rmol-0_20_0-2_fc10:F-9:rmol-0.20.0-2.fc10.src.rpm:1241398101 +rmol-0_20_0-3_fc10:F-9:rmol-0.20.0-3.fc10.src.rpm:1241399048 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/rmol.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- rmol.spec 4 May 2009 00:48:48 -0000 1.3 +++ rmol.spec 4 May 2009 01:04:47 -0000 1.4 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 -BuildRequires: libicu-devel +BuildRequires: libicu #Requires: %description @@ -124,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-3 +- Added dependency on libicu for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 4 May 2009 00:48:48 -0000 1.4 +++ sources 4 May 2009 01:04:47 -0000 1.5 @@ -1 +1 @@ -9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz +54a9a51ff3dc9a1990e924068c807304 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 01:07:46 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 01:07:46 +0000 (UTC) Subject: rpms/rmol/EL-5 import.log, 1.3, 1.4 rmol.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090504010746.A6A81700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5060/EL-5 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-3 - Added dependency on libicu for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 4 May 2009 00:50:15 -0000 1.3 +++ import.log 4 May 2009 01:07:16 -0000 1.4 @@ -1,3 +1,4 @@ rmol-0_19_0-1_fc10:EL-5:rmol-0.19.0-1.fc10.src.rpm:1239742618 rmol-0_20_0-1_fc10:EL-5:rmol-0.20.0-1.fc10.src.rpm:1241395787 rmol-0_20_0-2_fc10:EL-5:rmol-0.20.0-2.fc10.src.rpm:1241398190 +rmol-0_20_0-3_fc10:EL-5:rmol-0.20.0-3.fc10.src.rpm:1241399191 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/rmol.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- rmol.spec 4 May 2009 00:50:15 -0000 1.3 +++ rmol.spec 4 May 2009 01:07:16 -0000 1.4 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 -BuildRequires: libicu-devel +BuildRequires: libicu #Requires: %description @@ -124,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-3 +- Added dependency on libicu for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 4 May 2009 00:50:15 -0000 1.4 +++ sources 4 May 2009 01:07:16 -0000 1.5 @@ -1 +1 @@ -9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz +54a9a51ff3dc9a1990e924068c807304 rmol-0.20.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 01:09:43 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 01:09:43 +0000 (UTC) Subject: rpms/rmol/EL-4 import.log, 1.3, 1.4 rmol.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090504010943.56AE1700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/rmol/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5509/EL-4 Modified Files: import.log rmol.spec sources Log Message: * Sun May 03 2009 Denis Arnaud 0.20.0-3 - Added dependency on libicu for Boost 1.37 (Fedora 11) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 4 May 2009 00:51:50 -0000 1.3 +++ import.log 4 May 2009 01:09:12 -0000 1.4 @@ -1,3 +1,4 @@ rmol-0_19_0-1_fc10:EL-4:rmol-0.19.0-1.fc10.src.rpm:1239742482 rmol-0_20_0-1_fc10:EL-4:rmol-0.20.0-1.fc10.src.rpm:1241395895 rmol-0_20_0-2_fc10:EL-4:rmol-0.20.0-2.fc10.src.rpm:1241398272 +rmol-0_20_0-3_fc10:EL-4:rmol-0.20.0-3.fc10.src.rpm:1241399310 Index: rmol.spec =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/rmol.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- rmol.spec 4 May 2009 00:51:50 -0000 1.3 +++ rmol.spec 4 May 2009 01:09:12 -0000 1.4 @@ -3,7 +3,7 @@ # Name: rmol Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: gsl-devel >= 1.8 BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 -BuildRequires: libicu-devel +BuildRequires: libicu #Requires: %description @@ -124,6 +124,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-3 +- Added dependency on libicu for Boost 1.37 (Fedora 11) + * Sun May 03 2009 Denis Arnaud 0.20.0-2 - Added dependency on libicu-devel for Boost 1.37 (Fedora 11) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rmol/EL-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 4 May 2009 00:51:50 -0000 1.4 +++ sources 4 May 2009 01:09:12 -0000 1.5 @@ -1 +1 @@ -9316396dadc710babdecbe78e6df8ee4 rmol-0.20.0.tar.gz +54a9a51ff3dc9a1990e924068c807304 rmol-0.20.0.tar.gz From rrankin at fedoraproject.org Mon May 4 01:14:43 2009 From: rrankin at fedoraproject.org (Roy Rankin) Date: Mon, 4 May 2009 01:14:43 +0000 (UTC) Subject: rpms/gputils/F-11 .cvsignore, 1.6, 1.7 gputils.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <20090504011443.1A62D700DB@cvs1.fedora.phx.redhat.com> Author: rrankin Update of /cvs/pkgs/rpms/gputils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6195 Modified Files: .cvsignore gputils.spec sources Log Message: New upstream version with 0.13.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gputils/F-11/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 15 Sep 2008 01:32:57 -0000 1.6 +++ .cvsignore 4 May 2009 01:14:12 -0000 1.7 @@ -1 +1 @@ -gputils-0.13.6.tar.gz +gputils-0.13.7.tar.gz Index: gputils.spec =================================================================== RCS file: /cvs/pkgs/rpms/gputils/F-11/gputils.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- gputils.spec 25 Feb 2009 00:48:12 -0000 1.16 +++ gputils.spec 4 May 2009 01:14:12 -0000 1.17 @@ -1,6 +1,6 @@ Name: gputils -Version: 0.13.6 -Release: 2%{?dist} +Version: 0.13.7 +Release: 1%{?dist} Summary: Development utilities for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Outils de d??veloppement pour les microcontr??leurs PIC (TM) de Microchip (TM) @@ -52,6 +52,12 @@ Voir la documentation pour une liste ?? %{_mandir}/fr/man1/* %changelog +* Mon May 04 2009 Roy Rankin 0.13.7-1 + - New upstream version with + Added support for all processors supported by MPLAB 8.20 (except eeprom16 and related). + Added support for "LIST M=?" directive. + Fixed several bugs. + * Tue Feb 24 2009 Fedora Release Engineering - 0.13.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gputils/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 15 Sep 2008 01:32:57 -0000 1.6 +++ sources 4 May 2009 01:14:12 -0000 1.7 @@ -1 +1 @@ -a95744578c6f7d616235434be1dc3603 gputils-0.13.6.tar.gz +242e33919e9c318d6ac58b6db291d20e gputils-0.13.7.tar.gz From pkgdb at fedoraproject.org Mon May 4 03:37:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:37:35 +0000 Subject: [pkgdb] compat-guichan07 was added for wart Message-ID: <20090504033735.8CF9210F89F@bastion2.fedora.phx.redhat.com> kevin has added Package compat-guichan07 with summary compatibility libraries for guichan 0.7.1 kevin has approved Package compat-guichan07 kevin has added a Fedora devel branch for compat-guichan07 with an owner of wart kevin has approved compat-guichan07 in Fedora devel kevin has approved Package compat-guichan07 kevin has set commit to Approved for provenpackager on compat-guichan07 (Fedora devel) kevin has set build to Approved for provenpackager on compat-guichan07 (Fedora devel) kevin has set checkout to Approved for provenpackager on compat-guichan07 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/compat-guichan07 From pkgdb at fedoraproject.org Mon May 4 03:37:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:37:37 +0000 Subject: [pkgdb] compat-guichan07 (Fedora, 9) updated by kevin Message-ID: <20090504033737.2FB0B10F8A3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for compat-guichan07 kevin has set commit to Approved for provenpackager on compat-guichan07 (Fedora 9) kevin has set build to Approved for provenpackager on compat-guichan07 (Fedora 9) kevin has set checkout to Approved for provenpackager on compat-guichan07 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/compat-guichan07 From kevin at fedoraproject.org Mon May 4 03:37:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:37:48 +0000 (UTC) Subject: rpms/compat-guichan07 - New directory Message-ID: <20090504033748.8D1AF700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/compat-guichan07 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC24358/rpms/compat-guichan07 Log Message: Directory /cvs/pkgs/rpms/compat-guichan07 added to the repository From kevin at fedoraproject.org Mon May 4 03:37:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:37:48 +0000 (UTC) Subject: rpms/compat-guichan07/devel - New directory Message-ID: <20090504033748.CA69870135@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/compat-guichan07/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC24358/rpms/compat-guichan07/devel Log Message: Directory /cvs/pkgs/rpms/compat-guichan07/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:37:57 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:37:57 +0000 (UTC) Subject: rpms/compat-guichan07 Makefile,NONE,1.1 Message-ID: <20090504033757.C1D85700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/compat-guichan07 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC24358/rpms/compat-guichan07 Added Files: Makefile Log Message: Setup of module compat-guichan07 --- NEW FILE Makefile --- # Top level Makefile for module compat-guichan07 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 kevin at fedoraproject.org Mon May 4 03:37:58 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:37:58 +0000 (UTC) Subject: rpms/compat-guichan07/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504033758.2AE3F700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/compat-guichan07/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC24358/rpms/compat-guichan07/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module compat-guichan07 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: compat-guichan07 # $Id: Makefile,v 1.1 2009/05/04 03:37:57 kevin Exp $ NAME := compat-guichan07 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 pkgdb at fedoraproject.org Mon May 4 03:39:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:39:33 +0000 Subject: [pkgdb] xcowsay was added for manawy Message-ID: <20090504033933.6CB2C10F893@bastion2.fedora.phx.redhat.com> kevin has added Package xcowsay with summary xcowsay displays a cute cow and message on your desktop kevin has approved Package xcowsay kevin has added a Fedora devel branch for xcowsay with an owner of manawy kevin has approved xcowsay in Fedora devel kevin has approved Package xcowsay kevin has set commit to Approved for provenpackager on xcowsay (Fedora devel) kevin has set build to Approved for provenpackager on xcowsay (Fedora devel) kevin has set checkout to Approved for provenpackager on xcowsay (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xcowsay From pkgdb at fedoraproject.org Mon May 4 03:39:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:39:34 +0000 Subject: [pkgdb] xcowsay (Fedora, 10) updated by kevin Message-ID: <20090504033934.B733110F89E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for xcowsay kevin has set commit to Approved for provenpackager on xcowsay (Fedora 10) kevin has set build to Approved for provenpackager on xcowsay (Fedora 10) kevin has set checkout to Approved for provenpackager on xcowsay (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xcowsay From pkgdb at fedoraproject.org Mon May 4 03:39:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:39:34 +0000 Subject: [pkgdb] xcowsay (Fedora, 11) updated by kevin Message-ID: <20090504033934.BEA4B10F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for xcowsay kevin has set commit to Approved for provenpackager on xcowsay (Fedora 11) kevin has set build to Approved for provenpackager on xcowsay (Fedora 11) kevin has set checkout to Approved for provenpackager on xcowsay (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xcowsay From kevin at fedoraproject.org Mon May 4 03:39:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:39:46 +0000 (UTC) Subject: rpms/xcowsay - New directory Message-ID: <20090504033946.23463700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xcowsay In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx24568/rpms/xcowsay Log Message: Directory /cvs/pkgs/rpms/xcowsay added to the repository From kevin at fedoraproject.org Mon May 4 03:39:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:39:46 +0000 (UTC) Subject: rpms/xcowsay/devel - New directory Message-ID: <20090504033946.6EC7170139@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xcowsay/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx24568/rpms/xcowsay/devel Log Message: Directory /cvs/pkgs/rpms/xcowsay/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:39:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:39:56 +0000 (UTC) Subject: rpms/xcowsay Makefile,NONE,1.1 Message-ID: <20090504033956.C895C700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xcowsay In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx24568/rpms/xcowsay Added Files: Makefile Log Message: Setup of module xcowsay --- NEW FILE Makefile --- # Top level Makefile for module xcowsay 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 kevin at fedoraproject.org Mon May 4 03:39:57 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:39:57 +0000 (UTC) Subject: rpms/xcowsay/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504033957.7F726700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xcowsay/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx24568/rpms/xcowsay/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xcowsay --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xcowsay # $Id: Makefile,v 1.1 2009/05/04 03:39:57 kevin Exp $ NAME := xcowsay 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 pkgdb at fedoraproject.org Mon May 4 03:41:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:41:31 +0000 Subject: [pkgdb] soci was added for denisarnaud Message-ID: <20090504034131.2F70310F893@bastion2.fedora.phx.redhat.com> kevin has added Package soci with summary The database access library for C++ programmers kevin has approved Package soci kevin has added a Fedora devel branch for soci with an owner of denisarnaud kevin has approved soci in Fedora devel kevin has approved Package soci kevin has set commit to Approved for provenpackager on soci (Fedora devel) kevin has set build to Approved for provenpackager on soci (Fedora devel) kevin has set checkout to Approved for provenpackager on soci (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/soci From pkgdb at fedoraproject.org Mon May 4 03:41:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:41:32 +0000 Subject: [pkgdb] soci (Fedora, 10) updated by kevin Message-ID: <20090504034132.4DFF610F89E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for soci kevin has set commit to Approved for provenpackager on soci (Fedora 10) kevin has set build to Approved for provenpackager on soci (Fedora 10) kevin has set checkout to Approved for provenpackager on soci (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/soci From pkgdb at fedoraproject.org Mon May 4 03:41:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:41:32 +0000 Subject: [pkgdb] soci (Fedora, 11) updated by kevin Message-ID: <20090504034132.58FE110F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for soci kevin has set commit to Approved for provenpackager on soci (Fedora 11) kevin has set build to Approved for provenpackager on soci (Fedora 11) kevin has set checkout to Approved for provenpackager on soci (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/soci From kevin at fedoraproject.org Mon May 4 03:41:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:41:43 +0000 (UTC) Subject: rpms/soci - New directory Message-ID: <20090504034143.24F0D700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/soci In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP24926/rpms/soci Log Message: Directory /cvs/pkgs/rpms/soci added to the repository From kevin at fedoraproject.org Mon May 4 03:41:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:41:43 +0000 (UTC) Subject: rpms/soci/devel - New directory Message-ID: <20090504034143.634D9700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/soci/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP24926/rpms/soci/devel Log Message: Directory /cvs/pkgs/rpms/soci/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:41:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:41:53 +0000 (UTC) Subject: rpms/soci/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504034153.ED53F700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/soci/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP24926/rpms/soci/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module soci --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: soci # $Id: Makefile,v 1.1 2009/05/04 03:41:53 kevin Exp $ NAME := soci 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 kevin at fedoraproject.org Mon May 4 03:41:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:41:53 +0000 (UTC) Subject: rpms/soci Makefile,NONE,1.1 Message-ID: <20090504034153.0C06D700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/soci In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP24926/rpms/soci Added Files: Makefile Log Message: Setup of module soci --- NEW FILE Makefile --- # Top level Makefile for module soci 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 pkgdb at fedoraproject.org Mon May 4 03:41:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:41:32 +0000 Subject: [pkgdb] soci (Fedora EPEL, 5) updated by kevin Message-ID: <20090504034132.61C2110F8A5@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for soci kevin has set commit to Approved for provenpackager on soci (Fedora EPEL 5) kevin has set build to Approved for provenpackager on soci (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on soci (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/soci From pkgdb at fedoraproject.org Mon May 4 03:42:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:42:31 +0000 Subject: [pkgdb] python-cclib was added for jussilehtola Message-ID: <20090504034231.ACEA310F89C@bastion2.fedora.phx.redhat.com> kevin has added Package python-cclib with summary A library for processing results of computational chemistry packages kevin has approved Package python-cclib kevin has added a Fedora devel branch for python-cclib with an owner of jussilehtola kevin has approved python-cclib in Fedora devel kevin has approved Package python-cclib kevin has set commit to Approved for provenpackager on python-cclib (Fedora devel) kevin has set build to Approved for provenpackager on python-cclib (Fedora devel) kevin has set checkout to Approved for provenpackager on python-cclib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cclib From pkgdb at fedoraproject.org Mon May 4 03:42:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:42:33 +0000 Subject: [pkgdb] python-cclib (Fedora, 10) updated by kevin Message-ID: <20090504034233.7013810F8A3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for python-cclib kevin has set commit to Approved for provenpackager on python-cclib (Fedora 10) kevin has set build to Approved for provenpackager on python-cclib (Fedora 10) kevin has set checkout to Approved for provenpackager on python-cclib (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cclib From pkgdb at fedoraproject.org Mon May 4 03:42:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:42:33 +0000 Subject: [pkgdb] python-cclib (Fedora, 11) updated by kevin Message-ID: <20090504034233.7637B10F8A6@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for python-cclib kevin has set commit to Approved for provenpackager on python-cclib (Fedora 11) kevin has set build to Approved for provenpackager on python-cclib (Fedora 11) kevin has set checkout to Approved for provenpackager on python-cclib (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cclib From kevin at fedoraproject.org Mon May 4 03:42:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:42:43 +0000 (UTC) Subject: rpms/python-cclib - New directory Message-ID: <20090504034243.2B906700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-cclib In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn25173/rpms/python-cclib Log Message: Directory /cvs/pkgs/rpms/python-cclib added to the repository From kevin at fedoraproject.org Mon May 4 03:42:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:42:43 +0000 (UTC) Subject: rpms/python-cclib/devel - New directory Message-ID: <20090504034243.67CFB700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-cclib/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn25173/rpms/python-cclib/devel Log Message: Directory /cvs/pkgs/rpms/python-cclib/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:42:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:42:52 +0000 (UTC) Subject: rpms/python-cclib Makefile,NONE,1.1 Message-ID: <20090504034252.3F542700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-cclib In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn25173/rpms/python-cclib Added Files: Makefile Log Message: Setup of module python-cclib --- NEW FILE Makefile --- # Top level Makefile for module python-cclib 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 kevin at fedoraproject.org Mon May 4 03:42:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:42:52 +0000 (UTC) Subject: rpms/python-cclib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504034252.82360700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-cclib/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn25173/rpms/python-cclib/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-cclib --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-cclib # $Id: Makefile,v 1.1 2009/05/04 03:42:52 kevin Exp $ NAME := python-cclib 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 pkgdb at fedoraproject.org Mon May 4 03:43:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:43:23 +0000 Subject: [pkgdb] qmforge was added for jussilehtola Message-ID: <20090504034323.6869210F89D@bastion2.fedora.phx.redhat.com> kevin has added Package qmforge with summary Analysis tools for quantum mechanical calculations kevin has approved Package qmforge kevin has added a Fedora devel branch for qmforge with an owner of jussilehtola kevin has approved qmforge in Fedora devel kevin has approved Package qmforge kevin has set commit to Approved for provenpackager on qmforge (Fedora devel) kevin has set build to Approved for provenpackager on qmforge (Fedora devel) kevin has set checkout to Approved for provenpackager on qmforge (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qmforge From pkgdb at fedoraproject.org Mon May 4 03:43:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:43:28 +0000 Subject: [pkgdb] qmforge (Fedora, 11) updated by kevin Message-ID: <20090504034328.39E8D10F8A4@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for qmforge kevin has set commit to Approved for provenpackager on qmforge (Fedora 11) kevin has set build to Approved for provenpackager on qmforge (Fedora 11) kevin has set checkout to Approved for provenpackager on qmforge (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qmforge From pkgdb at fedoraproject.org Mon May 4 03:43:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:43:28 +0000 Subject: [pkgdb] qmforge (Fedora, 10) updated by kevin Message-ID: <20090504034328.2F71A10F8A1@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for qmforge kevin has set commit to Approved for provenpackager on qmforge (Fedora 10) kevin has set build to Approved for provenpackager on qmforge (Fedora 10) kevin has set checkout to Approved for provenpackager on qmforge (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qmforge From kevin at fedoraproject.org Mon May 4 03:43:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:43:37 +0000 (UTC) Subject: rpms/qmforge - New directory Message-ID: <20090504034337.28BD2700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/qmforge In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn25361/rpms/qmforge Log Message: Directory /cvs/pkgs/rpms/qmforge added to the repository From kevin at fedoraproject.org Mon May 4 03:43:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:43:37 +0000 (UTC) Subject: rpms/qmforge/devel - New directory Message-ID: <20090504034337.5EC44700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/qmforge/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn25361/rpms/qmforge/devel Log Message: Directory /cvs/pkgs/rpms/qmforge/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:43:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:43:46 +0000 (UTC) Subject: rpms/qmforge Makefile,NONE,1.1 Message-ID: <20090504034346.75D90700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/qmforge In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn25361/rpms/qmforge Added Files: Makefile Log Message: Setup of module qmforge --- NEW FILE Makefile --- # Top level Makefile for module qmforge 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 kevin at fedoraproject.org Mon May 4 03:43:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:43:46 +0000 (UTC) Subject: rpms/qmforge/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504034346.B411E700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/qmforge/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn25361/rpms/qmforge/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qmforge --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: qmforge # $Id: Makefile,v 1.1 2009/05/04 03:43:46 kevin Exp $ NAME := qmforge 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 pkgdb at fedoraproject.org Mon May 4 03:44:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:44:14 +0000 Subject: [pkgdb] php-pecl-memcached was added for remi Message-ID: <20090504034414.84F0010F89C@bastion2.fedora.phx.redhat.com> kevin has added Package php-pecl-memcached with summary Extension to work with the Memcached caching daemon kevin has approved Package php-pecl-memcached kevin has added a Fedora devel branch for php-pecl-memcached with an owner of remi kevin has approved php-pecl-memcached in Fedora devel kevin has approved Package php-pecl-memcached kevin has set commit to Approved for provenpackager on php-pecl-memcached (Fedora devel) kevin has set build to Approved for provenpackager on php-pecl-memcached (Fedora devel) kevin has set checkout to Approved for provenpackager on php-pecl-memcached (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-memcached From pkgdb at fedoraproject.org Mon May 4 03:44:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:44:16 +0000 Subject: [pkgdb] php-pecl-memcached (Fedora, 10) updated by kevin Message-ID: <20090504034416.D9C8010F89E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for php-pecl-memcached kevin has set commit to Approved for provenpackager on php-pecl-memcached (Fedora 10) kevin has set build to Approved for provenpackager on php-pecl-memcached (Fedora 10) kevin has set checkout to Approved for provenpackager on php-pecl-memcached (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-memcached From pkgdb at fedoraproject.org Mon May 4 03:44:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:44:16 +0000 Subject: [pkgdb] php-pecl-memcached (Fedora, 11) updated by kevin Message-ID: <20090504034416.F236310F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for php-pecl-memcached kevin has set commit to Approved for provenpackager on php-pecl-memcached (Fedora 11) kevin has set build to Approved for provenpackager on php-pecl-memcached (Fedora 11) kevin has set checkout to Approved for provenpackager on php-pecl-memcached (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-memcached From kevin at fedoraproject.org Mon May 4 03:44:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:44:28 +0000 (UTC) Subject: rpms/php-pecl-memcached - New directory Message-ID: <20090504034428.2ECB0700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pecl-memcached In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV25557/rpms/php-pecl-memcached Log Message: Directory /cvs/pkgs/rpms/php-pecl-memcached added to the repository From kevin at fedoraproject.org Mon May 4 03:44:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:44:28 +0000 (UTC) Subject: rpms/php-pecl-memcached/devel - New directory Message-ID: <20090504034428.65FC2700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pecl-memcached/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV25557/rpms/php-pecl-memcached/devel Log Message: Directory /cvs/pkgs/rpms/php-pecl-memcached/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:44:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:44:37 +0000 (UTC) Subject: rpms/php-pecl-memcached Makefile,NONE,1.1 Message-ID: <20090504034437.3422B700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pecl-memcached In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV25557/rpms/php-pecl-memcached Added Files: Makefile Log Message: Setup of module php-pecl-memcached --- NEW FILE Makefile --- # Top level Makefile for module php-pecl-memcached 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 kevin at fedoraproject.org Mon May 4 03:44:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:44:37 +0000 (UTC) Subject: rpms/php-pecl-memcached/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504034437.6CD4370139@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pecl-memcached/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV25557/rpms/php-pecl-memcached/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pecl-memcached --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: php-pecl-memcached # $Id: Makefile,v 1.1 2009/05/04 03:44:37 kevin Exp $ NAME := php-pecl-memcached 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 pkgdb at fedoraproject.org Mon May 4 03:46:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:46:05 +0000 Subject: [pkgdb] gausssum was added for jussilehtola Message-ID: <20090504034606.03A1210F890@bastion2.fedora.phx.redhat.com> kevin has added Package gausssum with summary A GUI application for analysis of output of quantum computations kevin has approved Package gausssum kevin has added a Fedora devel branch for gausssum with an owner of jussilehtola kevin has approved gausssum in Fedora devel kevin has approved Package gausssum kevin has set commit to Approved for provenpackager on gausssum (Fedora devel) kevin has set build to Approved for provenpackager on gausssum (Fedora devel) kevin has set checkout to Approved for provenpackager on gausssum (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gausssum From pkgdb at fedoraproject.org Mon May 4 03:46:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:46:07 +0000 Subject: [pkgdb] gausssum (Fedora, 10) updated by kevin Message-ID: <20090504034607.AFE9310F89D@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for gausssum kevin has set commit to Approved for provenpackager on gausssum (Fedora 10) kevin has set build to Approved for provenpackager on gausssum (Fedora 10) kevin has set checkout to Approved for provenpackager on gausssum (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gausssum From kevin at fedoraproject.org Mon May 4 03:46:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:46:17 +0000 (UTC) Subject: rpms/gausssum - New directory Message-ID: <20090504034617.22E29700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gausssum In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG25787/rpms/gausssum Log Message: Directory /cvs/pkgs/rpms/gausssum added to the repository From kevin at fedoraproject.org Mon May 4 03:46:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:46:17 +0000 (UTC) Subject: rpms/gausssum/devel - New directory Message-ID: <20090504034617.67179700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gausssum/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG25787/rpms/gausssum/devel Log Message: Directory /cvs/pkgs/rpms/gausssum/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:46:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:46:26 +0000 (UTC) Subject: rpms/gausssum Makefile,NONE,1.1 Message-ID: <20090504034626.F1AC8700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gausssum In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG25787/rpms/gausssum Added Files: Makefile Log Message: Setup of module gausssum --- NEW FILE Makefile --- # Top level Makefile for module gausssum 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 kevin at fedoraproject.org Mon May 4 03:46:27 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:46:27 +0000 (UTC) Subject: rpms/gausssum/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504034627.8CC25700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gausssum/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG25787/rpms/gausssum/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gausssum --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gausssum # $Id: Makefile,v 1.1 2009/05/04 03:46:27 kevin Exp $ NAME := gausssum 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 pkgdb at fedoraproject.org Mon May 4 03:46:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:46:07 +0000 Subject: [pkgdb] gausssum (Fedora, 11) updated by kevin Message-ID: <20090504034607.B7F3A10F8A1@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for gausssum kevin has set commit to Approved for provenpackager on gausssum (Fedora 11) kevin has set build to Approved for provenpackager on gausssum (Fedora 11) kevin has set checkout to Approved for provenpackager on gausssum (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gausssum From pkgdb at fedoraproject.org Mon May 4 03:47:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:47:23 +0000 Subject: [pkgdb] fedora-devshell was added for ynemoy Message-ID: <20090504034723.8F5D210F89C@bastion2.fedora.phx.redhat.com> kevin has added Package fedora-devshell with summary Fedora Developer's Toolbox kevin has approved Package fedora-devshell kevin has added a Fedora devel branch for fedora-devshell with an owner of ynemoy kevin has approved fedora-devshell in Fedora devel kevin has approved Package fedora-devshell kevin has set commit to Approved for provenpackager on fedora-devshell (Fedora devel) kevin has set build to Approved for provenpackager on fedora-devshell (Fedora devel) kevin has set checkout to Approved for provenpackager on fedora-devshell (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fedora-devshell From pkgdb at fedoraproject.org Mon May 4 03:47:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:47:25 +0000 Subject: [pkgdb] fedora-devshell (Fedora, 10) updated by kevin Message-ID: <20090504034725.30EAA10F89F@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for fedora-devshell kevin has set commit to Approved for provenpackager on fedora-devshell (Fedora 10) kevin has set build to Approved for provenpackager on fedora-devshell (Fedora 10) kevin has set checkout to Approved for provenpackager on fedora-devshell (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fedora-devshell From kevin at fedoraproject.org Mon May 4 03:47:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:47:39 +0000 (UTC) Subject: rpms/fedora-devshell - New directory Message-ID: <20090504034739.2FE80700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/fedora-devshell In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP26005/rpms/fedora-devshell Log Message: Directory /cvs/pkgs/rpms/fedora-devshell added to the repository From pkgdb at fedoraproject.org Mon May 4 03:47:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:47:25 +0000 Subject: [pkgdb] fedora-devshell (Fedora, 11) updated by kevin Message-ID: <20090504034725.385A810F8A3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for fedora-devshell kevin has set commit to Approved for provenpackager on fedora-devshell (Fedora 11) kevin has set build to Approved for provenpackager on fedora-devshell (Fedora 11) kevin has set checkout to Approved for provenpackager on fedora-devshell (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fedora-devshell From kevin at fedoraproject.org Mon May 4 03:47:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:47:39 +0000 (UTC) Subject: rpms/fedora-devshell/devel - New directory Message-ID: <20090504034739.71748700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/fedora-devshell/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP26005/rpms/fedora-devshell/devel Log Message: Directory /cvs/pkgs/rpms/fedora-devshell/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:47:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:47:51 +0000 (UTC) Subject: rpms/fedora-devshell Makefile,NONE,1.1 Message-ID: <20090504034751.B6D2A700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/fedora-devshell In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP26005/rpms/fedora-devshell Added Files: Makefile Log Message: Setup of module fedora-devshell --- NEW FILE Makefile --- # Top level Makefile for module fedora-devshell 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 kevin at fedoraproject.org Mon May 4 03:47:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:47:52 +0000 (UTC) Subject: rpms/fedora-devshell/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504034752.261AC700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/fedora-devshell/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP26005/rpms/fedora-devshell/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fedora-devshell --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: fedora-devshell # $Id: Makefile,v 1.1 2009/05/04 03:47:51 kevin Exp $ NAME := fedora-devshell 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 pkgdb at fedoraproject.org Mon May 4 03:50:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:50:19 +0000 Subject: [pkgdb] perl-Config-JFDI was added for iarnell Message-ID: <20090504035020.077FB10F893@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Config-JFDI with summary Just * Do it: A Catalyst::Plugin::ConfigLoader-style layer over Config::Any kevin has approved Package perl-Config-JFDI kevin has added a Fedora devel branch for perl-Config-JFDI with an owner of iarnell kevin has approved perl-Config-JFDI in Fedora devel kevin has approved Package perl-Config-JFDI kevin has set commit to Approved for provenpackager on perl-Config-JFDI (Fedora devel) kevin has set build to Approved for provenpackager on perl-Config-JFDI (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Config-JFDI (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-JFDI From pkgdb at fedoraproject.org Mon May 4 03:50:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:50:21 +0000 Subject: [pkgdb] perl-Config-JFDI (Fedora, devel) updated by kevin Message-ID: <20090504035021.46EAB10F89E@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Config-JFDI (Fedora devel) for perl-sig kevin approved watchcommits on perl-Config-JFDI (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-JFDI From pkgdb at fedoraproject.org Mon May 4 03:50:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:50:21 +0000 Subject: [pkgdb] perl-Config-JFDI (Fedora, 10) updated by kevin Message-ID: <20090504035021.4D4DB10F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Config-JFDI kevin has set commit to Approved for provenpackager on perl-Config-JFDI (Fedora 10) kevin has set build to Approved for provenpackager on perl-Config-JFDI (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Config-JFDI (Fedora 10) kevin approved watchbugzilla on perl-Config-JFDI (Fedora 10) for perl-sig kevin approved watchcommits on perl-Config-JFDI (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-JFDI From kevin at fedoraproject.org Mon May 4 03:50:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:50:29 +0000 (UTC) Subject: rpms/perl-Config-JFDI - New directory Message-ID: <20090504035029.26CB9700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Config-JFDI In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26346/rpms/perl-Config-JFDI Log Message: Directory /cvs/pkgs/rpms/perl-Config-JFDI added to the repository From kevin at fedoraproject.org Mon May 4 03:50:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:50:29 +0000 (UTC) Subject: rpms/perl-Config-JFDI/devel - New directory Message-ID: <20090504035029.61AA2700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Config-JFDI/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26346/rpms/perl-Config-JFDI/devel Log Message: Directory /cvs/pkgs/rpms/perl-Config-JFDI/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:50:40 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:50:40 +0000 (UTC) Subject: rpms/perl-Config-JFDI Makefile,NONE,1.1 Message-ID: <20090504035040.5B5A9700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Config-JFDI In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26346/rpms/perl-Config-JFDI Added Files: Makefile Log Message: Setup of module perl-Config-JFDI --- NEW FILE Makefile --- # Top level Makefile for module perl-Config-JFDI 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 kevin at fedoraproject.org Mon May 4 03:50:41 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:50:41 +0000 (UTC) Subject: rpms/perl-Config-JFDI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504035041.1FEF4700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Config-JFDI/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26346/rpms/perl-Config-JFDI/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Config-JFDI --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Config-JFDI # $Id: Makefile,v 1.1 2009/05/04 03:50:40 kevin Exp $ NAME := perl-Config-JFDI 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 pkgdb at fedoraproject.org Mon May 4 03:50:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:50:21 +0000 Subject: [pkgdb] perl-Config-JFDI (Fedora, 11) updated by kevin Message-ID: <20090504035021.583F110F8A5@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Config-JFDI kevin has set commit to Approved for provenpackager on perl-Config-JFDI (Fedora 11) kevin has set build to Approved for provenpackager on perl-Config-JFDI (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Config-JFDI (Fedora 11) kevin approved watchbugzilla on perl-Config-JFDI (Fedora 11) for perl-sig kevin approved watchcommits on perl-Config-JFDI (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-JFDI From pkgdb at fedoraproject.org Mon May 4 03:51:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:51:07 +0000 Subject: [pkgdb] uget was added for mtasaka Message-ID: <20090504035107.341B210F89D@bastion2.fedora.phx.redhat.com> kevin has added Package uget with summary Download manager using GTK+ and libcurl kevin has approved Package uget kevin has added a Fedora devel branch for uget with an owner of mtasaka kevin has approved uget in Fedora devel kevin has approved Package uget kevin has set commit to Approved for provenpackager on uget (Fedora devel) kevin has set build to Approved for provenpackager on uget (Fedora devel) kevin has set checkout to Approved for provenpackager on uget (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uget From pkgdb at fedoraproject.org Mon May 4 03:51:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:51:08 +0000 Subject: [pkgdb] uget (Fedora, 11) updated by kevin Message-ID: <20090504035108.B491810F8A4@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for uget kevin has set commit to Approved for provenpackager on uget (Fedora 11) kevin has set build to Approved for provenpackager on uget (Fedora 11) kevin has set checkout to Approved for provenpackager on uget (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uget From pkgdb at fedoraproject.org Mon May 4 03:51:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:51:08 +0000 Subject: [pkgdb] uget (Fedora, 10) updated by kevin Message-ID: <20090504035108.A95DB10F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for uget kevin has set commit to Approved for provenpackager on uget (Fedora 10) kevin has set build to Approved for provenpackager on uget (Fedora 10) kevin has set checkout to Approved for provenpackager on uget (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uget From kevin at fedoraproject.org Mon May 4 03:51:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:51:18 +0000 (UTC) Subject: rpms/uget - New directory Message-ID: <20090504035118.23D9E700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/uget In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV26556/rpms/uget Log Message: Directory /cvs/pkgs/rpms/uget added to the repository From kevin at fedoraproject.org Mon May 4 03:51:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:51:18 +0000 (UTC) Subject: rpms/uget/devel - New directory Message-ID: <20090504035118.62CC9700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/uget/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV26556/rpms/uget/devel Log Message: Directory /cvs/pkgs/rpms/uget/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:51:27 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:51:27 +0000 (UTC) Subject: rpms/uget Makefile,NONE,1.1 Message-ID: <20090504035127.D2ABA700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/uget In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV26556/rpms/uget Added Files: Makefile Log Message: Setup of module uget --- NEW FILE Makefile --- # Top level Makefile for module uget 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 kevin at fedoraproject.org Mon May 4 03:51:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:51:28 +0000 (UTC) Subject: rpms/uget/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504035128.30259700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/uget/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV26556/rpms/uget/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module uget --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: uget # $Id: Makefile,v 1.1 2009/05/04 03:51:28 kevin Exp $ NAME := uget 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 pkgdb at fedoraproject.org Mon May 4 03:52:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:05 +0000 Subject: [pkgdb] perl-Term-Completion was added for cweyl Message-ID: <20090504035205.D25A810F893@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Term-Completion with summary Read one line of user input, with convenience functions kevin has approved Package perl-Term-Completion kevin has added a Fedora devel branch for perl-Term-Completion with an owner of cweyl kevin has approved perl-Term-Completion in Fedora devel kevin has approved Package perl-Term-Completion kevin has set commit to Approved for provenpackager on perl-Term-Completion (Fedora devel) kevin has set build to Approved for provenpackager on perl-Term-Completion (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Term-Completion (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Completion From pkgdb at fedoraproject.org Mon May 4 03:52:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:07 +0000 Subject: [pkgdb] perl-Term-Completion (Fedora, devel) updated by kevin Message-ID: <20090504035207.AC2B710F89D@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Term-Completion (Fedora devel) for perl-sig kevin approved watchcommits on perl-Term-Completion (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Completion From pkgdb at fedoraproject.org Mon May 4 03:52:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:07 +0000 Subject: [pkgdb] perl-Term-Completion (Fedora, 10) updated by kevin Message-ID: <20090504035207.BFE1210F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Term-Completion kevin has set commit to Approved for provenpackager on perl-Term-Completion (Fedora 10) kevin has set build to Approved for provenpackager on perl-Term-Completion (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Term-Completion (Fedora 10) kevin approved watchbugzilla on perl-Term-Completion (Fedora 10) for perl-sig kevin approved watchcommits on perl-Term-Completion (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Completion From pkgdb at fedoraproject.org Mon May 4 03:52:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:07 +0000 Subject: [pkgdb] perl-Term-Completion (Fedora, 11) updated by kevin Message-ID: <20090504035207.CC00810F8A4@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Term-Completion kevin has set commit to Approved for provenpackager on perl-Term-Completion (Fedora 11) kevin has set build to Approved for provenpackager on perl-Term-Completion (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Term-Completion (Fedora 11) kevin approved watchbugzilla on perl-Term-Completion (Fedora 11) for perl-sig kevin approved watchcommits on perl-Term-Completion (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Completion From pkgdb at fedoraproject.org Mon May 4 03:52:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:07 +0000 Subject: [pkgdb] perl-Term-Completion (Fedora, 9) updated by kevin Message-ID: <20090504035207.DD1A210F8A6@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Term-Completion kevin has set commit to Approved for provenpackager on perl-Term-Completion (Fedora 9) kevin has set build to Approved for provenpackager on perl-Term-Completion (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Term-Completion (Fedora 9) kevin approved watchbugzilla on perl-Term-Completion (Fedora 9) for perl-sig kevin approved watchcommits on perl-Term-Completion (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Completion From kevin at fedoraproject.org Mon May 4 03:52:16 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:52:16 +0000 (UTC) Subject: rpms/perl-Term-Completion - New directory Message-ID: <20090504035216.26655700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Term-Completion In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26764/rpms/perl-Term-Completion Log Message: Directory /cvs/pkgs/rpms/perl-Term-Completion added to the repository From kevin at fedoraproject.org Mon May 4 03:52:16 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:52:16 +0000 (UTC) Subject: rpms/perl-Term-Completion/devel - New directory Message-ID: <20090504035216.717DF700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Term-Completion/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26764/rpms/perl-Term-Completion/devel Log Message: Directory /cvs/pkgs/rpms/perl-Term-Completion/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:52:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:52:25 +0000 (UTC) Subject: rpms/perl-Term-Completion Makefile,NONE,1.1 Message-ID: <20090504035225.CA328700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Term-Completion In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26764/rpms/perl-Term-Completion Added Files: Makefile Log Message: Setup of module perl-Term-Completion --- NEW FILE Makefile --- # Top level Makefile for module perl-Term-Completion 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 kevin at fedoraproject.org Mon May 4 03:52:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:52:26 +0000 (UTC) Subject: rpms/perl-Term-Completion/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504035226.2A54D700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Term-Completion/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26764/rpms/perl-Term-Completion/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Term-Completion --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Term-Completion # $Id: Makefile,v 1.1 2009/05/04 03:52:26 kevin Exp $ NAME := perl-Term-Completion 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 pkgdb at fedoraproject.org Mon May 4 03:52:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:52 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Cache was added for iarnell Message-ID: <20090504035252.68AC910F8A3@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Catalyst-Plugin-Cache with summary Flexible caching support for Catalyst kevin has approved Package perl-Catalyst-Plugin-Cache kevin has added a Fedora devel branch for perl-Catalyst-Plugin-Cache with an owner of iarnell kevin has approved perl-Catalyst-Plugin-Cache in Fedora devel kevin has approved Package perl-Catalyst-Plugin-Cache kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora devel) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Cache From pkgdb at fedoraproject.org Mon May 4 03:52:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:54 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Cache (Fedora, 10) updated by kevin Message-ID: <20090504035254.228DD10F8A4@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Catalyst-Plugin-Cache kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora 10) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora 10) kevin approved watchbugzilla on perl-Catalyst-Plugin-Cache (Fedora 10) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Cache (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Cache From pkgdb at fedoraproject.org Mon May 4 03:52:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:54 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Cache (Fedora, devel) updated by kevin Message-ID: <20090504035254.2DD1310F8A7@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Catalyst-Plugin-Cache (Fedora devel) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Cache (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Cache From kevin at fedoraproject.org Mon May 4 03:53:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:53:03 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Cache - New directory Message-ID: <20090504035303.2822B700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa27024/rpms/perl-Catalyst-Plugin-Cache Log Message: Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache added to the repository From pkgdb at fedoraproject.org Mon May 4 03:52:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:52:54 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Cache (Fedora, 11) updated by kevin Message-ID: <20090504035254.42CD110F8AA@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Catalyst-Plugin-Cache kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora 11) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Cache (Fedora 11) kevin approved watchbugzilla on perl-Catalyst-Plugin-Cache (Fedora 11) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Cache (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Cache From kevin at fedoraproject.org Mon May 4 03:53:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:53:03 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Cache/devel - New directory Message-ID: <20090504035303.5C119700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa27024/rpms/perl-Catalyst-Plugin-Cache/devel Log Message: Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:53:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:53:12 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Cache Makefile,NONE,1.1 Message-ID: <20090504035312.9C298700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa27024/rpms/perl-Catalyst-Plugin-Cache Added Files: Makefile Log Message: Setup of module perl-Catalyst-Plugin-Cache --- NEW FILE Makefile --- # Top level Makefile for module perl-Catalyst-Plugin-Cache 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 kevin at fedoraproject.org Mon May 4 03:53:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:53:12 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Cache/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504035312.D86B1700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa27024/rpms/perl-Catalyst-Plugin-Cache/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Catalyst-Plugin-Cache --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Catalyst-Plugin-Cache # $Id: Makefile,v 1.1 2009/05/04 03:53:12 kevin Exp $ NAME := perl-Catalyst-Plugin-Cache 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 pkgdb at fedoraproject.org Mon May 4 03:53:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:53:35 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Setenv was added for iarnell Message-ID: <20090504035335.8CA2810F8A4@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Catalyst-Plugin-Setenv with summary Catalyst::Plugin::Setenv Perl module kevin has approved Package perl-Catalyst-Plugin-Setenv kevin has added a Fedora devel branch for perl-Catalyst-Plugin-Setenv with an owner of iarnell kevin has approved perl-Catalyst-Plugin-Setenv in Fedora devel kevin has approved Package perl-Catalyst-Plugin-Setenv kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora devel) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Setenv From pkgdb at fedoraproject.org Mon May 4 03:53:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:53:36 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Setenv (Fedora, 10) updated by kevin Message-ID: <20090504035336.AE79F10F8A7@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Catalyst-Plugin-Setenv kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora 10) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora 10) kevin approved watchbugzilla on perl-Catalyst-Plugin-Setenv (Fedora 10) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Setenv (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Setenv From pkgdb at fedoraproject.org Mon May 4 03:53:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:53:36 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Setenv (Fedora, 11) updated by kevin Message-ID: <20090504035336.B93F110F8AA@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Catalyst-Plugin-Setenv kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora 11) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Setenv (Fedora 11) kevin approved watchbugzilla on perl-Catalyst-Plugin-Setenv (Fedora 11) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Setenv (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Setenv From pkgdb at fedoraproject.org Mon May 4 03:53:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:53:36 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Setenv (Fedora, devel) updated by kevin Message-ID: <20090504035336.C5CF110F8AD@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Catalyst-Plugin-Setenv (Fedora devel) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Setenv (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Setenv From kevin at fedoraproject.org Mon May 4 03:53:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:53:45 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Setenv - New directory Message-ID: <20090504035345.3C51670131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN27321/rpms/perl-Catalyst-Plugin-Setenv Log Message: Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv added to the repository From kevin at fedoraproject.org Mon May 4 03:53:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:53:45 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Setenv/devel - New directory Message-ID: <20090504035345.8232370131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN27321/rpms/perl-Catalyst-Plugin-Setenv/devel Log Message: Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:53:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:53:55 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Setenv Makefile,NONE,1.1 Message-ID: <20090504035355.5F98970131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN27321/rpms/perl-Catalyst-Plugin-Setenv Added Files: Makefile Log Message: Setup of module perl-Catalyst-Plugin-Setenv --- NEW FILE Makefile --- # Top level Makefile for module perl-Catalyst-Plugin-Setenv 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 kevin at fedoraproject.org Mon May 4 03:53:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:53:55 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Setenv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504035355.A1EDE70131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN27321/rpms/perl-Catalyst-Plugin-Setenv/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Catalyst-Plugin-Setenv --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Catalyst-Plugin-Setenv # $Id: Makefile,v 1.1 2009/05/04 03:53:55 kevin Exp $ NAME := perl-Catalyst-Plugin-Setenv 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 pkgdb at fedoraproject.org Mon May 4 03:54:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:54:25 +0000 Subject: [pkgdb] perl-Term-Prompt was added for iarnell Message-ID: <20090504035425.A872D10F89E@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Term-Prompt with summary Perl extension for prompting a user for information kevin has approved Package perl-Term-Prompt kevin has added a Fedora devel branch for perl-Term-Prompt with an owner of iarnell kevin has approved perl-Term-Prompt in Fedora devel kevin has approved Package perl-Term-Prompt kevin has set commit to Approved for provenpackager on perl-Term-Prompt (Fedora devel) kevin has set build to Approved for provenpackager on perl-Term-Prompt (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Term-Prompt (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Prompt From pkgdb at fedoraproject.org Mon May 4 03:54:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:54:27 +0000 Subject: [pkgdb] perl-Term-Prompt (Fedora, devel) updated by kevin Message-ID: <20090504035427.2E9B610F8A6@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Term-Prompt (Fedora devel) for perl-sig kevin approved watchcommits on perl-Term-Prompt (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Prompt From pkgdb at fedoraproject.org Mon May 4 03:54:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:54:27 +0000 Subject: [pkgdb] perl-Term-Prompt (Fedora, 10) updated by kevin Message-ID: <20090504035427.440CC10F8A8@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Term-Prompt kevin has set commit to Approved for provenpackager on perl-Term-Prompt (Fedora 10) kevin has set build to Approved for provenpackager on perl-Term-Prompt (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Term-Prompt (Fedora 10) kevin approved watchbugzilla on perl-Term-Prompt (Fedora 10) for perl-sig kevin approved watchcommits on perl-Term-Prompt (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Prompt From pkgdb at fedoraproject.org Mon May 4 03:54:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:54:27 +0000 Subject: [pkgdb] perl-Term-Prompt (Fedora, 11) updated by kevin Message-ID: <20090504035427.5777C10F8AA@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Term-Prompt kevin has set commit to Approved for provenpackager on perl-Term-Prompt (Fedora 11) kevin has set build to Approved for provenpackager on perl-Term-Prompt (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Term-Prompt (Fedora 11) kevin approved watchbugzilla on perl-Term-Prompt (Fedora 11) for perl-sig kevin approved watchcommits on perl-Term-Prompt (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Prompt From kevin at fedoraproject.org Mon May 4 03:54:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:54:39 +0000 (UTC) Subject: rpms/perl-Term-Prompt - New directory Message-ID: <20090504035439.222AC700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Term-Prompt In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP28062/rpms/perl-Term-Prompt Log Message: Directory /cvs/pkgs/rpms/perl-Term-Prompt added to the repository From kevin at fedoraproject.org Mon May 4 03:54:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:54:39 +0000 (UTC) Subject: rpms/perl-Term-Prompt/devel - New directory Message-ID: <20090504035439.58F40700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Term-Prompt/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP28062/rpms/perl-Term-Prompt/devel Log Message: Directory /cvs/pkgs/rpms/perl-Term-Prompt/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:54:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:54:48 +0000 (UTC) Subject: rpms/perl-Term-Prompt Makefile,NONE,1.1 Message-ID: <20090504035448.453BF700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Term-Prompt In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP28062/rpms/perl-Term-Prompt Added Files: Makefile Log Message: Setup of module perl-Term-Prompt --- NEW FILE Makefile --- # Top level Makefile for module perl-Term-Prompt 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 kevin at fedoraproject.org Mon May 4 03:54:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:54:48 +0000 (UTC) Subject: rpms/perl-Term-Prompt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504035448.858E6700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Term-Prompt/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP28062/rpms/perl-Term-Prompt/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Term-Prompt --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Term-Prompt # $Id: Makefile,v 1.1 2009/05/04 03:54:48 kevin Exp $ NAME := perl-Term-Prompt 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 pkgdb at fedoraproject.org Mon May 4 03:56:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:56:10 +0000 Subject: [pkgdb] firebird was added for makowski Message-ID: <20090504035610.57D1210F893@bastion2.fedora.phx.redhat.com> kevin has added Package firebird with summary SQL relational database management system kevin has approved Package firebird kevin has added a Fedora devel branch for firebird with an owner of makowski kevin has approved firebird in Fedora devel kevin has approved Package firebird kevin has set commit to Approved for provenpackager on firebird (Fedora devel) kevin has set build to Approved for provenpackager on firebird (Fedora devel) kevin has set checkout to Approved for provenpackager on firebird (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firebird From pkgdb at fedoraproject.org Mon May 4 03:56:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:56:11 +0000 Subject: [pkgdb] firebird (Fedora, 10) updated by kevin Message-ID: <20090504035611.C351C10F89F@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for firebird kevin has set commit to Approved for provenpackager on firebird (Fedora 10) kevin has set build to Approved for provenpackager on firebird (Fedora 10) kevin has set checkout to Approved for provenpackager on firebird (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firebird From pkgdb at fedoraproject.org Mon May 4 03:56:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:56:11 +0000 Subject: [pkgdb] firebird (Fedora, 9) updated by kevin Message-ID: <20090504035611.C675710F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for firebird kevin has set commit to Approved for provenpackager on firebird (Fedora 9) kevin has set build to Approved for provenpackager on firebird (Fedora 9) kevin has set checkout to Approved for provenpackager on firebird (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firebird From pkgdb at fedoraproject.org Mon May 4 03:56:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:56:11 +0000 Subject: [pkgdb] firebird (Fedora, 11) updated by kevin Message-ID: <20090504035611.D01B910F8A5@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for firebird kevin has set commit to Approved for provenpackager on firebird (Fedora 11) kevin has set build to Approved for provenpackager on firebird (Fedora 11) kevin has set checkout to Approved for provenpackager on firebird (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firebird From pkgdb at fedoraproject.org Mon May 4 03:56:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:56:11 +0000 Subject: [pkgdb] firebird (Fedora EPEL, 5) updated by kevin Message-ID: <20090504035611.D790F10F8A8@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for firebird kevin has set commit to Approved for provenpackager on firebird (Fedora EPEL 5) kevin has set build to Approved for provenpackager on firebird (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on firebird (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firebird From kevin at fedoraproject.org Mon May 4 03:56:23 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:56:23 +0000 (UTC) Subject: rpms/firebird - New directory Message-ID: <20090504035623.2D384700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/firebird In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA28309/rpms/firebird Log Message: Directory /cvs/pkgs/rpms/firebird added to the repository From kevin at fedoraproject.org Mon May 4 03:56:23 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:56:23 +0000 (UTC) Subject: rpms/firebird/devel - New directory Message-ID: <20090504035623.78E76700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/firebird/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA28309/rpms/firebird/devel Log Message: Directory /cvs/pkgs/rpms/firebird/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:56:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:56:33 +0000 (UTC) Subject: rpms/firebird Makefile,NONE,1.1 Message-ID: <20090504035633.30B18700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/firebird In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA28309/rpms/firebird Added Files: Makefile Log Message: Setup of module firebird --- NEW FILE Makefile --- # Top level Makefile for module firebird 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 pkgdb at fedoraproject.org Mon May 4 03:56:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:56:11 +0000 Subject: [pkgdb] firebird (Fedora EPEL, 4) updated by kevin Message-ID: <20090504035611.E66F110F8AC@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for firebird kevin has set commit to Approved for provenpackager on firebird (Fedora EPEL 4) kevin has set build to Approved for provenpackager on firebird (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on firebird (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firebird From kevin at fedoraproject.org Mon May 4 03:56:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:56:33 +0000 (UTC) Subject: rpms/firebird/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504035633.75F2C700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/firebird/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA28309/rpms/firebird/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module firebird --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: firebird # $Id: Makefile,v 1.1 2009/05/04 03:56:33 kevin Exp $ NAME := firebird 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 pkgdb at fedoraproject.org Mon May 4 03:58:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:58:32 +0000 Subject: [pkgdb] perl-Text-Textile (Fedora, 10) updated by kevin Message-ID: <20090504035832.EDFC210F8BB@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Text-Textile kevin has set commit to Approved for provenpackager on perl-Text-Textile (Fedora 10) kevin has set build to Approved for provenpackager on perl-Text-Textile (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Text-Textile (Fedora 10) kevin approved watchbugzilla on perl-Text-Textile (Fedora 10) for perl-sig kevin approved watchcommits on perl-Text-Textile (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Textile From pkgdb at fedoraproject.org Mon May 4 03:58:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:58:31 +0000 Subject: [pkgdb] perl-Text-Textile was added for iarnell Message-ID: <20090504035831.1449D10F893@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Text-Textile with summary A humane web text generator kevin has approved Package perl-Text-Textile kevin has added a Fedora devel branch for perl-Text-Textile with an owner of iarnell kevin has approved perl-Text-Textile in Fedora devel kevin has approved Package perl-Text-Textile kevin has set commit to Approved for provenpackager on perl-Text-Textile (Fedora devel) kevin has set build to Approved for provenpackager on perl-Text-Textile (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Text-Textile (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Textile From pkgdb at fedoraproject.org Mon May 4 03:58:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:58:32 +0000 Subject: [pkgdb] perl-Text-Textile (Fedora, 11) updated by kevin Message-ID: <20090504035833.02B4310F8BE@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Text-Textile kevin has set commit to Approved for provenpackager on perl-Text-Textile (Fedora 11) kevin has set build to Approved for provenpackager on perl-Text-Textile (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Text-Textile (Fedora 11) kevin approved watchbugzilla on perl-Text-Textile (Fedora 11) for perl-sig kevin approved watchcommits on perl-Text-Textile (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Textile From pkgdb at fedoraproject.org Mon May 4 03:58:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 03:58:32 +0000 Subject: [pkgdb] perl-Text-Textile (Fedora, devel) updated by kevin Message-ID: <20090504035833.14EB410F8C1@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Text-Textile (Fedora devel) for perl-sig kevin approved watchcommits on perl-Text-Textile (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Textile From kevin at fedoraproject.org Mon May 4 03:58:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:58:43 +0000 (UTC) Subject: rpms/perl-Text-Textile - New directory Message-ID: <20090504035843.2E925700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Textile In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO28747/rpms/perl-Text-Textile Log Message: Directory /cvs/pkgs/rpms/perl-Text-Textile added to the repository From kevin at fedoraproject.org Mon May 4 03:58:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:58:43 +0000 (UTC) Subject: rpms/perl-Text-Textile/devel - New directory Message-ID: <20090504035843.71CFF700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Textile/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO28747/rpms/perl-Text-Textile/devel Log Message: Directory /cvs/pkgs/rpms/perl-Text-Textile/devel added to the repository From kevin at fedoraproject.org Mon May 4 03:58:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:58:53 +0000 (UTC) Subject: rpms/perl-Text-Textile Makefile,NONE,1.1 Message-ID: <20090504035853.3A456700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Textile In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO28747/rpms/perl-Text-Textile Added Files: Makefile Log Message: Setup of module perl-Text-Textile --- NEW FILE Makefile --- # Top level Makefile for module perl-Text-Textile 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 kevin at fedoraproject.org Mon May 4 03:58:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 03:58:53 +0000 (UTC) Subject: rpms/perl-Text-Textile/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504035853.8555F700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Textile/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO28747/rpms/perl-Text-Textile/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Text-Textile --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Text-Textile # $Id: Makefile,v 1.1 2009/05/04 03:58:53 kevin Exp $ NAME := perl-Text-Textile 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 ynemoy at fedoraproject.org Mon May 4 04:03:05 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Mon, 4 May 2009 04:03:05 +0000 (UTC) Subject: rpms/fedora-devshell/devel fedora-devshell.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504040305.49595700DB@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/fedora-devshell/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29338/devel Modified Files: .cvsignore sources Added Files: fedora-devshell.spec import.log Log Message: Initial import into devel --- NEW FILE fedora-devshell.spec --- # sitelib for noarch packages %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: fedora-devshell Version: 0.1.1 Release: 1%{?dist} Summary: Fedora Developer's Toolbox Group: Development/Languages License: GPLv2 URL: https://fedorahosted.org/%{name}/ Source0: https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel, python-setuptools-devel, python-dateutil BuildRequires: python-configobj, rpm-python %description Fedora Devshell is a developers toolbox for creating packages and developing software for Fedora. It aims to simplify the process of creating and maintaining packages in the Fedora repositories, and simplify the workflow between other Fedora components. %prep %setup -q -n %{name}-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/ports %{_bindir}/devshell %doc LICENSE TODO PKG-INFO # For noarch packages: sitelib %{python_sitelib}/devshell/ %{python_sitelib}/fedora_devshell-*.egg-info %changelog * Fri May 1 2009 Yaakov M. Nemoy - 0.1.1-1 - new upstream - fixes license - includes upstream URL - adds PKG-INFO to docs - more specific file entries for python_sitelib - upstream removes extraneous shebangs from some scripts * Thu Apr 30 2009 Yaakov M. Nemoy - 0.1.0-1 - creation --- NEW FILE import.log --- fedora-devshell-0_1_1-1_fc10:HEAD:fedora-devshell-0.1.1-1.fc10.src.rpm:1241409767 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fedora-devshell/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:47:51 -0000 1.1 +++ .cvsignore 4 May 2009 04:02:34 -0000 1.2 @@ -0,0 +1 @@ +fedora-devshell-0.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-devshell/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:47:51 -0000 1.1 +++ sources 4 May 2009 04:02:35 -0000 1.2 @@ -0,0 +1 @@ +4cfe5a20d8a228dd832bcdc536e57808 fedora-devshell-0.1.1.tar.gz From ynemoy at fedoraproject.org Mon May 4 04:25:31 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Mon, 4 May 2009 04:25:31 +0000 (UTC) Subject: rpms/fedora-devshell/F-11 fedora-devshell.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504042531.0B1B7700DB@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/fedora-devshell/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31654 Modified Files: sources Added Files: fedora-devshell.spec Log Message: Branch F-11 --- NEW FILE fedora-devshell.spec --- # sitelib for noarch packages %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: fedora-devshell Version: 0.1.1 Release: 1%{?dist} Summary: Fedora Developer's Toolbox Group: Development/Languages License: GPLv2 URL: https://fedorahosted.org/%{name}/ Source0: https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel, python-setuptools-devel, python-dateutil BuildRequires: python-configobj, rpm-python %description Fedora Devshell is a developers toolbox for creating packages and developing software for Fedora. It aims to simplify the process of creating and maintaining packages in the Fedora repositories, and simplify the workflow between other Fedora components. %prep %setup -q -n %{name}-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/ports %{_bindir}/devshell %doc LICENSE TODO PKG-INFO # For noarch packages: sitelib %{python_sitelib}/devshell/ %{python_sitelib}/fedora_devshell-*.egg-info %changelog * Fri May 1 2009 Yaakov M. Nemoy - 0.1.1-1 - new upstream - fixes license - includes upstream URL - adds PKG-INFO to docs - more specific file entries for python_sitelib - upstream removes extraneous shebangs from some scripts * Thu Apr 30 2009 Yaakov M. Nemoy - 0.1.0-1 - creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-devshell/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:47:51 -0000 1.1 +++ sources 4 May 2009 04:25:00 -0000 1.2 @@ -0,0 +1 @@ +4cfe5a20d8a228dd832bcdc536e57808 fedora-devshell-0.1.1.tar.gz From ynemoy at fedoraproject.org Mon May 4 04:27:57 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Mon, 4 May 2009 04:27:57 +0000 (UTC) Subject: rpms/fedora-devshell/F-10 fedora-devshell.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504042757.1DA0F700DB@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/fedora-devshell/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32521 Modified Files: sources Added Files: fedora-devshell.spec Log Message: Branch F-10 --- NEW FILE fedora-devshell.spec --- # sitelib for noarch packages %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: fedora-devshell Version: 0.1.1 Release: 1%{?dist} Summary: Fedora Developer's Toolbox Group: Development/Languages License: GPLv2 URL: https://fedorahosted.org/%{name}/ Source0: https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel, python-setuptools-devel, python-dateutil BuildRequires: python-configobj, rpm-python %description Fedora Devshell is a developers toolbox for creating packages and developing software for Fedora. It aims to simplify the process of creating and maintaining packages in the Fedora repositories, and simplify the workflow between other Fedora components. %prep %setup -q -n %{name}-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/ports %{_bindir}/devshell %doc LICENSE TODO PKG-INFO # For noarch packages: sitelib %{python_sitelib}/devshell/ %{python_sitelib}/fedora_devshell-*.egg-info %changelog * Fri May 1 2009 Yaakov M. Nemoy - 0.1.1-1 - new upstream - fixes license - includes upstream URL - adds PKG-INFO to docs - more specific file entries for python_sitelib - upstream removes extraneous shebangs from some scripts * Thu Apr 30 2009 Yaakov M. Nemoy - 0.1.0-1 - creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-devshell/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:47:51 -0000 1.1 +++ sources 4 May 2009 04:27:26 -0000 1.2 @@ -0,0 +1 @@ +4cfe5a20d8a228dd832bcdc536e57808 fedora-devshell-0.1.1.tar.gz From iarnell at fedoraproject.org Mon May 4 05:31:41 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:31:41 +0000 (UTC) Subject: rpms/perl-Config-JFDI/F-10 perl-Config-JFDI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053141.6A5C9700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Config-JFDI/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7466/F-10 Modified Files: .cvsignore sources Added Files: perl-Config-JFDI.spec Log Message: initial import --- NEW FILE perl-Config-JFDI.spec --- Name: perl-Config-JFDI Version: 0.05 Release: 1%{?dist} Summary: Just * Do it: A Catalyst::Plugin::ConfigLoader-style layer over Config::Any License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Config-JFDI/ Source0: http://www.cpan.org/authors/id/R/RK/RKRIMEN/Config-JFDI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Carp::Clan) BuildRequires: perl(Clone) BuildRequires: perl(Config::Any) BuildRequires: perl(Data::Visitor) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Hash::Merge::Simple) BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Moose) BuildRequires: perl(Path::Class) BuildRequires: perl(Sub::Install) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Most) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Config::JFDI is an implementation of Catalyst::Plugin::ConfigLoader that exists outside of Catalyst. %prep %setup -q -n Config-JFDI-%{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 * Fri May 01 2009 Iain Arnell 0.05-1 - Specfile autogenerated by cpanspec 1.77. - Remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:50:40 -0000 1.1 +++ .cvsignore 4 May 2009 05:31:11 -0000 1.2 @@ -0,0 +1 @@ +Config-JFDI-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:50:40 -0000 1.1 +++ sources 4 May 2009 05:31:11 -0000 1.2 @@ -0,0 +1 @@ +f7c3f07e7628947666358b361dd78c76 Config-JFDI-0.05.tar.gz From iarnell at fedoraproject.org Mon May 4 05:31:41 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:31:41 +0000 (UTC) Subject: rpms/perl-Config-JFDI/F-11 perl-Config-JFDI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053141.95779700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Config-JFDI/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7466/F-11 Modified Files: .cvsignore sources Added Files: perl-Config-JFDI.spec Log Message: initial import --- NEW FILE perl-Config-JFDI.spec --- Name: perl-Config-JFDI Version: 0.05 Release: 1%{?dist} Summary: Just * Do it: A Catalyst::Plugin::ConfigLoader-style layer over Config::Any License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Config-JFDI/ Source0: http://www.cpan.org/authors/id/R/RK/RKRIMEN/Config-JFDI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Carp::Clan) BuildRequires: perl(Clone) BuildRequires: perl(Config::Any) BuildRequires: perl(Data::Visitor) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Hash::Merge::Simple) BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Moose) BuildRequires: perl(Path::Class) BuildRequires: perl(Sub::Install) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Most) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Config::JFDI is an implementation of Catalyst::Plugin::ConfigLoader that exists outside of Catalyst. %prep %setup -q -n Config-JFDI-%{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 * Fri May 01 2009 Iain Arnell 0.05-1 - Specfile autogenerated by cpanspec 1.77. - Remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:50:40 -0000 1.1 +++ .cvsignore 4 May 2009 05:31:11 -0000 1.2 @@ -0,0 +1 @@ +Config-JFDI-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:50:40 -0000 1.1 +++ sources 4 May 2009 05:31:11 -0000 1.2 @@ -0,0 +1 @@ +f7c3f07e7628947666358b361dd78c76 Config-JFDI-0.05.tar.gz From iarnell at fedoraproject.org Mon May 4 05:31:41 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:31:41 +0000 (UTC) Subject: rpms/perl-Config-JFDI/devel perl-Config-JFDI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053141.DAB29700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Config-JFDI/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7466/devel Modified Files: .cvsignore sources Added Files: perl-Config-JFDI.spec Log Message: initial import --- NEW FILE perl-Config-JFDI.spec --- Name: perl-Config-JFDI Version: 0.05 Release: 1%{?dist} Summary: Just * Do it: A Catalyst::Plugin::ConfigLoader-style layer over Config::Any License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Config-JFDI/ Source0: http://www.cpan.org/authors/id/R/RK/RKRIMEN/Config-JFDI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Carp::Clan) BuildRequires: perl(Clone) BuildRequires: perl(Config::Any) BuildRequires: perl(Data::Visitor) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Hash::Merge::Simple) BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Moose) BuildRequires: perl(Path::Class) BuildRequires: perl(Sub::Install) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Most) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Config::JFDI is an implementation of Catalyst::Plugin::ConfigLoader that exists outside of Catalyst. %prep %setup -q -n Config-JFDI-%{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 * Fri May 01 2009 Iain Arnell 0.05-1 - Specfile autogenerated by cpanspec 1.77. - Remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:50:40 -0000 1.1 +++ .cvsignore 4 May 2009 05:31:11 -0000 1.2 @@ -0,0 +1 @@ +Config-JFDI-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:50:40 -0000 1.1 +++ sources 4 May 2009 05:31:11 -0000 1.2 @@ -0,0 +1 @@ +f7c3f07e7628947666358b361dd78c76 Config-JFDI-0.05.tar.gz From iarnell at fedoraproject.org Mon May 4 05:34:30 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:34:30 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Cache/F-10 perl-Catalyst-Plugin-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053430.D6958700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8011/F-10 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Cache.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Cache.spec --- Name: perl-Catalyst-Plugin-Cache Version: 0.08 Release: 2%{?dist} Summary: Flexible caching support for Catalyst License: (GPL+ or Artistic) or MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Cache/ Source0: http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst) >= 5.7 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(MRO::Compat) BuildRequires: perl(ok) BuildRequires: perl(Task::Weaken) BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) BuildRequires: perl(Test::WWW::Mechanize::Catalyst) Requires: perl(Class::Accessor::Fast) Requires: perl(Class::Data::Inheritable) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This plugin gives you access to a variety of systems for caching data. It allows you to use a very simple configuration API, while maintaining the possibility of flexibility when you need it later. %prep %setup -q -n Catalyst-Plugin-Cache-%{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 %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 0.08-2 - add missing requires * Sun May 03 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:53:12 -0000 1.1 +++ .cvsignore 4 May 2009 05:34:00 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Cache-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:53:12 -0000 1.1 +++ sources 4 May 2009 05:34:00 -0000 1.2 @@ -0,0 +1 @@ +1bd5edb5df1530fb71c4c3c5ba22916a Catalyst-Plugin-Cache-0.08.tar.gz From iarnell at fedoraproject.org Mon May 4 05:34:31 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:34:31 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Cache/F-11 perl-Catalyst-Plugin-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053431.0D67D700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8011/F-11 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Cache.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Cache.spec --- Name: perl-Catalyst-Plugin-Cache Version: 0.08 Release: 2%{?dist} Summary: Flexible caching support for Catalyst License: (GPL+ or Artistic) or MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Cache/ Source0: http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst) >= 5.7 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(MRO::Compat) BuildRequires: perl(ok) BuildRequires: perl(Task::Weaken) BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) BuildRequires: perl(Test::WWW::Mechanize::Catalyst) Requires: perl(Class::Accessor::Fast) Requires: perl(Class::Data::Inheritable) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This plugin gives you access to a variety of systems for caching data. It allows you to use a very simple configuration API, while maintaining the possibility of flexibility when you need it later. %prep %setup -q -n Catalyst-Plugin-Cache-%{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 %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 0.08-2 - add missing requires * Sun May 03 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:53:12 -0000 1.1 +++ .cvsignore 4 May 2009 05:34:00 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Cache-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:53:12 -0000 1.1 +++ sources 4 May 2009 05:34:00 -0000 1.2 @@ -0,0 +1 @@ +1bd5edb5df1530fb71c4c3c5ba22916a Catalyst-Plugin-Cache-0.08.tar.gz From iarnell at fedoraproject.org Mon May 4 05:34:31 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:34:31 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Cache/devel perl-Catalyst-Plugin-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053431.559C9700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8011/devel Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Cache.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Cache.spec --- Name: perl-Catalyst-Plugin-Cache Version: 0.08 Release: 2%{?dist} Summary: Flexible caching support for Catalyst License: (GPL+ or Artistic) or MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Cache/ Source0: http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst) >= 5.7 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(MRO::Compat) BuildRequires: perl(ok) BuildRequires: perl(Task::Weaken) BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) BuildRequires: perl(Test::WWW::Mechanize::Catalyst) Requires: perl(Class::Accessor::Fast) Requires: perl(Class::Data::Inheritable) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This plugin gives you access to a variety of systems for caching data. It allows you to use a very simple configuration API, while maintaining the possibility of flexibility when you need it later. %prep %setup -q -n Catalyst-Plugin-Cache-%{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 %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 0.08-2 - add missing requires * Sun May 03 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:53:12 -0000 1.1 +++ .cvsignore 4 May 2009 05:34:01 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Cache-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:53:12 -0000 1.1 +++ sources 4 May 2009 05:34:01 -0000 1.2 @@ -0,0 +1 @@ +1bd5edb5df1530fb71c4c3c5ba22916a Catalyst-Plugin-Cache-0.08.tar.gz From iarnell at fedoraproject.org Mon May 4 05:36:04 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:36:04 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Setenv/F-10 perl-Catalyst-Plugin-Setenv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053604.13DC9700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8328/F-10 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Setenv.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Setenv.spec --- Name: perl-Catalyst-Plugin-Setenv Version: 0.03 Release: 1%{?dist} Summary: Catalyst::Plugin::Setenv Perl module License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Setenv/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Setenv-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst::Runtime) >= 5.7 BuildRequires: perl(Module::Build) BuildRequires: perl(MRO::Compat) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Build.PL ./Build ./Build test ./Build install %prep %setup -q -n Catalyst-Plugin-Setenv-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 0.03-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:53:55 -0000 1.1 +++ .cvsignore 4 May 2009 05:35:33 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Setenv-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:53:55 -0000 1.1 +++ sources 4 May 2009 05:35:33 -0000 1.2 @@ -0,0 +1 @@ +0c4b9383741e71a2fcad20b2298c3855 Catalyst-Plugin-Setenv-0.03.tar.gz From iarnell at fedoraproject.org Mon May 4 05:36:04 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:36:04 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Setenv/F-11 perl-Catalyst-Plugin-Setenv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053604.53BA8700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8328/F-11 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Setenv.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Setenv.spec --- Name: perl-Catalyst-Plugin-Setenv Version: 0.03 Release: 1%{?dist} Summary: Catalyst::Plugin::Setenv Perl module License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Setenv/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Setenv-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst::Runtime) >= 5.7 BuildRequires: perl(Module::Build) BuildRequires: perl(MRO::Compat) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Build.PL ./Build ./Build test ./Build install %prep %setup -q -n Catalyst-Plugin-Setenv-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 0.03-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:53:55 -0000 1.1 +++ .cvsignore 4 May 2009 05:35:34 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Setenv-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:53:55 -0000 1.1 +++ sources 4 May 2009 05:35:34 -0000 1.2 @@ -0,0 +1 @@ +0c4b9383741e71a2fcad20b2298c3855 Catalyst-Plugin-Setenv-0.03.tar.gz From iarnell at fedoraproject.org Mon May 4 05:36:04 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:36:04 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Setenv/devel perl-Catalyst-Plugin-Setenv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053604.ACB37700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8328/devel Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Setenv.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Setenv.spec --- Name: perl-Catalyst-Plugin-Setenv Version: 0.03 Release: 1%{?dist} Summary: Catalyst::Plugin::Setenv Perl module License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Setenv/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Setenv-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst::Runtime) >= 5.7 BuildRequires: perl(Module::Build) BuildRequires: perl(MRO::Compat) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Build.PL ./Build ./Build test ./Build install %prep %setup -q -n Catalyst-Plugin-Setenv-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 0.03-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:53:55 -0000 1.1 +++ .cvsignore 4 May 2009 05:35:34 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Setenv-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:53:55 -0000 1.1 +++ sources 4 May 2009 05:35:34 -0000 1.2 @@ -0,0 +1 @@ +0c4b9383741e71a2fcad20b2298c3855 Catalyst-Plugin-Setenv-0.03.tar.gz From iarnell at fedoraproject.org Mon May 4 05:38:36 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:38:36 +0000 (UTC) Subject: rpms/perl-Term-Prompt/F-10 perl-Term-Prompt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053836.435C4700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Term-Prompt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8980/F-10 Modified Files: .cvsignore sources Added Files: perl-Term-Prompt.spec Log Message: initial import --- NEW FILE perl-Term-Prompt.spec --- Name: perl-Term-Prompt Version: 1.04 Release: 1%{?dist} Summary: Perl extension for prompting a user for information License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-Prompt/ Source0: http://www.cpan.org/authors/id/P/PE/PERSICOM/Term-Prompt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Term::ReadKey) >= 1 BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This main function of this module is to accept interactive input. You specify the type of inputs allowed, a prompt, help text and defaults and it will deal with the user interface, (and the user!), by displaying the prompt, showing the default, and checking to be sure that the response is one of the legal choices. Additional 'types' that could be added would be a phone type, a social security type, a generic numeric pattern type... %prep %setup -q -n Term-Prompt-%{version} for f in $(find . -type f); do chmod -x $f sed -i -e 's/\r//' $f done %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 * Sun May 03 2009 Iain Arnell 1.04-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-Prompt/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:54:48 -0000 1.1 +++ .cvsignore 4 May 2009 05:38:05 -0000 1.2 @@ -0,0 +1 @@ +Term-Prompt-1.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-Prompt/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:54:48 -0000 1.1 +++ sources 4 May 2009 05:38:05 -0000 1.2 @@ -0,0 +1 @@ +505213e26be3e46ed03d47f0c955f5f9 Term-Prompt-1.04.tar.gz From iarnell at fedoraproject.org Mon May 4 05:38:36 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:38:36 +0000 (UTC) Subject: rpms/perl-Term-Prompt/F-11 perl-Term-Prompt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053836.8E020700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Term-Prompt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8980/F-11 Modified Files: .cvsignore sources Added Files: perl-Term-Prompt.spec Log Message: initial import --- NEW FILE perl-Term-Prompt.spec --- Name: perl-Term-Prompt Version: 1.04 Release: 1%{?dist} Summary: Perl extension for prompting a user for information License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-Prompt/ Source0: http://www.cpan.org/authors/id/P/PE/PERSICOM/Term-Prompt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Term::ReadKey) >= 1 BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This main function of this module is to accept interactive input. You specify the type of inputs allowed, a prompt, help text and defaults and it will deal with the user interface, (and the user!), by displaying the prompt, showing the default, and checking to be sure that the response is one of the legal choices. Additional 'types' that could be added would be a phone type, a social security type, a generic numeric pattern type... %prep %setup -q -n Term-Prompt-%{version} for f in $(find . -type f); do chmod -x $f sed -i -e 's/\r//' $f done %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 * Sun May 03 2009 Iain Arnell 1.04-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-Prompt/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:54:48 -0000 1.1 +++ .cvsignore 4 May 2009 05:38:06 -0000 1.2 @@ -0,0 +1 @@ +Term-Prompt-1.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-Prompt/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:54:48 -0000 1.1 +++ sources 4 May 2009 05:38:06 -0000 1.2 @@ -0,0 +1 @@ +505213e26be3e46ed03d47f0c955f5f9 Term-Prompt-1.04.tar.gz From iarnell at fedoraproject.org Mon May 4 05:38:36 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:38:36 +0000 (UTC) Subject: rpms/perl-Term-Prompt/devel perl-Term-Prompt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504053836.E4915700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Term-Prompt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8980/devel Modified Files: .cvsignore sources Added Files: perl-Term-Prompt.spec Log Message: initial import --- NEW FILE perl-Term-Prompt.spec --- Name: perl-Term-Prompt Version: 1.04 Release: 1%{?dist} Summary: Perl extension for prompting a user for information License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-Prompt/ Source0: http://www.cpan.org/authors/id/P/PE/PERSICOM/Term-Prompt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Term::ReadKey) >= 1 BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This main function of this module is to accept interactive input. You specify the type of inputs allowed, a prompt, help text and defaults and it will deal with the user interface, (and the user!), by displaying the prompt, showing the default, and checking to be sure that the response is one of the legal choices. Additional 'types' that could be added would be a phone type, a social security type, a generic numeric pattern type... %prep %setup -q -n Term-Prompt-%{version} for f in $(find . -type f); do chmod -x $f sed -i -e 's/\r//' $f done %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 * Sun May 03 2009 Iain Arnell 1.04-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-Prompt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:54:48 -0000 1.1 +++ .cvsignore 4 May 2009 05:38:06 -0000 1.2 @@ -0,0 +1 @@ +Term-Prompt-1.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-Prompt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:54:48 -0000 1.1 +++ sources 4 May 2009 05:38:06 -0000 1.2 @@ -0,0 +1 @@ +505213e26be3e46ed03d47f0c955f5f9 Term-Prompt-1.04.tar.gz From iarnell at fedoraproject.org Mon May 4 05:40:16 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:40:16 +0000 (UTC) Subject: rpms/perl-Text-Textile/F-10 perl-Text-Textile.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504054016.96F7C700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Text-Textile/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9372/F-10 Modified Files: .cvsignore sources Added Files: perl-Text-Textile.spec Log Message: initial import --- NEW FILE perl-Text-Textile.spec --- Name: perl-Text-Textile Version: 2.03 Release: 1%{?dist} Summary: A humane web text generator License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Textile/ Source0: http://www.cpan.org/authors/id/B/BC/BCHOATE/Text-Textile-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Spec) BuildRequires: perl(HTML::Entities) BuildRequires: perl(Image::Size) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # undetected requirements Requires: perl(File::Spec) Requires: perl(HTML::Entities) Requires: perl(Image::Size) %description Text::Textile is a Perl-based implementation of Dean Allen's Textile syntax. Textile is shorthand for doing common formatting tasks. %prep %setup -q -n Text-Textile-%{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 ARTISTIC Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 2.03-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Textile/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:58:53 -0000 1.1 +++ .cvsignore 4 May 2009 05:39:46 -0000 1.2 @@ -0,0 +1 @@ +Text-Textile-2.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Textile/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:58:53 -0000 1.1 +++ sources 4 May 2009 05:39:46 -0000 1.2 @@ -0,0 +1 @@ +227cc4c97850b4f8448fa2d73c9c328a Text-Textile-2.03.tar.gz From iarnell at fedoraproject.org Mon May 4 05:40:16 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:40:16 +0000 (UTC) Subject: rpms/perl-Text-Textile/F-11 perl-Text-Textile.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504054016.E3C3F700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Text-Textile/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9372/F-11 Modified Files: .cvsignore sources Added Files: perl-Text-Textile.spec Log Message: initial import --- NEW FILE perl-Text-Textile.spec --- Name: perl-Text-Textile Version: 2.03 Release: 1%{?dist} Summary: A humane web text generator License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Textile/ Source0: http://www.cpan.org/authors/id/B/BC/BCHOATE/Text-Textile-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Spec) BuildRequires: perl(HTML::Entities) BuildRequires: perl(Image::Size) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # undetected requirements Requires: perl(File::Spec) Requires: perl(HTML::Entities) Requires: perl(Image::Size) %description Text::Textile is a Perl-based implementation of Dean Allen's Textile syntax. Textile is shorthand for doing common formatting tasks. %prep %setup -q -n Text-Textile-%{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 ARTISTIC Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 2.03-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Textile/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:58:53 -0000 1.1 +++ .cvsignore 4 May 2009 05:39:46 -0000 1.2 @@ -0,0 +1 @@ +Text-Textile-2.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Textile/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:58:53 -0000 1.1 +++ sources 4 May 2009 05:39:46 -0000 1.2 @@ -0,0 +1 @@ +227cc4c97850b4f8448fa2d73c9c328a Text-Textile-2.03.tar.gz From iarnell at fedoraproject.org Mon May 4 05:40:17 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 05:40:17 +0000 (UTC) Subject: rpms/perl-Text-Textile/devel perl-Text-Textile.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504054017.67E7770135@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Text-Textile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9372/devel Modified Files: .cvsignore sources Added Files: perl-Text-Textile.spec Log Message: initial import --- NEW FILE perl-Text-Textile.spec --- Name: perl-Text-Textile Version: 2.03 Release: 1%{?dist} Summary: A humane web text generator License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Textile/ Source0: http://www.cpan.org/authors/id/B/BC/BCHOATE/Text-Textile-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Spec) BuildRequires: perl(HTML::Entities) BuildRequires: perl(Image::Size) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # undetected requirements Requires: perl(File::Spec) Requires: perl(HTML::Entities) Requires: perl(Image::Size) %description Text::Textile is a Perl-based implementation of Dean Allen's Textile syntax. Textile is shorthand for doing common formatting tasks. %prep %setup -q -n Text-Textile-%{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 ARTISTIC Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun May 03 2009 Iain Arnell 2.03-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Textile/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:58:53 -0000 1.1 +++ .cvsignore 4 May 2009 05:39:46 -0000 1.2 @@ -0,0 +1 @@ +Text-Textile-2.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Textile/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:58:53 -0000 1.1 +++ sources 4 May 2009 05:39:46 -0000 1.2 @@ -0,0 +1 @@ +227cc4c97850b4f8448fa2d73c9c328a Text-Textile-2.03.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:22:25 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:22:25 +0000 (UTC) Subject: rpms/python-cclib/devel import.log, NONE, 1.1 python-cclib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504062225.9E9CC700DB@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/python-cclib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15172/devel Modified Files: .cvsignore sources Added Files: import.log python-cclib.spec Log Message: Imported in Fedora. --- NEW FILE import.log --- python-cclib-0_91-4_fc10:HEAD:python-cclib-0.91-4.fc10.src.rpm:1241418062 --- NEW FILE python-cclib.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %global oname cclib Name: python-cclib Version: 0.91 Release: 4%{?dist} Summary: A library for processing results of computational chemistry packages Group: Development/Languages License: LGPLv2+ URL: http://cclib.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{oname}/%{oname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel # For test phase BuildRequires: numpy Requires: numpy # Supplementary Requires: Requires: PyQt4 Requires: PyQuante Requires: python-biopython Requires: python-openbabel Requires: vtk-python %description cclib is an open source library, written in Python, for parsing and interpreting the results of computational chemistry packages. The current version, cclib 0.9, parses output files from ADF, GAMESS (US), GAMESS-UK, Gaussian, Jaguar, Molpro, ORCA and PC GAMESS. %prep %setup -q -n %{oname}-%{version} # Fix permissions find . -type f -exec chmod 644 {} \; # Fix line endings for file in PKG-INFO test/*.py; do sed -e 's|\r||g' $file > $file.new && touch -r $file $file.new && mv $file.new $file done %build python setup.py build %install rm -rf $RPM_BUILD_ROOT python setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} # Test phase needs installed python-cclib %check cd test PYTHONPATH=../build/lib python testall.py %files %defattr(-,root,root,-) %doc ANNOUNCE CHANGELOG LICENSE PKG-INFO README THANKS %{python_sitelib}/%{oname}/ %{python_sitelib}/%{oname}-*.egg-info %{_bindir}/ccget %{_bindir}/cda %changelog * Sat May 02 2009 Jussi Lehtola - 0.91-4 - Put everything in main package instead. * Fri Apr 24 2009 Jussi Lehtola - 0.91-3 - Branched supplementary Requires metapackage. * Thu Apr 23 2009 Jussi Lehtola - 0.91-2 - Added BR: numpy and Requires: numpy. - Removed test/ from %%doc. * Thu Apr 23 2009 Jussi Lehtola - 0.91-1 - First release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-cclib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:42:52 -0000 1.1 +++ .cvsignore 4 May 2009 06:21:54 -0000 1.2 @@ -0,0 +1 @@ +cclib-0.91.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-cclib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:42:52 -0000 1.1 +++ sources 4 May 2009 06:21:54 -0000 1.2 @@ -0,0 +1 @@ +64dddde2cf1ab50cf8cb7f2882c88025 cclib-0.91.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:24:35 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:24:35 +0000 (UTC) Subject: rpms/gausssum/devel gausssum-cclib.patch, NONE, 1.1 gausssum.desktop, NONE, 1.1 gausssum.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504062435.1358D700DB@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/gausssum/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15442/devel Modified Files: .cvsignore sources Added Files: gausssum-cclib.patch gausssum.desktop gausssum.spec import.log Log Message: Imported in Fedora. gausssum-cclib.patch: --- NEW FILE gausssum-cclib.patch --- diff -up GaussSum-2.1.6/gausssum/aboutbox.py.orig GaussSum-2.1.6/gausssum/aboutbox.py --- GaussSum-2.1.6/gausssum/aboutbox.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/aboutbox.py 2009-05-03 09:15:46.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser import ADF, GAMESS, Gaussian +from cclib.parser import ADF, GAMESS, Gaussian import os, sys if hasattr(sys, "frozen"): # i.e. if using py2exe installlocation = os.path.dirname(sys.executable) diff -up GaussSum-2.1.6/gausssum/electrontrans.py.orig GaussSum-2.1.6/gausssum/electrontrans.py --- GaussSum-2.1.6/gausssum/electrontrans.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/electrontrans.py 2009-05-03 09:15:56.000000000 +0300 @@ -4,7 +4,7 @@ import math import numpy import pdb from gausssum.utils import GaussianSpectrum, levelname, percent -from gausssum.cclib.parser.utils import convertor +from cclib.parser.utils import convertor from Tkinter import * from gnupy import Gnuplot diff -up GaussSum-2.1.6/gausssum/gausssumgui.py.orig GaussSum-2.1.6/gausssum/gausssumgui.py --- GaussSum-2.1.6/gausssum/gausssumgui.py.orig 2009-04-14 12:08:58.000000000 +0300 +++ GaussSum-2.1.6/gausssum/gausssumgui.py 2009-05-03 09:16:06.000000000 +0300 @@ -22,7 +22,7 @@ import copy # For deepcopy.. import ConfigParser # For writing the settings to an .ini file import logging -from gausssum.cclib.parser import ADF, GAMESS, Gaussian, ccopen +from cclib.parser import ADF, GAMESS, Gaussian, ccopen from gausssum.preferencesbox import PreferencesPopupBox from gausssum.aboutbox import AboutPopupBox from gausssum.popanalysis import Popanalysis diff -up GaussSum-2.1.6/gausssum/preferencesbox.py.orig GaussSum-2.1.6/gausssum/preferencesbox.py --- GaussSum-2.1.6/gausssum/preferencesbox.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/preferencesbox.py 2009-05-03 09:16:20.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser import ADF, GAMESS, Gaussian +from cclib.parser import ADF, GAMESS, Gaussian from gausssum.plot import DisplayPlot from gausssum.gnupy import Gnuplot diff -up GaussSum-2.1.6/gausssum/utils.py.orig GaussSum-2.1.6/gausssum/utils.py --- GaussSum-2.1.6/gausssum/utils.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/utils.py 2009-05-03 09:16:30.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser.utils import PeriodicTable +from cclib.parser.utils import PeriodicTable # from cclib.parser.utils import PeriodicTable import numpy --- NEW FILE gausssum.desktop --- [Desktop Entry] Name=GaussSum GenericName=GaussSum Comment=Analyze output of Quantum Chemistry packages Exec=GaussSum.py Icon=GaussSum Terminal=false Type=Application Categories=Science;Education;Chemistry;Physics;DataVisualization; --- NEW FILE gausssum.spec --- %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gausssum Version: 2.1.6 Release: 3%{?dist} Summary: A GUI application for analysis of output of quantum computations Group: Applications/Engineering License: GPLv2+ URL: http://gausssum.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/GaussSum-%{version}.tar.gz Source1: gausssum.desktop # Patch to use system python-cclib instead of own copy Patch0: gausssum-cclib.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch # For converting .ico into .png BuildRequires: ImageMagick BuildRequires: desktop-file-utils Requires: gnuplot Requires: numpy Requires: python-cclib Requires: python-imaging-tk %description GaussSum is a GUI application that can analyse the output of ADF, GAMESS (US), GAMESS-UK, Gaussian, Jaguar and PC GAMESS to extract and calculate useful information. This includes the progress of the SCF cycles, geometry optimisation, UV-Vis/IR/Raman spectra, MO levels, MO contributions and more. %prep %setup -q -n GaussSum-%{version} %patch0 -p1 # Change location of documentation sed 's|os.path.join(installlocation,"Docs","index.html")|"%{_docdir}/%{name}-%{version}/Docs/index.html"|g' \ gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \ touch -r gausssum/gausssumgui.py gausssum/gausssumgui.py.new && \ mv gausssum/gausssumgui.py.new gausssum/gausssumgui.py # Fix gnuplot location sed 's|os.path.join(installlocation,"gnuplot400","bin","wgnuplot.exe")|"%{_bindir}/gnuplot"|g' \ gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \ touch -r gausssum/gausssumgui.py gausssum/gausssumgui.py.new && \ mv gausssum/gausssumgui.py.new gausssum/gausssumgui.py # Fix end of line encodings for file in Docs/style.css gausssum/*.py gausssum/cclib/*.py; do sed -e 's|\r||g' $file > $file.new && \ touch -r $file $file.new && \ mv $file.new $file done # Fix attributes find gausssum/ -name "*.py" -exec chmod 644 {} \; chmod 644 Docs/mesh.gif Docs/style.css # Convert icon into png convert GaussSum.ico GaussSum.png # Remove integrated cclib rm -rf gausssum/cclib %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{python_sitelib} # Install python library cp -a %{name} %{buildroot}%{python_sitelib} # Install python executable itself install -D -p -m 755 GaussSum.py %{buildroot}%{_bindir}/GaussSum.py # Install icon install -D -p -m 644 GaussSum.png %{buildroot}%{_datadir}/pixmaps/GaussSum.png # Install desktop file desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Docs/ %{_bindir}/GaussSum.py %{python_sitelib}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/GaussSum.png # Older rpm versions generate compiled Python objects in bindir %if 0%{?fedora} < 11 %exclude %{_bindir}/GaussSum.pyc %exclude %{_bindir}/GaussSum.pyo %endif %changelog * Sun May 03 2009 Jussi Lehtola - 2.1.6-3 - Final eview fixes. * Sun May 03 2009 Jussi Lehtola - 2.1.6-2 - Review fixes. * Wed Apr 29 2009 Jussi Lehtola - 2.1.6-1 - First release. --- NEW FILE import.log --- gausssum-2_1_6-3_fc10:HEAD:gausssum-2.1.6-3.fc10.src.rpm:1241418113 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gausssum/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:46:27 -0000 1.1 +++ .cvsignore 4 May 2009 06:24:04 -0000 1.2 @@ -0,0 +1 @@ +GaussSum-2.1.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gausssum/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:46:27 -0000 1.1 +++ sources 4 May 2009 06:24:04 -0000 1.2 @@ -0,0 +1 @@ +80d0c796f1fc8d2959bb28a8e9f09d58 GaussSum-2.1.6.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:24:39 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:24:39 +0000 (UTC) Subject: rpms/qmforge/devel import.log, NONE, 1.1 qmforge.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504062439.E84B0700DB@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/qmforge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15460/devel Modified Files: .cvsignore sources Added Files: import.log qmforge.spec Log Message: Imported in Fedora. --- NEW FILE import.log --- qmforge-2_1-4_fc10:HEAD:qmforge-2.1-4.fc10.src.rpm:1241418114 --- NEW FILE qmforge.spec --- %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # Package is a GUI program, but there is no icon available. # A .desktop file cannot be made without one => no desktop file. Name: qmforge Version: 2.1 Release: 4%{?dist} Summary: Analysis tools for quantum mechanical calculations Group: Development/Languages License: GPLv2+ URL: http://qmforge.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/QMForge-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: PyQt4 BuildRequires: python-devel BuildRequires: python-cclib Requires: PyQt4 Requires: python-cclib Requires: python-openbabel Requires: PyOpenGL %description QMForge reads output from various quantum mechanical calculations and provides tools for analyzing these results. Specifically, population (Mulliken and C-squared), fragment, and charge decomposition analyses are available. %prep %setup -q -n QMForge-%{version} # Remove shebangs from libraries for file in src/*; do grep -v "#!/usr/bin/env python" $file > $file.new && \ touch -r $file $file.new && \ mv $file.new $file done %build # Remove CFLAGS=... for noarch packages (unneeded) python setup.py build %install rm -rf %{buildroot} python setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc PKG-INFO %{python_sitelib}/%{name}/ %{python_sitelib}/QMForge-*.egg-info %{_bindir}/%{name} %changelog * Sat Apr 25 2009 Jussi Lehtola - 2.1-4 - Removed duplicate Requires: python-openbabel. - Added Requires: PyOpenGL. * Thu Apr 23 2009 Jussi Lehtola - 2.1-3 - Added missing BRs to be able to build in mock. * Thu Apr 23 2009 Jussi Lehtola - 2.1-2 - Added comment about desktop file. * Thu Apr 23 2009 Jussi Lehtola - 2.1-1 - First release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qmforge/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:43:46 -0000 1.1 +++ .cvsignore 4 May 2009 06:24:09 -0000 1.2 @@ -0,0 +1 @@ +QMForge-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qmforge/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:43:46 -0000 1.1 +++ sources 4 May 2009 06:24:09 -0000 1.2 @@ -0,0 +1 @@ +3caf2b40d1391ea1f6251cb598e8c32a QMForge-2.1.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:25:25 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:25:25 +0000 (UTC) Subject: rpms/python-cclib/F-10 python-cclib.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090504062525.ED8FC700DB@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/python-cclib/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15842/F-10 Modified Files: sources Added Files: python-cclib.spec Log Message: Imported in Fedora. --- NEW FILE python-cclib.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %global oname cclib Name: python-cclib Version: 0.91 Release: 4%{?dist} Summary: A library for processing results of computational chemistry packages Group: Development/Languages License: LGPLv2+ URL: http://cclib.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{oname}/%{oname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel # For test phase BuildRequires: numpy Requires: numpy # Supplementary Requires: Requires: PyQt4 Requires: PyQuante Requires: python-biopython Requires: python-openbabel Requires: vtk-python %description cclib is an open source library, written in Python, for parsing and interpreting the results of computational chemistry packages. The current version, cclib 0.9, parses output files from ADF, GAMESS (US), GAMESS-UK, Gaussian, Jaguar, Molpro, ORCA and PC GAMESS. %prep %setup -q -n %{oname}-%{version} # Fix permissions find . -type f -exec chmod 644 {} \; # Fix line endings for file in PKG-INFO test/*.py; do sed -e 's|\r||g' $file > $file.new && touch -r $file $file.new && mv $file.new $file done %build python setup.py build %install rm -rf $RPM_BUILD_ROOT python setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} # Test phase needs installed python-cclib %check cd test PYTHONPATH=../build/lib python testall.py %files %defattr(-,root,root,-) %doc ANNOUNCE CHANGELOG LICENSE PKG-INFO README THANKS %{python_sitelib}/%{oname}/ %{python_sitelib}/%{oname}-*.egg-info %{_bindir}/ccget %{_bindir}/cda %changelog * Sat May 02 2009 Jussi Lehtola - 0.91-4 - Put everything in main package instead. * Fri Apr 24 2009 Jussi Lehtola - 0.91-3 - Branched supplementary Requires metapackage. * Thu Apr 23 2009 Jussi Lehtola - 0.91-2 - Added BR: numpy and Requires: numpy. - Removed test/ from %%doc. * Thu Apr 23 2009 Jussi Lehtola - 0.91-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-cclib/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:42:52 -0000 1.1 +++ sources 4 May 2009 06:24:55 -0000 1.2 @@ -0,0 +1 @@ +64dddde2cf1ab50cf8cb7f2882c88025 cclib-0.91.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:25:26 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:25:26 +0000 (UTC) Subject: rpms/python-cclib/F-11 python-cclib.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090504062526.5A857700DB@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/python-cclib/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15842/F-11 Modified Files: sources Added Files: python-cclib.spec Log Message: Imported in Fedora. --- NEW FILE python-cclib.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %global oname cclib Name: python-cclib Version: 0.91 Release: 4%{?dist} Summary: A library for processing results of computational chemistry packages Group: Development/Languages License: LGPLv2+ URL: http://cclib.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{oname}/%{oname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel # For test phase BuildRequires: numpy Requires: numpy # Supplementary Requires: Requires: PyQt4 Requires: PyQuante Requires: python-biopython Requires: python-openbabel Requires: vtk-python %description cclib is an open source library, written in Python, for parsing and interpreting the results of computational chemistry packages. The current version, cclib 0.9, parses output files from ADF, GAMESS (US), GAMESS-UK, Gaussian, Jaguar, Molpro, ORCA and PC GAMESS. %prep %setup -q -n %{oname}-%{version} # Fix permissions find . -type f -exec chmod 644 {} \; # Fix line endings for file in PKG-INFO test/*.py; do sed -e 's|\r||g' $file > $file.new && touch -r $file $file.new && mv $file.new $file done %build python setup.py build %install rm -rf $RPM_BUILD_ROOT python setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} # Test phase needs installed python-cclib %check cd test PYTHONPATH=../build/lib python testall.py %files %defattr(-,root,root,-) %doc ANNOUNCE CHANGELOG LICENSE PKG-INFO README THANKS %{python_sitelib}/%{oname}/ %{python_sitelib}/%{oname}-*.egg-info %{_bindir}/ccget %{_bindir}/cda %changelog * Sat May 02 2009 Jussi Lehtola - 0.91-4 - Put everything in main package instead. * Fri Apr 24 2009 Jussi Lehtola - 0.91-3 - Branched supplementary Requires metapackage. * Thu Apr 23 2009 Jussi Lehtola - 0.91-2 - Added BR: numpy and Requires: numpy. - Removed test/ from %%doc. * Thu Apr 23 2009 Jussi Lehtola - 0.91-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-cclib/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:42:52 -0000 1.1 +++ sources 4 May 2009 06:24:56 -0000 1.2 @@ -0,0 +1 @@ +64dddde2cf1ab50cf8cb7f2882c88025 cclib-0.91.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:26:57 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:26:57 +0000 (UTC) Subject: rpms/gausssum/F-10 gausssum-cclib.patch, NONE, 1.1 gausssum.desktop, NONE, 1.1 gausssum.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504062657.82B15700DB@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/gausssum/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16329/F-10 Modified Files: sources Added Files: gausssum-cclib.patch gausssum.desktop gausssum.spec Log Message: Imported in Fedora. gausssum-cclib.patch: --- NEW FILE gausssum-cclib.patch --- diff -up GaussSum-2.1.6/gausssum/aboutbox.py.orig GaussSum-2.1.6/gausssum/aboutbox.py --- GaussSum-2.1.6/gausssum/aboutbox.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/aboutbox.py 2009-05-03 09:15:46.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser import ADF, GAMESS, Gaussian +from cclib.parser import ADF, GAMESS, Gaussian import os, sys if hasattr(sys, "frozen"): # i.e. if using py2exe installlocation = os.path.dirname(sys.executable) diff -up GaussSum-2.1.6/gausssum/electrontrans.py.orig GaussSum-2.1.6/gausssum/electrontrans.py --- GaussSum-2.1.6/gausssum/electrontrans.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/electrontrans.py 2009-05-03 09:15:56.000000000 +0300 @@ -4,7 +4,7 @@ import math import numpy import pdb from gausssum.utils import GaussianSpectrum, levelname, percent -from gausssum.cclib.parser.utils import convertor +from cclib.parser.utils import convertor from Tkinter import * from gnupy import Gnuplot diff -up GaussSum-2.1.6/gausssum/gausssumgui.py.orig GaussSum-2.1.6/gausssum/gausssumgui.py --- GaussSum-2.1.6/gausssum/gausssumgui.py.orig 2009-04-14 12:08:58.000000000 +0300 +++ GaussSum-2.1.6/gausssum/gausssumgui.py 2009-05-03 09:16:06.000000000 +0300 @@ -22,7 +22,7 @@ import copy # For deepcopy.. import ConfigParser # For writing the settings to an .ini file import logging -from gausssum.cclib.parser import ADF, GAMESS, Gaussian, ccopen +from cclib.parser import ADF, GAMESS, Gaussian, ccopen from gausssum.preferencesbox import PreferencesPopupBox from gausssum.aboutbox import AboutPopupBox from gausssum.popanalysis import Popanalysis diff -up GaussSum-2.1.6/gausssum/preferencesbox.py.orig GaussSum-2.1.6/gausssum/preferencesbox.py --- GaussSum-2.1.6/gausssum/preferencesbox.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/preferencesbox.py 2009-05-03 09:16:20.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser import ADF, GAMESS, Gaussian +from cclib.parser import ADF, GAMESS, Gaussian from gausssum.plot import DisplayPlot from gausssum.gnupy import Gnuplot diff -up GaussSum-2.1.6/gausssum/utils.py.orig GaussSum-2.1.6/gausssum/utils.py --- GaussSum-2.1.6/gausssum/utils.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/utils.py 2009-05-03 09:16:30.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser.utils import PeriodicTable +from cclib.parser.utils import PeriodicTable # from cclib.parser.utils import PeriodicTable import numpy --- NEW FILE gausssum.desktop --- [Desktop Entry] Name=GaussSum GenericName=GaussSum Comment=Analyze output of Quantum Chemistry packages Exec=GaussSum.py Icon=GaussSum Terminal=false Type=Application Categories=Science;Education;Chemistry;Physics;DataVisualization; --- NEW FILE gausssum.spec --- %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gausssum Version: 2.1.6 Release: 3%{?dist} Summary: A GUI application for analysis of output of quantum computations Group: Applications/Engineering License: GPLv2+ URL: http://gausssum.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/GaussSum-%{version}.tar.gz Source1: gausssum.desktop # Patch to use system python-cclib instead of own copy Patch0: gausssum-cclib.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch # For converting .ico into .png BuildRequires: ImageMagick BuildRequires: desktop-file-utils Requires: gnuplot Requires: numpy Requires: python-cclib Requires: python-imaging-tk %description GaussSum is a GUI application that can analyse the output of ADF, GAMESS (US), GAMESS-UK, Gaussian, Jaguar and PC GAMESS to extract and calculate useful information. This includes the progress of the SCF cycles, geometry optimisation, UV-Vis/IR/Raman spectra, MO levels, MO contributions and more. %prep %setup -q -n GaussSum-%{version} %patch0 -p1 # Change location of documentation sed 's|os.path.join(installlocation,"Docs","index.html")|"%{_docdir}/%{name}-%{version}/Docs/index.html"|g' \ gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \ touch -r gausssum/gausssumgui.py gausssum/gausssumgui.py.new && \ mv gausssum/gausssumgui.py.new gausssum/gausssumgui.py # Fix gnuplot location sed 's|os.path.join(installlocation,"gnuplot400","bin","wgnuplot.exe")|"%{_bindir}/gnuplot"|g' \ gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \ touch -r gausssum/gausssumgui.py gausssum/gausssumgui.py.new && \ mv gausssum/gausssumgui.py.new gausssum/gausssumgui.py # Fix end of line encodings for file in Docs/style.css gausssum/*.py gausssum/cclib/*.py; do sed -e 's|\r||g' $file > $file.new && \ touch -r $file $file.new && \ mv $file.new $file done # Fix attributes find gausssum/ -name "*.py" -exec chmod 644 {} \; chmod 644 Docs/mesh.gif Docs/style.css # Convert icon into png convert GaussSum.ico GaussSum.png # Remove integrated cclib rm -rf gausssum/cclib %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{python_sitelib} # Install python library cp -a %{name} %{buildroot}%{python_sitelib} # Install python executable itself install -D -p -m 755 GaussSum.py %{buildroot}%{_bindir}/GaussSum.py # Install icon install -D -p -m 644 GaussSum.png %{buildroot}%{_datadir}/pixmaps/GaussSum.png # Install desktop file desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Docs/ %{_bindir}/GaussSum.py %{python_sitelib}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/GaussSum.png # Older rpm versions generate compiled Python objects in bindir %if 0%{?fedora} < 11 %exclude %{_bindir}/GaussSum.pyc %exclude %{_bindir}/GaussSum.pyo %endif %changelog * Sun May 03 2009 Jussi Lehtola - 2.1.6-3 - Final eview fixes. * Sun May 03 2009 Jussi Lehtola - 2.1.6-2 - Review fixes. * Wed Apr 29 2009 Jussi Lehtola - 2.1.6-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gausssum/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:46:27 -0000 1.1 +++ sources 4 May 2009 06:26:27 -0000 1.2 @@ -0,0 +1 @@ +80d0c796f1fc8d2959bb28a8e9f09d58 GaussSum-2.1.6.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:26:57 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:26:57 +0000 (UTC) Subject: rpms/gausssum/F-11 gausssum-cclib.patch, NONE, 1.1 gausssum.desktop, NONE, 1.1 gausssum.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504062657.D8751700DB@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/gausssum/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16329/F-11 Modified Files: sources Added Files: gausssum-cclib.patch gausssum.desktop gausssum.spec Log Message: Imported in Fedora. gausssum-cclib.patch: --- NEW FILE gausssum-cclib.patch --- diff -up GaussSum-2.1.6/gausssum/aboutbox.py.orig GaussSum-2.1.6/gausssum/aboutbox.py --- GaussSum-2.1.6/gausssum/aboutbox.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/aboutbox.py 2009-05-03 09:15:46.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser import ADF, GAMESS, Gaussian +from cclib.parser import ADF, GAMESS, Gaussian import os, sys if hasattr(sys, "frozen"): # i.e. if using py2exe installlocation = os.path.dirname(sys.executable) diff -up GaussSum-2.1.6/gausssum/electrontrans.py.orig GaussSum-2.1.6/gausssum/electrontrans.py --- GaussSum-2.1.6/gausssum/electrontrans.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/electrontrans.py 2009-05-03 09:15:56.000000000 +0300 @@ -4,7 +4,7 @@ import math import numpy import pdb from gausssum.utils import GaussianSpectrum, levelname, percent -from gausssum.cclib.parser.utils import convertor +from cclib.parser.utils import convertor from Tkinter import * from gnupy import Gnuplot diff -up GaussSum-2.1.6/gausssum/gausssumgui.py.orig GaussSum-2.1.6/gausssum/gausssumgui.py --- GaussSum-2.1.6/gausssum/gausssumgui.py.orig 2009-04-14 12:08:58.000000000 +0300 +++ GaussSum-2.1.6/gausssum/gausssumgui.py 2009-05-03 09:16:06.000000000 +0300 @@ -22,7 +22,7 @@ import copy # For deepcopy.. import ConfigParser # For writing the settings to an .ini file import logging -from gausssum.cclib.parser import ADF, GAMESS, Gaussian, ccopen +from cclib.parser import ADF, GAMESS, Gaussian, ccopen from gausssum.preferencesbox import PreferencesPopupBox from gausssum.aboutbox import AboutPopupBox from gausssum.popanalysis import Popanalysis diff -up GaussSum-2.1.6/gausssum/preferencesbox.py.orig GaussSum-2.1.6/gausssum/preferencesbox.py --- GaussSum-2.1.6/gausssum/preferencesbox.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/preferencesbox.py 2009-05-03 09:16:20.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser import ADF, GAMESS, Gaussian +from cclib.parser import ADF, GAMESS, Gaussian from gausssum.plot import DisplayPlot from gausssum.gnupy import Gnuplot diff -up GaussSum-2.1.6/gausssum/utils.py.orig GaussSum-2.1.6/gausssum/utils.py --- GaussSum-2.1.6/gausssum/utils.py.orig 2009-04-14 12:08:55.000000000 +0300 +++ GaussSum-2.1.6/gausssum/utils.py 2009-05-03 09:16:30.000000000 +0300 @@ -21,7 +21,7 @@ import traceback import copy # For deepcopy...until I find a better way of doing this import ConfigParser # For writing the settings to an .ini file -from gausssum.cclib.parser.utils import PeriodicTable +from cclib.parser.utils import PeriodicTable # from cclib.parser.utils import PeriodicTable import numpy --- NEW FILE gausssum.desktop --- [Desktop Entry] Name=GaussSum GenericName=GaussSum Comment=Analyze output of Quantum Chemistry packages Exec=GaussSum.py Icon=GaussSum Terminal=false Type=Application Categories=Science;Education;Chemistry;Physics;DataVisualization; --- NEW FILE gausssum.spec --- %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gausssum Version: 2.1.6 Release: 3%{?dist} Summary: A GUI application for analysis of output of quantum computations Group: Applications/Engineering License: GPLv2+ URL: http://gausssum.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/GaussSum-%{version}.tar.gz Source1: gausssum.desktop # Patch to use system python-cclib instead of own copy Patch0: gausssum-cclib.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch # For converting .ico into .png BuildRequires: ImageMagick BuildRequires: desktop-file-utils Requires: gnuplot Requires: numpy Requires: python-cclib Requires: python-imaging-tk %description GaussSum is a GUI application that can analyse the output of ADF, GAMESS (US), GAMESS-UK, Gaussian, Jaguar and PC GAMESS to extract and calculate useful information. This includes the progress of the SCF cycles, geometry optimisation, UV-Vis/IR/Raman spectra, MO levels, MO contributions and more. %prep %setup -q -n GaussSum-%{version} %patch0 -p1 # Change location of documentation sed 's|os.path.join(installlocation,"Docs","index.html")|"%{_docdir}/%{name}-%{version}/Docs/index.html"|g' \ gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \ touch -r gausssum/gausssumgui.py gausssum/gausssumgui.py.new && \ mv gausssum/gausssumgui.py.new gausssum/gausssumgui.py # Fix gnuplot location sed 's|os.path.join(installlocation,"gnuplot400","bin","wgnuplot.exe")|"%{_bindir}/gnuplot"|g' \ gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \ touch -r gausssum/gausssumgui.py gausssum/gausssumgui.py.new && \ mv gausssum/gausssumgui.py.new gausssum/gausssumgui.py # Fix end of line encodings for file in Docs/style.css gausssum/*.py gausssum/cclib/*.py; do sed -e 's|\r||g' $file > $file.new && \ touch -r $file $file.new && \ mv $file.new $file done # Fix attributes find gausssum/ -name "*.py" -exec chmod 644 {} \; chmod 644 Docs/mesh.gif Docs/style.css # Convert icon into png convert GaussSum.ico GaussSum.png # Remove integrated cclib rm -rf gausssum/cclib %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{python_sitelib} # Install python library cp -a %{name} %{buildroot}%{python_sitelib} # Install python executable itself install -D -p -m 755 GaussSum.py %{buildroot}%{_bindir}/GaussSum.py # Install icon install -D -p -m 644 GaussSum.png %{buildroot}%{_datadir}/pixmaps/GaussSum.png # Install desktop file desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Docs/ %{_bindir}/GaussSum.py %{python_sitelib}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/GaussSum.png # Older rpm versions generate compiled Python objects in bindir %if 0%{?fedora} < 11 %exclude %{_bindir}/GaussSum.pyc %exclude %{_bindir}/GaussSum.pyo %endif %changelog * Sun May 03 2009 Jussi Lehtola - 2.1.6-3 - Final eview fixes. * Sun May 03 2009 Jussi Lehtola - 2.1.6-2 - Review fixes. * Wed Apr 29 2009 Jussi Lehtola - 2.1.6-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gausssum/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:46:27 -0000 1.1 +++ sources 4 May 2009 06:26:27 -0000 1.2 @@ -0,0 +1 @@ +80d0c796f1fc8d2959bb28a8e9f09d58 GaussSum-2.1.6.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:27:02 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:27:02 +0000 (UTC) Subject: rpms/qmforge/F-10 qmforge.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090504062702.3B4B5700DB@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/qmforge/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16404/F-10 Modified Files: sources Added Files: qmforge.spec Log Message: Imported in Fedora. --- NEW FILE qmforge.spec --- %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # Package is a GUI program, but there is no icon available. # A .desktop file cannot be made without one => no desktop file. Name: qmforge Version: 2.1 Release: 4%{?dist} Summary: Analysis tools for quantum mechanical calculations Group: Development/Languages License: GPLv2+ URL: http://qmforge.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/QMForge-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: PyQt4 BuildRequires: python-devel BuildRequires: python-cclib Requires: PyQt4 Requires: python-cclib Requires: python-openbabel Requires: PyOpenGL %description QMForge reads output from various quantum mechanical calculations and provides tools for analyzing these results. Specifically, population (Mulliken and C-squared), fragment, and charge decomposition analyses are available. %prep %setup -q -n QMForge-%{version} # Remove shebangs from libraries for file in src/*; do grep -v "#!/usr/bin/env python" $file > $file.new && \ touch -r $file $file.new && \ mv $file.new $file done %build # Remove CFLAGS=... for noarch packages (unneeded) python setup.py build %install rm -rf %{buildroot} python setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc PKG-INFO %{python_sitelib}/%{name}/ %{python_sitelib}/QMForge-*.egg-info %{_bindir}/%{name} %changelog * Sat Apr 25 2009 Jussi Lehtola - 2.1-4 - Removed duplicate Requires: python-openbabel. - Added Requires: PyOpenGL. * Thu Apr 23 2009 Jussi Lehtola - 2.1-3 - Added missing BRs to be able to build in mock. * Thu Apr 23 2009 Jussi Lehtola - 2.1-2 - Added comment about desktop file. * Thu Apr 23 2009 Jussi Lehtola - 2.1-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qmforge/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:43:46 -0000 1.1 +++ sources 4 May 2009 06:26:32 -0000 1.2 @@ -0,0 +1 @@ +3caf2b40d1391ea1f6251cb598e8c32a QMForge-2.1.tar.gz From jussilehtola at fedoraproject.org Mon May 4 06:27:02 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 4 May 2009 06:27:02 +0000 (UTC) Subject: rpms/qmforge/F-11 qmforge.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090504062702.9A62170131@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/qmforge/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16404/F-11 Modified Files: sources Added Files: qmforge.spec Log Message: Imported in Fedora. --- NEW FILE qmforge.spec --- %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # Package is a GUI program, but there is no icon available. # A .desktop file cannot be made without one => no desktop file. Name: qmforge Version: 2.1 Release: 4%{?dist} Summary: Analysis tools for quantum mechanical calculations Group: Development/Languages License: GPLv2+ URL: http://qmforge.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/QMForge-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: PyQt4 BuildRequires: python-devel BuildRequires: python-cclib Requires: PyQt4 Requires: python-cclib Requires: python-openbabel Requires: PyOpenGL %description QMForge reads output from various quantum mechanical calculations and provides tools for analyzing these results. Specifically, population (Mulliken and C-squared), fragment, and charge decomposition analyses are available. %prep %setup -q -n QMForge-%{version} # Remove shebangs from libraries for file in src/*; do grep -v "#!/usr/bin/env python" $file > $file.new && \ touch -r $file $file.new && \ mv $file.new $file done %build # Remove CFLAGS=... for noarch packages (unneeded) python setup.py build %install rm -rf %{buildroot} python setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc PKG-INFO %{python_sitelib}/%{name}/ %{python_sitelib}/QMForge-*.egg-info %{_bindir}/%{name} %changelog * Sat Apr 25 2009 Jussi Lehtola - 2.1-4 - Removed duplicate Requires: python-openbabel. - Added Requires: PyOpenGL. * Thu Apr 23 2009 Jussi Lehtola - 2.1-3 - Added missing BRs to be able to build in mock. * Thu Apr 23 2009 Jussi Lehtola - 2.1-2 - Added comment about desktop file. * Thu Apr 23 2009 Jussi Lehtola - 2.1-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qmforge/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:43:46 -0000 1.1 +++ sources 4 May 2009 06:26:32 -0000 1.2 @@ -0,0 +1 @@ +3caf2b40d1391ea1f6251cb598e8c32a QMForge-2.1.tar.gz From ellert at fedoraproject.org Mon May 4 06:56:41 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Mon, 4 May 2009 06:56:41 +0000 (UTC) Subject: rpms/globus-gsi-callback/devel globus-gsi-callback-ltlib.patch, NONE, 1.1 globus-gsi-callback.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504065642.01756700DB@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gsi-callback/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20961/devel Modified Files: .cvsignore sources Added Files: globus-gsi-callback-ltlib.patch globus-gsi-callback.spec import.log Log Message: * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball globus-gsi-callback-ltlib.patch: --- NEW FILE globus-gsi-callback-ltlib.patch --- diff -ur globus_gsi_callback-1.10.orig/library/Makefile.am globus_gsi_callback-1.10/library/Makefile.am --- globus_gsi_callback-1.10.orig/library/Makefile.am 2004-08-24 17:38:29.000000000 +0200 +++ globus_gsi_callback-1.10/library/Makefile.am 2008-10-16 09:13:46.000000000 +0200 @@ -21,8 +21,7 @@ libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@ -lglobus_oldgaa_$(GLOBUS_FLAVOR_NAME) - -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ -L./oldgaa/ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = ./oldgaa/libglobus_oldgaa_$(GLOBUS_FLAVOR_NAME).la @GPT_LIB_LINKS@ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ include $(top_srcdir)/globus_automake_post --- NEW FILE globus-gsi-callback.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gsi-callback %global _name %(tr - _ <<< %{name}) Version: 1.10 Release: 1%{?dist} Summary: Globus Toolkit - Globus GSI Callback Library Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gsi/callback/source globus_gsi_callback-1.10 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_callback-1.10 # tar -zcf globus_gsi_callback-1.10.tar.gz globus_gsi_callback-1.10 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Use .la files when linking within a package: # http://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6476 Patch0: %{name}-ltlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-openssl >= 1 BuildRequires: grid-packaging-tools BuildRequires: globus-gsi-proxy-ssl-devel >= 1 BuildRequires: globus-openssl-module-devel BuildRequires: globus-gsi-openssl-error-devel BuildRequires: globus-openssl-devel >= 1 BuildRequires: globus-core >= 4 BuildRequires: globus-gsi-cert-utils-devel >= 2 BuildRequires: globus-common-devel >= 3 BuildRequires: globus-gsi-sysconfig-devel >= 1 BuildRequires: doxygen %if %{?fedora}%{!?fedora:0} >= 3 BuildRequires: graphviz BuildRequires: ghostscript %else %if %{?rhel}%{!?rhel:0} >= 5 BuildRequires: graphviz BuildRequires: ghostscript %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif %endif %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %endif %package devel Summary: Globus Toolkit - Globus GSI Callback Library Development Files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: globus-gsi-proxy-ssl-devel >= 1 Requires: globus-openssl-module-devel Requires: globus-gsi-openssl-error-devel Requires: globus-openssl-devel >= 1 Requires: globus-core >= 4 Requires: globus-gsi-cert-utils-devel >= 2 Requires: globus-common-devel >= 3 Requires: globus-gsi-sysconfig-devel >= 1 %package doc Summary: Globus Toolkit - Globus GSI Callback Library Documentation Files Group: Documentation Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GSI Callback Library %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GSI Callback Library Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GSI Callback Library Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Remove unwanted documentation rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/deprecated\.3/d' \ -e '/_%{_name}-%{version}_.*\.3/d' \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball * Sun Mar 15 2009 Mattias Ellert - 1.10-0.5 - Adapting to updated globus-core package * Thu Feb 26 2009 Mattias Ellert - 1.10-0.4 - Add s390x to the list of 64 bit platforms * Thu Jan 1 2009 Mattias Ellert - 1.10-0.3 - Adapt to updated GPT package * Tue Oct 14 2008 Mattias Ellert - 1.10-0.2 - Update to Globus Toolkit 4.2.1 * Mon Jul 14 2008 Mattias Ellert - 1.4-0.1 - Autogenerated --- NEW FILE import.log --- globus-gsi-callback-1_10-1_fc9:HEAD:globus-gsi-callback-1.10-1.fc9.src.rpm:1241420126 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:59:11 -0000 1.1 +++ .cvsignore 4 May 2009 06:56:11 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gsi_callback-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:59:11 -0000 1.1 +++ sources 4 May 2009 06:56:11 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +1e45fc05f452f0eeba6cc7620393bd64 globus_gsi_callback-1.10.tar.gz From iankent at fedoraproject.org Mon May 4 06:58:57 2009 From: iankent at fedoraproject.org (Ian Kent) Date: Mon, 4 May 2009 06:58:57 +0000 (UTC) Subject: rpms/autofs/F-10 autofs-5.0.3-fix-memory-leak-reading-ldap-master.patch, NONE, 1.1 autofs-5.0.3-renew-sasl-creds-upon-reconnect-fail.patch, NONE, 1.1 autofs-5.0.3-uris-list-locking-final.patch, NONE, 1.1 autofs-5.0.4-add-lsb-init-script-parameter-block.patch, NONE, 1.1 autofs.spec, 1.261, 1.262 autofs-5.0.3-add-missing-uris-list-locking.patch, 1.1, NONE Message-ID: <20090504065857.521E4700DB@cvs1.fedora.phx.redhat.com> Author: iankent Update of /cvs/pkgs/rpms/autofs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21414 Modified Files: autofs.spec Added Files: autofs-5.0.3-fix-memory-leak-reading-ldap-master.patch autofs-5.0.3-renew-sasl-creds-upon-reconnect-fail.patch autofs-5.0.3-uris-list-locking-final.patch autofs-5.0.4-add-lsb-init-script-parameter-block.patch Removed Files: autofs-5.0.3-add-missing-uris-list-locking.patch Log Message: * Mon May 4 2009 Ian Kent - 5.0.4-43 - update uris list lcoking patch. - renew sasl creds upon reconnect fail. - fix memory leak reading ldap master map. - add LSB init script block. autofs-5.0.3-fix-memory-leak-reading-ldap-master.patch: --- NEW FILE autofs-5.0.3-fix-memory-leak-reading-ldap-master.patch --- autofs-5.0.3 - fix memory leak reading ldap master map From: Ian Kent When reading the master map the storage allocated by getting the location value is not freed after use. --- modules/lookup_ldap.c | 2 ++ 1 file changed, 2 insertions(+) --- autofs-5.0.3.orig/modules/lookup_ldap.c +++ autofs-5.0.3/modules/lookup_ldap.c @@ -1544,6 +1544,8 @@ int lookup_read_master(struct master *ma strcat(buf, " "); strcat(buf, *values); + ldap_value_free(values); + master_parse_entry(buf, timeout, logging, age); next: ldap_value_free(keyValue); autofs-5.0.3-renew-sasl-creds-upon-reconnect-fail.patch: --- NEW FILE autofs-5.0.3-renew-sasl-creds-upon-reconnect-fail.patch --- autofs-5.0.3 - renew sasl creds upon reconnect fail From: Ian Kent If a server re-connect fails it could be due to the authentication credentail having timed out. So we need to dispose of this and retry the connection including refreshing re-authenticating. --- modules/lookup_ldap.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) --- autofs-5.0.3.orig/modules/lookup_ldap.c +++ autofs-5.0.3/modules/lookup_ldap.c @@ -675,6 +675,13 @@ static LDAP *do_reconnect(unsigned logop if (ctxt->server || !ctxt->uris) { ldap = do_connect(logopt, ctxt->server, ctxt); +#ifdef WITH_SASL + /* Dispose of the sasl authentication connection and try again. */ + if (!ldap) { + autofs_sasl_dispose(ctxt); + ldap = connect_to_server(logopt, ctxt->server, ctxt); + } +#endif return ldap; } @@ -682,6 +689,16 @@ static LDAP *do_reconnect(unsigned logop this = ctxt->uri; uris_mutex_unlock(ctxt); ldap = do_connect(logopt, this->uri, ctxt); +#ifdef WITH_SASL + /* + * Dispose of the sasl authentication connection and try the + * current server again before trying other servers in the list. + */ + if (!ldap) { + autofs_sasl_dispose(ctxt); + ldap = connect_to_server(logopt, this->uri, ctxt); + } +#endif if (ldap) return ldap; autofs-5.0.3-uris-list-locking-final.patch: --- NEW FILE autofs-5.0.3-uris-list-locking-final.patch --- autofs-5.0.3 - add missing uris list locking From: Ian Kent Add inadvertantly ommitted server list locking in LDAP module. The ldap uris list doesn't need to change we just need to keep track of current server uri in the list and try to connect in a round robin order. Also it's possible multiple concurrent connection attempts may not be able to use the full list of servers (if one is present). --- include/lookup_ldap.h | 4 +- modules/lookup_ldap.c | 97 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 66 insertions(+), 35 deletions(-) --- autofs-5.0.3.orig/include/lookup_ldap.h +++ autofs-5.0.3/include/lookup_ldap.h @@ -54,7 +54,9 @@ struct lookup_context { * sdns is the list of basdns to check, done in the order * given in configuration. */ - struct list_head *uri; + pthread_mutex_t uris_mutex; + struct list_head *uris; + struct ldap_uri *uri; char *cur_host; struct ldap_searchdn *sdns; --- autofs-5.0.3.orig/modules/lookup_ldap.c +++ autofs-5.0.3/modules/lookup_ldap.c @@ -121,7 +121,23 @@ int ldap_parse_page_control(LDAP *ldap, } #endif /* HAVE_LDAP_PARSE_PAGE_CONTROL */ -int bind_ldap_anonymous(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt) +static void uris_mutex_lock(struct lookup_context *ctxt) +{ + int status = pthread_mutex_lock(&ctxt->uris_mutex); + if (status) + fatal(status); + return; +} + +static void uris_mutex_unlock(struct lookup_context *ctxt) +{ + int status = pthread_mutex_unlock(&ctxt->uris_mutex); + if (status) + fatal(status); + return; +} + +int bind_ldap_anonymous(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_context *ctxt) { int rv; @@ -131,16 +147,14 @@ int bind_ldap_anonymous(unsigned logopt, rv = ldap_simple_bind_s(ldap, NULL, NULL); if (rv != LDAP_SUCCESS) { - if (!ctxt->uri) { + if (!ctxt->uris) { crit(logopt, MODPREFIX "Unable to bind to the LDAP server: " "%s, error %s", ctxt->server ? "" : "(default)", ldap_err2string(rv)); } else { - struct ldap_uri *uri; - uri = list_entry(ctxt->uri->next, struct ldap_uri, list); info(logopt, MODPREFIX "Unable to bind to the LDAP server: " - "%s, error %s", uri->uri, ldap_err2string(rv)); + "%s, error %s", uri, ldap_err2string(rv)); } return -1; } @@ -482,7 +496,7 @@ static int find_query_dn(unsigned logopt return 0; } -static int do_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt) +static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_context *ctxt) { char *host = NULL, *nhost; int rv, need_base = 1; @@ -495,11 +509,11 @@ static int do_bind(unsigned logopt, LDAP rv = autofs_sasl_bind(logopt, ldap, ctxt); debug(logopt, MODPREFIX "autofs_sasl_bind returned %d", rv); } else { - rv = bind_ldap_anonymous(logopt, ldap, ctxt); + rv = bind_ldap_anonymous(logopt, ldap, uri, ctxt); debug(logopt, MODPREFIX "ldap anonymous bind returned %d", rv); } #else - rv = bind_ldap_anonymous(logopt, ldap, ctxt); + rv = bind_ldap_anonymous(logopt, ldap, uri, ctxt); debug(logopt, MODPREFIX "ldap anonymous bind returned %d", rv); #endif @@ -568,7 +582,7 @@ static LDAP *do_connect(unsigned logopt, if (!ldap) return NULL; - if (!do_bind(logopt, ldap, ctxt)) { + if (!do_bind(logopt, ldap, uri, ctxt)) { unbind_ldap_connection(logopt, ldap, ctxt); return NULL; } @@ -596,7 +610,7 @@ static LDAP *connect_to_server(unsigned return NULL; } - if (!do_bind(logopt, ldap, ctxt)) { + if (!do_bind(logopt, ldap, uri, ctxt)) { unbind_ldap_connection(logopt, ldap, ctxt); autofs_sasl_dispose(ctxt); error(logopt, MODPREFIX "cannot bind to server"); @@ -622,31 +636,34 @@ static LDAP *find_server(unsigned logopt { LDAP *ldap = NULL; struct ldap_uri *this; - struct list_head *p; - LIST_HEAD(tmp); + struct list_head *p, *first; /* Try each uri in list, add connect fails to tmp list */ - p = ctxt->uri->next; - while(p != ctxt->uri) { + uris_mutex_lock(ctxt); + if (!ctxt->uri) + first = ctxt->uris; + else + first = &ctxt->uri->list; + uris_mutex_unlock(ctxt); + p = first->next; + while(p != first) { + /* Skip list head */ + if (p == ctxt->uris) { + p = p->next; + continue; + } this = list_entry(p, struct ldap_uri, list); - p = p->next; debug(logopt, "trying server %s", this->uri); ldap = connect_to_server(logopt, this->uri, ctxt); if (ldap) { info(logopt, "connected to uri %s", this->uri); + uris_mutex_lock(ctxt); + ctxt->uri = this; + uris_mutex_unlock(ctxt); break; } - list_del_init(&this->list); - list_add_tail(&this->list, &tmp); + p = p->next; } - /* - * Successfuly connected uri (head of list) and untried uris are - * in ctxt->uri list. Make list of remainder and failed uris with - * failed uris at end and assign back to ctxt-uri. - */ - list_splice(ctxt->uri, &tmp); - INIT_LIST_HEAD(ctxt->uri); - list_splice(&tmp, ctxt->uri); return ldap; } @@ -656,19 +673,19 @@ static LDAP *do_reconnect(unsigned logop struct ldap_uri *this; LDAP *ldap; - if (ctxt->server || !ctxt->uri) { + if (ctxt->server || !ctxt->uris) { ldap = do_connect(logopt, ctxt->server, ctxt); return ldap; } - this = list_entry(ctxt->uri->next, struct ldap_uri, list); + uris_mutex_lock(ctxt); + this = ctxt->uri; + uris_mutex_unlock(ctxt); ldap = do_connect(logopt, this->uri, ctxt); if (ldap) return ldap; - /* Failed to connect, put at end of list */ - list_del_init(&this->list); - list_add_tail(&this->list, ctxt->uri); + /* Failed to connect, try to find a new server */ #ifdef WITH_SASL autofs_sasl_dispose(ctxt); @@ -1202,6 +1219,8 @@ done: static void free_context(struct lookup_context *ctxt) { + int ret; + if (ctxt->schema) { free(ctxt->schema->map_class); free(ctxt->schema->map_attr); @@ -1232,8 +1251,11 @@ static void free_context(struct lookup_c free(ctxt->cur_host); if (ctxt->base) free(ctxt->base); - if (ctxt->uri) - defaults_free_uris(ctxt->uri); + if (ctxt->uris) + defaults_free_uris(ctxt->uris); + ret = pthread_mutex_destroy(&ctxt->uris_mutex); + if (ret) + fatal(ret); if (ctxt->sdns) defaults_free_searchdns(ctxt->sdns); free(ctxt); @@ -1285,6 +1307,13 @@ int lookup_init(const char *mapfmt, int } memset(ctxt, 0, sizeof(struct lookup_context)); + ret = pthread_mutex_init(&ctxt->uris_mutex, NULL); + if (ret) { + error(LOGOPT_ANY, MODPREFIX "failed to init uris mutex"); + free(ctxt); + return 1; + } + /* If a map type isn't explicitly given, parse it like sun entries. */ if (mapfmt == NULL) mapfmt = MAPFMT_DEFAULT; @@ -1307,7 +1336,7 @@ int lookup_init(const char *mapfmt, int if (uris) { validate_uris(uris); if (!list_empty(uris)) - ctxt->uri = uris; + ctxt->uris = uris; else { error(LOGOPT_ANY, "no valid uris found in config list" @@ -1338,7 +1367,7 @@ int lookup_init(const char *mapfmt, int } #endif - if (ctxt->server || !ctxt->uri) { + if (ctxt->server || !ctxt->uris) { ldap = connect_to_server(LOGOPT_NONE, ctxt->server, ctxt); if (!ldap) { free_context(ctxt); autofs-5.0.4-add-lsb-init-script-parameter-block.patch: --- NEW FILE autofs-5.0.4-add-lsb-init-script-parameter-block.patch --- autofs-5.0.4 - add lsb init script parameter block From: Ian Kent --- redhat/autofs.init.in | 11 ++++++++++- samples/rc.autofs.in | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) --- autofs-5.0.3.orig/redhat/autofs.init.in +++ autofs-5.0.3/redhat/autofs.init.in @@ -6,7 +6,16 @@ # processname: /usr/sbin/automount # config: /etc/auto.master # description: Automounts filesystems on demand - +# +### BEGIN INIT INFO +# Provides: $autofs +# Required-Start: $network $ypbind +# Required-Stop: $network $ypbind +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Automounts filesystems on demand +# Description: Automounts filesystems on demand +### END INIT INFO # # Location of the automount daemon and the init directory # --- autofs-5.0.3.orig/samples/rc.autofs.in +++ autofs-5.0.3/samples/rc.autofs.in @@ -5,7 +5,16 @@ # On most distributions, this file should be called: # /etc/rc.d/init.d/autofs or /etc/init.d/autofs or /etc/rc.d/rc.autofs # - +# +### BEGIN INIT INFO +# Provides: $autofs +# Required-Start: $network $ypbind +# Required-Stop: $network $ypbind +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Automounts filesystems on demand +# Description: Automounts filesystems on demand +### END INIT INFO # # Location of the automount daemon and the init directory # Index: autofs.spec =================================================================== RCS file: /cvs/pkgs/rpms/autofs/F-10/autofs.spec,v retrieving revision 1.261 retrieving revision 1.262 diff -u -p -r1.261 -r1.262 --- autofs.spec 19 Feb 2009 00:24:31 -0000 1.261 +++ autofs.spec 4 May 2009 06:58:26 -0000 1.262 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.3 -Release: 41 +Release: 43 Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -64,7 +64,7 @@ Patch51: autofs-5.0.3-dont-readmap-on-hu Patch52: autofs-5.0.3-nisplus-partial-and-free.patch Patch53: autofs-5.0.3-fix-rootless-direct-multi-mount-expire.patch Patch54: autofs-5.0.3-wait-submount-expire-complete.patch -Patch55: autofs-5.0.3-add-missing-uris-list-locking.patch +Patch55: autofs-5.0.3-uris-list-locking-final.patch Patch56: autofs-5.0.3-library-reload-fix.patch Patch57: autofs-5.0.3-expire-thread-create-cond-handling.patch Patch58: autofs-5.0.3-fix-master-map-lexer-eval-order.patch @@ -73,6 +73,9 @@ Patch60: autofs-5.0.4-fix-dumb-libxml2-c Patch61: autofs-5.0.3-use-CLOEXEC-flag.patch Patch62: autofs-5.0.3-use-CLOEXEC-flag-setmntent.patch Patch63: autofs-5.0.3-use-CLOEXEC-flag-setmntent-include-fix.patch +Patch64: autofs-5.0.3-renew-sasl-creds-upon-reconnect-fail.patch +Patch65: autofs-5.0.3-fix-memory-leak-reading-ldap-master.patch +Patch66: autofs-5.0.4-add-lsb-init-script-parameter-block.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 Requires: kernel >= 2.6.17 @@ -177,6 +180,9 @@ echo %{version}-%{release} > .version %patch61 -p1 %patch62 -p1 %patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -229,6 +235,12 @@ fi %{_libdir}/autofs/ %changelog +* Mon May 4 2009 Ian Kent - 5.0.4-43 +- update uris list lcoking patch. +- renew sasl creds upon reconnect fail. +- fix memory leak reading ldap master map. +- add LSB init script block. + * Thu Feb 19 2009 Ian Kent - 5.0.4-41 - fix mntent.h not included before use of setmntent_r(). --- autofs-5.0.3-add-missing-uris-list-locking.patch DELETED --- From ellert at fedoraproject.org Mon May 4 06:58:47 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Mon, 4 May 2009 06:58:47 +0000 (UTC) Subject: rpms/globus-gsi-callback/F-9 globus-gsi-callback-ltlib.patch, NONE, 1.1 globus-gsi-callback.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504065847.ADA99700DB@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gsi-callback/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21387/F-9 Modified Files: .cvsignore sources Added Files: globus-gsi-callback-ltlib.patch globus-gsi-callback.spec import.log Log Message: * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball globus-gsi-callback-ltlib.patch: --- NEW FILE globus-gsi-callback-ltlib.patch --- diff -ur globus_gsi_callback-1.10.orig/library/Makefile.am globus_gsi_callback-1.10/library/Makefile.am --- globus_gsi_callback-1.10.orig/library/Makefile.am 2004-08-24 17:38:29.000000000 +0200 +++ globus_gsi_callback-1.10/library/Makefile.am 2008-10-16 09:13:46.000000000 +0200 @@ -21,8 +21,7 @@ libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@ -lglobus_oldgaa_$(GLOBUS_FLAVOR_NAME) - -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ -L./oldgaa/ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = ./oldgaa/libglobus_oldgaa_$(GLOBUS_FLAVOR_NAME).la @GPT_LIB_LINKS@ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ include $(top_srcdir)/globus_automake_post --- NEW FILE globus-gsi-callback.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gsi-callback %global _name %(tr - _ <<< %{name}) Version: 1.10 Release: 1%{?dist} Summary: Globus Toolkit - Globus GSI Callback Library Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gsi/callback/source globus_gsi_callback-1.10 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_callback-1.10 # tar -zcf globus_gsi_callback-1.10.tar.gz globus_gsi_callback-1.10 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Use .la files when linking within a package: # http://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6476 Patch0: %{name}-ltlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-openssl >= 1 BuildRequires: grid-packaging-tools BuildRequires: globus-gsi-proxy-ssl-devel >= 1 BuildRequires: globus-openssl-module-devel BuildRequires: globus-gsi-openssl-error-devel BuildRequires: globus-openssl-devel >= 1 BuildRequires: globus-core >= 4 BuildRequires: globus-gsi-cert-utils-devel >= 2 BuildRequires: globus-common-devel >= 3 BuildRequires: globus-gsi-sysconfig-devel >= 1 BuildRequires: doxygen %if %{?fedora}%{!?fedora:0} >= 3 BuildRequires: graphviz BuildRequires: ghostscript %else %if %{?rhel}%{!?rhel:0} >= 5 BuildRequires: graphviz BuildRequires: ghostscript %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif %endif %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %endif %package devel Summary: Globus Toolkit - Globus GSI Callback Library Development Files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: globus-gsi-proxy-ssl-devel >= 1 Requires: globus-openssl-module-devel Requires: globus-gsi-openssl-error-devel Requires: globus-openssl-devel >= 1 Requires: globus-core >= 4 Requires: globus-gsi-cert-utils-devel >= 2 Requires: globus-common-devel >= 3 Requires: globus-gsi-sysconfig-devel >= 1 %package doc Summary: Globus Toolkit - Globus GSI Callback Library Documentation Files Group: Documentation Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GSI Callback Library %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GSI Callback Library Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GSI Callback Library Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Remove unwanted documentation rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/deprecated\.3/d' \ -e '/_%{_name}-%{version}_.*\.3/d' \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball * Sun Mar 15 2009 Mattias Ellert - 1.10-0.5 - Adapting to updated globus-core package * Thu Feb 26 2009 Mattias Ellert - 1.10-0.4 - Add s390x to the list of 64 bit platforms * Thu Jan 1 2009 Mattias Ellert - 1.10-0.3 - Adapt to updated GPT package * Tue Oct 14 2008 Mattias Ellert - 1.10-0.2 - Update to Globus Toolkit 4.2.1 * Mon Jul 14 2008 Mattias Ellert - 1.4-0.1 - Autogenerated --- NEW FILE import.log --- globus-gsi-callback-1_10-1_fc9:F-9:globus-gsi-callback-1.10-1.fc9.src.rpm:1241420244 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:59:11 -0000 1.1 +++ .cvsignore 4 May 2009 06:58:17 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gsi_callback-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:59:11 -0000 1.1 +++ sources 4 May 2009 06:58:17 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +1e45fc05f452f0eeba6cc7620393bd64 globus_gsi_callback-1.10.tar.gz From ellert at fedoraproject.org Mon May 4 07:00:54 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Mon, 4 May 2009 07:00:54 +0000 (UTC) Subject: rpms/globus-gsi-callback/F-10 globus-gsi-callback-ltlib.patch, NONE, 1.1 globus-gsi-callback.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504070054.CF8D570131@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gsi-callback/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21882/F-10 Modified Files: .cvsignore sources Added Files: globus-gsi-callback-ltlib.patch globus-gsi-callback.spec import.log Log Message: * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball globus-gsi-callback-ltlib.patch: --- NEW FILE globus-gsi-callback-ltlib.patch --- diff -ur globus_gsi_callback-1.10.orig/library/Makefile.am globus_gsi_callback-1.10/library/Makefile.am --- globus_gsi_callback-1.10.orig/library/Makefile.am 2004-08-24 17:38:29.000000000 +0200 +++ globus_gsi_callback-1.10/library/Makefile.am 2008-10-16 09:13:46.000000000 +0200 @@ -21,8 +21,7 @@ libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@ -lglobus_oldgaa_$(GLOBUS_FLAVOR_NAME) - -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ -L./oldgaa/ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = ./oldgaa/libglobus_oldgaa_$(GLOBUS_FLAVOR_NAME).la @GPT_LIB_LINKS@ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ include $(top_srcdir)/globus_automake_post --- NEW FILE globus-gsi-callback.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gsi-callback %global _name %(tr - _ <<< %{name}) Version: 1.10 Release: 1%{?dist} Summary: Globus Toolkit - Globus GSI Callback Library Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gsi/callback/source globus_gsi_callback-1.10 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_callback-1.10 # tar -zcf globus_gsi_callback-1.10.tar.gz globus_gsi_callback-1.10 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Use .la files when linking within a package: # http://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6476 Patch0: %{name}-ltlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-openssl >= 1 BuildRequires: grid-packaging-tools BuildRequires: globus-gsi-proxy-ssl-devel >= 1 BuildRequires: globus-openssl-module-devel BuildRequires: globus-gsi-openssl-error-devel BuildRequires: globus-openssl-devel >= 1 BuildRequires: globus-core >= 4 BuildRequires: globus-gsi-cert-utils-devel >= 2 BuildRequires: globus-common-devel >= 3 BuildRequires: globus-gsi-sysconfig-devel >= 1 BuildRequires: doxygen %if %{?fedora}%{!?fedora:0} >= 3 BuildRequires: graphviz BuildRequires: ghostscript %else %if %{?rhel}%{!?rhel:0} >= 5 BuildRequires: graphviz BuildRequires: ghostscript %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif %endif %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %endif %package devel Summary: Globus Toolkit - Globus GSI Callback Library Development Files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: globus-gsi-proxy-ssl-devel >= 1 Requires: globus-openssl-module-devel Requires: globus-gsi-openssl-error-devel Requires: globus-openssl-devel >= 1 Requires: globus-core >= 4 Requires: globus-gsi-cert-utils-devel >= 2 Requires: globus-common-devel >= 3 Requires: globus-gsi-sysconfig-devel >= 1 %package doc Summary: Globus Toolkit - Globus GSI Callback Library Documentation Files Group: Documentation Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GSI Callback Library %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GSI Callback Library Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GSI Callback Library Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Remove unwanted documentation rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/deprecated\.3/d' \ -e '/_%{_name}-%{version}_.*\.3/d' \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball * Sun Mar 15 2009 Mattias Ellert - 1.10-0.5 - Adapting to updated globus-core package * Thu Feb 26 2009 Mattias Ellert - 1.10-0.4 - Add s390x to the list of 64 bit platforms * Thu Jan 1 2009 Mattias Ellert - 1.10-0.3 - Adapt to updated GPT package * Tue Oct 14 2008 Mattias Ellert - 1.10-0.2 - Update to Globus Toolkit 4.2.1 * Mon Jul 14 2008 Mattias Ellert - 1.4-0.1 - Autogenerated --- NEW FILE import.log --- globus-gsi-callback-1_10-1_fc9:F-10:globus-gsi-callback-1.10-1.fc9.src.rpm:1241420372 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:59:11 -0000 1.1 +++ .cvsignore 4 May 2009 07:00:24 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gsi_callback-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:59:11 -0000 1.1 +++ sources 4 May 2009 07:00:24 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +1e45fc05f452f0eeba6cc7620393bd64 globus_gsi_callback-1.10.tar.gz From ellert at fedoraproject.org Mon May 4 07:02:08 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Mon, 4 May 2009 07:02:08 +0000 (UTC) Subject: rpms/globus-gsi-callback/F-11 globus-gsi-callback-ltlib.patch, NONE, 1.1 globus-gsi-callback.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504070208.D8720700DB@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gsi-callback/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23012/F-11 Modified Files: .cvsignore sources Added Files: globus-gsi-callback-ltlib.patch globus-gsi-callback.spec import.log Log Message: * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball globus-gsi-callback-ltlib.patch: --- NEW FILE globus-gsi-callback-ltlib.patch --- diff -ur globus_gsi_callback-1.10.orig/library/Makefile.am globus_gsi_callback-1.10/library/Makefile.am --- globus_gsi_callback-1.10.orig/library/Makefile.am 2004-08-24 17:38:29.000000000 +0200 +++ globus_gsi_callback-1.10/library/Makefile.am 2008-10-16 09:13:46.000000000 +0200 @@ -21,8 +21,7 @@ libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@ -lglobus_oldgaa_$(GLOBUS_FLAVOR_NAME) - -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ -L./oldgaa/ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = ./oldgaa/libglobus_oldgaa_$(GLOBUS_FLAVOR_NAME).la @GPT_LIB_LINKS@ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ include $(top_srcdir)/globus_automake_post --- NEW FILE globus-gsi-callback.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gsi-callback %global _name %(tr - _ <<< %{name}) Version: 1.10 Release: 1%{?dist} Summary: Globus Toolkit - Globus GSI Callback Library Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gsi/callback/source globus_gsi_callback-1.10 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_callback-1.10 # tar -zcf globus_gsi_callback-1.10.tar.gz globus_gsi_callback-1.10 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Use .la files when linking within a package: # http://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6476 Patch0: %{name}-ltlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-openssl >= 1 BuildRequires: grid-packaging-tools BuildRequires: globus-gsi-proxy-ssl-devel >= 1 BuildRequires: globus-openssl-module-devel BuildRequires: globus-gsi-openssl-error-devel BuildRequires: globus-openssl-devel >= 1 BuildRequires: globus-core >= 4 BuildRequires: globus-gsi-cert-utils-devel >= 2 BuildRequires: globus-common-devel >= 3 BuildRequires: globus-gsi-sysconfig-devel >= 1 BuildRequires: doxygen %if %{?fedora}%{!?fedora:0} >= 3 BuildRequires: graphviz BuildRequires: ghostscript %else %if %{?rhel}%{!?rhel:0} >= 5 BuildRequires: graphviz BuildRequires: ghostscript %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif %endif %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %endif %package devel Summary: Globus Toolkit - Globus GSI Callback Library Development Files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: globus-gsi-proxy-ssl-devel >= 1 Requires: globus-openssl-module-devel Requires: globus-gsi-openssl-error-devel Requires: globus-openssl-devel >= 1 Requires: globus-core >= 4 Requires: globus-gsi-cert-utils-devel >= 2 Requires: globus-common-devel >= 3 Requires: globus-gsi-sysconfig-devel >= 1 %package doc Summary: Globus Toolkit - Globus GSI Callback Library Documentation Files Group: Documentation Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GSI Callback Library %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GSI Callback Library Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GSI Callback Library Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Remove unwanted documentation rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/deprecated\.3/d' \ -e '/_%{_name}-%{version}_.*\.3/d' \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball * Sun Mar 15 2009 Mattias Ellert - 1.10-0.5 - Adapting to updated globus-core package * Thu Feb 26 2009 Mattias Ellert - 1.10-0.4 - Add s390x to the list of 64 bit platforms * Thu Jan 1 2009 Mattias Ellert - 1.10-0.3 - Adapt to updated GPT package * Tue Oct 14 2008 Mattias Ellert - 1.10-0.2 - Update to Globus Toolkit 4.2.1 * Mon Jul 14 2008 Mattias Ellert - 1.4-0.1 - Autogenerated --- NEW FILE import.log --- globus-gsi-callback-1_10-1_fc9:F-11:globus-gsi-callback-1.10-1.fc9.src.rpm:1241420499 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:59:11 -0000 1.1 +++ .cvsignore 4 May 2009 07:02:08 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gsi_callback-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:59:11 -0000 1.1 +++ sources 4 May 2009 07:02:08 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +1e45fc05f452f0eeba6cc7620393bd64 globus_gsi_callback-1.10.tar.gz From ellert at fedoraproject.org Mon May 4 07:03:54 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Mon, 4 May 2009 07:03:54 +0000 (UTC) Subject: rpms/globus-gsi-callback/EL-4 globus-gsi-callback-ltlib.patch, NONE, 1.1 globus-gsi-callback.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504070355.09978700DB@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gsi-callback/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23323/EL-4 Modified Files: .cvsignore sources Added Files: globus-gsi-callback-ltlib.patch globus-gsi-callback.spec import.log Log Message: * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball globus-gsi-callback-ltlib.patch: --- NEW FILE globus-gsi-callback-ltlib.patch --- diff -ur globus_gsi_callback-1.10.orig/library/Makefile.am globus_gsi_callback-1.10/library/Makefile.am --- globus_gsi_callback-1.10.orig/library/Makefile.am 2004-08-24 17:38:29.000000000 +0200 +++ globus_gsi_callback-1.10/library/Makefile.am 2008-10-16 09:13:46.000000000 +0200 @@ -21,8 +21,7 @@ libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@ -lglobus_oldgaa_$(GLOBUS_FLAVOR_NAME) - -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ -L./oldgaa/ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = ./oldgaa/libglobus_oldgaa_$(GLOBUS_FLAVOR_NAME).la @GPT_LIB_LINKS@ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ include $(top_srcdir)/globus_automake_post --- NEW FILE globus-gsi-callback.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gsi-callback %global _name %(tr - _ <<< %{name}) Version: 1.10 Release: 1%{?dist} Summary: Globus Toolkit - Globus GSI Callback Library Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gsi/callback/source globus_gsi_callback-1.10 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_callback-1.10 # tar -zcf globus_gsi_callback-1.10.tar.gz globus_gsi_callback-1.10 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Use .la files when linking within a package: # http://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6476 Patch0: %{name}-ltlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-openssl >= 1 BuildRequires: grid-packaging-tools BuildRequires: globus-gsi-proxy-ssl-devel >= 1 BuildRequires: globus-openssl-module-devel BuildRequires: globus-gsi-openssl-error-devel BuildRequires: globus-openssl-devel >= 1 BuildRequires: globus-core >= 4 BuildRequires: globus-gsi-cert-utils-devel >= 2 BuildRequires: globus-common-devel >= 3 BuildRequires: globus-gsi-sysconfig-devel >= 1 BuildRequires: doxygen %if %{?fedora}%{!?fedora:0} >= 3 BuildRequires: graphviz BuildRequires: ghostscript %else %if %{?rhel}%{!?rhel:0} >= 5 BuildRequires: graphviz BuildRequires: ghostscript %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif %endif %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %endif %package devel Summary: Globus Toolkit - Globus GSI Callback Library Development Files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: globus-gsi-proxy-ssl-devel >= 1 Requires: globus-openssl-module-devel Requires: globus-gsi-openssl-error-devel Requires: globus-openssl-devel >= 1 Requires: globus-core >= 4 Requires: globus-gsi-cert-utils-devel >= 2 Requires: globus-common-devel >= 3 Requires: globus-gsi-sysconfig-devel >= 1 %package doc Summary: Globus Toolkit - Globus GSI Callback Library Documentation Files Group: Documentation Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GSI Callback Library %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GSI Callback Library Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GSI Callback Library Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Remove unwanted documentation rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/deprecated\.3/d' \ -e '/_%{_name}-%{version}_.*\.3/d' \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball * Sun Mar 15 2009 Mattias Ellert - 1.10-0.5 - Adapting to updated globus-core package * Thu Feb 26 2009 Mattias Ellert - 1.10-0.4 - Add s390x to the list of 64 bit platforms * Thu Jan 1 2009 Mattias Ellert - 1.10-0.3 - Adapt to updated GPT package * Tue Oct 14 2008 Mattias Ellert - 1.10-0.2 - Update to Globus Toolkit 4.2.1 * Mon Jul 14 2008 Mattias Ellert - 1.4-0.1 - Autogenerated --- NEW FILE import.log --- globus-gsi-callback-1_10-1_fc9:EL-4:globus-gsi-callback-1.10-1.fc9.src.rpm:1241420577 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:59:11 -0000 1.1 +++ .cvsignore 4 May 2009 07:03:24 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gsi_callback-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:59:11 -0000 1.1 +++ sources 4 May 2009 07:03:24 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +1e45fc05f452f0eeba6cc7620393bd64 globus_gsi_callback-1.10.tar.gz From ellert at fedoraproject.org Mon May 4 07:05:04 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Mon, 4 May 2009 07:05:04 +0000 (UTC) Subject: rpms/globus-gsi-callback/EL-5 globus-gsi-callback-ltlib.patch, NONE, 1.1 globus-gsi-callback.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504070504.5C58D700DB@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gsi-callback/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23653/EL-5 Modified Files: .cvsignore sources Added Files: globus-gsi-callback-ltlib.patch globus-gsi-callback.spec import.log Log Message: * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball globus-gsi-callback-ltlib.patch: --- NEW FILE globus-gsi-callback-ltlib.patch --- diff -ur globus_gsi_callback-1.10.orig/library/Makefile.am globus_gsi_callback-1.10/library/Makefile.am --- globus_gsi_callback-1.10.orig/library/Makefile.am 2004-08-24 17:38:29.000000000 +0200 +++ globus_gsi_callback-1.10/library/Makefile.am 2008-10-16 09:13:46.000000000 +0200 @@ -21,8 +21,7 @@ libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@ -lglobus_oldgaa_$(GLOBUS_FLAVOR_NAME) - -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ -L./oldgaa/ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = ./oldgaa/libglobus_oldgaa_$(GLOBUS_FLAVOR_NAME).la @GPT_LIB_LINKS@ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ include $(top_srcdir)/globus_automake_post --- NEW FILE globus-gsi-callback.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gsi-callback %global _name %(tr - _ <<< %{name}) Version: 1.10 Release: 1%{?dist} Summary: Globus Toolkit - Globus GSI Callback Library Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gsi/callback/source globus_gsi_callback-1.10 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_callback-1.10 # tar -zcf globus_gsi_callback-1.10.tar.gz globus_gsi_callback-1.10 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Use .la files when linking within a package: # http://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6476 Patch0: %{name}-ltlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-openssl >= 1 BuildRequires: grid-packaging-tools BuildRequires: globus-gsi-proxy-ssl-devel >= 1 BuildRequires: globus-openssl-module-devel BuildRequires: globus-gsi-openssl-error-devel BuildRequires: globus-openssl-devel >= 1 BuildRequires: globus-core >= 4 BuildRequires: globus-gsi-cert-utils-devel >= 2 BuildRequires: globus-common-devel >= 3 BuildRequires: globus-gsi-sysconfig-devel >= 1 BuildRequires: doxygen %if %{?fedora}%{!?fedora:0} >= 3 BuildRequires: graphviz BuildRequires: ghostscript %else %if %{?rhel}%{!?rhel:0} >= 5 BuildRequires: graphviz BuildRequires: ghostscript %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif %endif %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %endif %package devel Summary: Globus Toolkit - Globus GSI Callback Library Development Files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: globus-gsi-proxy-ssl-devel >= 1 Requires: globus-openssl-module-devel Requires: globus-gsi-openssl-error-devel Requires: globus-openssl-devel >= 1 Requires: globus-core >= 4 Requires: globus-gsi-cert-utils-devel >= 2 Requires: globus-common-devel >= 3 Requires: globus-gsi-sysconfig-devel >= 1 %package doc Summary: Globus Toolkit - Globus GSI Callback Library Documentation Files Group: Documentation Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GSI Callback Library %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GSI Callback Library Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GSI Callback Library Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Remove unwanted documentation rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/deprecated\.3/d' \ -e '/_%{_name}-%{version}_.*\.3/d' \ -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Thu Apr 16 2009 Mattias Ellert - 1.10-1 - Make comment about source retrieval more explicit - Change defines to globals - Remove explicit requires on library packages - Put GLOBUS_LICENSE file in extracted source tarball * Sun Mar 15 2009 Mattias Ellert - 1.10-0.5 - Adapting to updated globus-core package * Thu Feb 26 2009 Mattias Ellert - 1.10-0.4 - Add s390x to the list of 64 bit platforms * Thu Jan 1 2009 Mattias Ellert - 1.10-0.3 - Adapt to updated GPT package * Tue Oct 14 2008 Mattias Ellert - 1.10-0.2 - Update to Globus Toolkit 4.2.1 * Mon Jul 14 2008 Mattias Ellert - 1.4-0.1 - Autogenerated --- NEW FILE import.log --- globus-gsi-callback-1_10-1_fc9:EL-5:globus-gsi-callback-1.10-1.fc9.src.rpm:1241420674 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:59:11 -0000 1.1 +++ .cvsignore 4 May 2009 07:05:03 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gsi_callback-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gsi-callback/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:59:11 -0000 1.1 +++ sources 4 May 2009 07:05:03 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +1e45fc05f452f0eeba6cc7620393bd64 globus_gsi_callback-1.10.tar.gz From mmaslano at fedoraproject.org Mon May 4 07:20:03 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 07:20:03 +0000 (UTC) Subject: rpms/perl-JavaScript-Beautifier/devel perl-JavaScript-Beautifier.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504072003.56E0E700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25382 Modified Files: .cvsignore sources Added Files: perl-JavaScript-Beautifier.spec Log Message: * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.04-1 - Specfile autogenerated by cpanspec 1.78. --- NEW FILE perl-JavaScript-Beautifier.spec --- Name: perl-JavaScript-Beautifier Version: 0.04 Release: 1%{?dist} Summary: Beautify Javascript (beautifier for javascript) License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JavaScript-Beautifier/ Source0: http://www.cpan.org/authors/id/F/FA/FAYLAND/JavaScript-Beautifier-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: dos2unix Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is mostly a Perl-rewrite of http://github.com/einars/js- beautify/tree/master/beautify.js %prep %setup -q -n JavaScript-Beautifier-%{version} dos2unix Changes dos2unix README %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.04-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:59:50 -0000 1.1 +++ .cvsignore 4 May 2009 07:19:32 -0000 1.2 @@ -0,0 +1 @@ +JavaScript-Beautifier-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:59:50 -0000 1.1 +++ sources 4 May 2009 07:19:32 -0000 1.2 @@ -0,0 +1 @@ +327dfecd8ad2d5cb69cbf5bd14774c31 JavaScript-Beautifier-0.04.tar.gz From mmaslano at fedoraproject.org Mon May 4 07:25:29 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 07:25:29 +0000 (UTC) Subject: rpms/perl-JavaScript-Minifier/devel perl-JavaScript-Minifier.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504072529.AA86A700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-JavaScript-Minifier/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26180 Modified Files: .cvsignore sources Added Files: perl-JavaScript-Minifier.spec Log Message: * Wed Apr 29 2009 Marcela Ma??l????ov?? 1.05-1 - Specfile autogenerated by cpanspec 1.78. --- NEW FILE perl-JavaScript-Minifier.spec --- Name: perl-JavaScript-Minifier Version: 1.05 Release: 1%{?dist} Summary: Perl extension for minifying JavaScript code License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JavaScript-Minifier/ Source0: http://www.cpan.org/authors/id/P/PM/PMICHAUX/JavaScript-Minifier-%{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 This module removes unnecessary whitespace from JavaScript code. The primary requirement developing this module is to not break working code: if working JavaScript is in input then working JavaScript is output. It is ok if the input has missing semi-colons, snips like '++ +' or '12 .toString()', for example. Internet Explorer conditional comments are copied to the output but the code inside these comments will not be minified. %prep %setup -q -n JavaScript-Minifier-%{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 Apr 29 2009 Marcela Ma??l????ov?? 1.05-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JavaScript-Minifier/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:00:38 -0000 1.1 +++ .cvsignore 4 May 2009 07:24:59 -0000 1.2 @@ -0,0 +1 @@ +JavaScript-Minifier-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JavaScript-Minifier/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:00:38 -0000 1.1 +++ sources 4 May 2009 07:24:59 -0000 1.2 @@ -0,0 +1 @@ +14c1fa2fcf76c97de4d0fe0d8d7fc145 JavaScript-Minifier-1.05.tar.gz From bskeggs at fedoraproject.org Mon May 4 07:27:04 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 4 May 2009 07:27:04 +0000 (UTC) Subject: rpms/xorg-x11-drv-nouveau/F-11 nouveau-bicubic-2x.patch, NONE, 1.1 nouveau-fb-resize.patch, 1.4, 1.5 nouveau-multiple-xserver.patch, 1.5, 1.6 nouveau-nv50-fb-accel.patch, 1.5, 1.6 nouveau-nv50-nva0-noaccel.patch, 1.5, 1.6 nouveau-store-vbios.patch, 1.5, 1.6 nouveau-transition-hack.patch, 1.5, 1.6 xorg-x11-drv-nouveau.spec, 1.44, 1.45 Message-ID: <20090504072704.5F16B700DB@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26660 Modified Files: nouveau-fb-resize.patch nouveau-multiple-xserver.patch nouveau-nv50-fb-accel.patch nouveau-nv50-nva0-noaccel.patch nouveau-store-vbios.patch nouveau-transition-hack.patch xorg-x11-drv-nouveau.spec Added Files: nouveau-bicubic-2x.patch Log Message: * Mon May 04 2009 Ben Skeggs 0.0.12-33.20090501gitf69b34a - rh#492572: only apply bicubic filter when scaling >=2x - rh#497654: correct exa offscreen memory size nouveau-bicubic-2x.patch: --- NEW FILE nouveau-bicubic-2x.patch --- >From bb5e09ea86f81b11e04995d3db56cf4e82ef878a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 4 May 2009 17:04:34 +1000 Subject: [PATCH 7/7] xv: only use bicubic filtering when scaling >=2x --- src/nv30_xv_tex.c | 2 +- src/nv40_xv_tex.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c index 32a001c..3414c37 100644 --- a/src/nv30_xv_tex.c +++ b/src/nv30_xv_tex.c @@ -322,7 +322,7 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset, BEGIN_RING(chan, rankine, NV34TCL_TX_ENABLE(3), 1); OUT_RING (chan, 0x0); - if (pPriv->bicubic) + if (pPriv->bicubic && (drw_w / 2 >= src_w) && (drw_h / 2 >= src_h)) NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bicubic); else NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear); diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c index c7bbd4e..f69b26e 100644 --- a/src/nv40_xv_tex.c +++ b/src/nv40_xv_tex.c @@ -298,7 +298,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn, NV40VideoTexture(pScrn, src, src_offset2, src_w/2, src_h/2, src_pitch, 2); NV40_LoadVtxProg(pScrn, &nv40_vp_video); - if (pPriv->bicubic) + if (pPriv->bicubic && (drw_w / 2 >= src_w) && (drw_h / 2 >= src_h)) NV40_LoadFragProg(pScrn, &nv40_fp_yv12_bicubic); else NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear); -- 1.6.2.2 nouveau-fb-resize.patch: Index: nouveau-fb-resize.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-fb-resize.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- nouveau-fb-resize.patch 1 May 2009 05:58:20 -0000 1.4 +++ nouveau-fb-resize.patch 4 May 2009 07:27:03 -0000 1.5 @@ -1,16 +1,16 @@ -From 61ac455bfcfaf4caa9cac9067f4693c2d56715c7 Mon Sep 17 00:00:00 2001 +From e911cdfa86f6992c9c21b2da589876827a98e03b Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 14 Apr 2009 09:23:07 +1000 -Subject: [PATCH 6/6] f11: support framebuffer resize without driver pixmaps +Subject: [PATCH 6/7] f11: support framebuffer resize without driver pixmaps --- src/drmmode_display.c | 75 +++++++++++++++++++++++++++++++-- - src/nouveau_exa.c | 17 ++++---- + src/nouveau_exa.c | 21 +++++----- src/nv50_randr.c | 6 +++ src/nv_crtc.c | 16 ++++++- src/nv_driver.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++--- src/nv_type.h | 9 ++++- - 6 files changed, 209 insertions(+), 22 deletions(-) + 6 files changed, 210 insertions(+), 25 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index ca1a60b..c666c9f 100644 @@ -122,7 +122,7 @@ index ca1a60b..c666c9f 100644 } diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c -index aee2794..41e3f85 100644 +index aee2794..b571443 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -279,7 +279,10 @@ nouveau_exa_prepare_access(PixmapPtr ppix, int index) @@ -159,7 +159,18 @@ index aee2794..41e3f85 100644 return TRUE; return FALSE; -@@ -630,10 +633,8 @@ nouveau_exa_init(ScreenPtr pScreen) +@@ -587,9 +590,7 @@ nouveau_exa_init(ScreenPtr pScreen) + nouveau_bo_map(pNv->FB, NOUVEAU_BO_RDWR); + exa->memoryBase = pNv->FB->map; + nouveau_bo_unmap(pNv->FB); +- exa->offScreenBase = NOUVEAU_ALIGN(pScrn->virtualX, 64) * +- NOUVEAU_ALIGN(pScrn->virtualY, 64) * +- (pScrn->bitsPerPixel / 8); ++ exa->offScreenBase = 0; + exa->memorySize = pNv->FB->size; + + if (pNv->Architecture < NV_ARCH_50) { +@@ -630,10 +631,8 @@ nouveau_exa_init(ScreenPtr pScreen) } /* Needed for frontbuffer fallbacks (to ensure it accesses the linear fb). */ nouveau-multiple-xserver.patch: Index: nouveau-multiple-xserver.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-multiple-xserver.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- nouveau-multiple-xserver.patch 1 May 2009 05:58:20 -0000 1.5 +++ nouveau-multiple-xserver.patch 4 May 2009 07:27:03 -0000 1.6 @@ -1,7 +1,7 @@ From 21d8dee1feb667a38296d087aa5ce355b8ce7b17 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 19:25:25 +1000 -Subject: [PATCH 3/6] f11: hack to support multiple xserver instances +Subject: [PATCH 3/7] f11: hack to support multiple xserver instances --- src/nv_driver.c | 126 ++++++++++++++++++++++++++++++++++++++++++------------ nouveau-nv50-fb-accel.patch: Index: nouveau-nv50-fb-accel.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-fb-accel.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- nouveau-nv50-fb-accel.patch 1 May 2009 05:58:20 -0000 1.5 +++ nouveau-nv50-fb-accel.patch 4 May 2009 07:27:03 -0000 1.6 @@ -1,7 +1,7 @@ From 376840ad928ea51a5952bd1461b119e24d957b84 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 19:30:38 +1000 -Subject: [PATCH 4/6] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout +Subject: [PATCH 4/7] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout --- src/Makefile.am | 1 + nouveau-nv50-nva0-noaccel.patch: Index: nouveau-nv50-nva0-noaccel.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-nva0-noaccel.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- nouveau-nv50-nva0-noaccel.patch 1 May 2009 05:58:20 -0000 1.5 +++ nouveau-nv50-nva0-noaccel.patch 4 May 2009 07:27:03 -0000 1.6 @@ -1,7 +1,7 @@ From 6ce46f688243aaa010bb18642f32a18e4eeea77a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 20:20:39 +1000 -Subject: [PATCH 5/6] nv50/f11: disable acceleration on NVAx chipsets +Subject: [PATCH 5/7] nv50/f11: disable acceleration on NVAx chipsets --- src/nv_driver.c | 8 ++++++++ nouveau-store-vbios.patch: Index: nouveau-store-vbios.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-store-vbios.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- nouveau-store-vbios.patch 1 May 2009 05:58:20 -0000 1.5 +++ nouveau-store-vbios.patch 4 May 2009 07:27:03 -0000 1.6 @@ -1,7 +1,7 @@ From ce581a86984390d77863d91ce4c05886980ee982 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 19:13:26 +1000 -Subject: [PATCH 2/6] bios/f11: store a copy of used vbios image in /var/run +Subject: [PATCH 2/7] bios/f11: store a copy of used vbios image in /var/run --- src/nv_bios.c | 13 +++++++++++++ nouveau-transition-hack.patch: Index: nouveau-transition-hack.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-transition-hack.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- nouveau-transition-hack.patch 1 May 2009 05:58:20 -0000 1.5 +++ nouveau-transition-hack.patch 4 May 2009 07:27:03 -0000 1.6 @@ -1,7 +1,7 @@ From 76ec695211c0337f96731f85554d3f299e9ef2dc Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Apr 2009 19:12:25 +1000 -Subject: [PATCH 1/6] kms/f11: hack in transition support without driver pixmaps +Subject: [PATCH 1/7] kms/f11: hack in transition support without driver pixmaps --- src/drmmode_display.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++- Index: xorg-x11-drv-nouveau.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- xorg-x11-drv-nouveau.spec 1 May 2009 05:58:20 -0000 1.44 +++ xorg-x11-drv-nouveau.spec 4 May 2009 07:27:03 -0000 1.45 @@ -19,7 +19,7 @@ Name: xorg-x11-drv-nouveau # need to set an epoch to get version number in sync with upstream Epoch: 1 Version: %{nouveau_version} -Release: 32.%{snapshot}%{?dist} +Release: 33.%{snapshot}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -48,6 +48,7 @@ Patch3: nouveau-nv50-fb-accel.patch Patch4: nouveau-nv50-nva0-noaccel.patch Patch5: dcbconf_7_4_ignore.diff Patch6: nouveau-fb-resize.patch +Patch7: nouveau-bicubic-2x.patch %description X.Org X11 nouveau video driver. @@ -62,6 +63,7 @@ X.Org X11 nouveau video driver. %patch4 -p1 -b .nva0_noaccel %patch5 -p1 -b .dcbconf %patch6 -p1 -b .fbresize +%patch7 -p1 -b .bicubic %build autoreconf -v --install @@ -85,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/nouveau.4* %changelog +* Mon May 04 2009 Ben Skeggs 0.0.12-33.20090501gitf69b34a +- rh#492572: only apply bicubic filter when scaling >=2x +- rh#497654: correct exa offscreen memory size + * Fri May 01 2009 Ben Skeggs 0.0.12-32.20090501gitf69b34a - upstream update fixing serious issues in nv50 output setup From mmaslano at fedoraproject.org Mon May 4 07:27:25 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 07:27:25 +0000 (UTC) Subject: rpms/perl-JavaScript-Beautifier/F-11 perl-JavaScript-Beautifier.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504072725.9C777700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-JavaScript-Beautifier/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26681 Modified Files: .cvsignore sources Added Files: perl-JavaScript-Beautifier.spec Log Message: * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.04-1 - Specfile autogenerated by cpanspec 1.78. --- NEW FILE perl-JavaScript-Beautifier.spec --- Name: perl-JavaScript-Beautifier Version: 0.04 Release: 1%{?dist} Summary: Beautify Javascript (beautifier for javascript) License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JavaScript-Beautifier/ Source0: http://www.cpan.org/authors/id/F/FA/FAYLAND/JavaScript-Beautifier-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: dos2unix Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is mostly a Perl-rewrite of http://github.com/einars/js- beautify/tree/master/beautify.js %prep %setup -q -n JavaScript-Beautifier-%{version} dos2unix Changes dos2unix README %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.04-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JavaScript-Beautifier/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 20:59:50 -0000 1.1 +++ .cvsignore 4 May 2009 07:26:55 -0000 1.2 @@ -0,0 +1 @@ +JavaScript-Beautifier-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JavaScript-Beautifier/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 20:59:50 -0000 1.1 +++ sources 4 May 2009 07:26:55 -0000 1.2 @@ -0,0 +1 @@ +327dfecd8ad2d5cb69cbf5bd14774c31 JavaScript-Beautifier-0.04.tar.gz From mmaslano at fedoraproject.org Mon May 4 07:46:24 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 07:46:24 +0000 (UTC) Subject: rpms/perl-JavaScript-Minifier/F-11 perl-JavaScript-Minifier.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504074624.DD7F4700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-JavaScript-Minifier/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29730 Modified Files: .cvsignore sources Added Files: perl-JavaScript-Minifier.spec Log Message: * Wed Apr 29 2009 Marcela Ma??l????ov?? 1.05-1 - Specfile autogenerated by cpanspec 1.78. --- NEW FILE perl-JavaScript-Minifier.spec --- Name: perl-JavaScript-Minifier Version: 1.05 Release: 1%{?dist} Summary: Perl extension for minifying JavaScript code License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JavaScript-Minifier/ Source0: http://www.cpan.org/authors/id/P/PM/PMICHAUX/JavaScript-Minifier-%{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 This module removes unnecessary whitespace from JavaScript code. The primary requirement developing this module is to not break working code: if working JavaScript is in input then working JavaScript is output. It is ok if the input has missing semi-colons, snips like '++ +' or '12 .toString()', for example. Internet Explorer conditional comments are copied to the output but the code inside these comments will not be minified. %prep %setup -q -n JavaScript-Minifier-%{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 Apr 29 2009 Marcela Ma??l????ov?? 1.05-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-JavaScript-Minifier/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:00:38 -0000 1.1 +++ .cvsignore 4 May 2009 07:45:53 -0000 1.2 @@ -0,0 +1 @@ +JavaScript-Minifier-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-JavaScript-Minifier/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:00:38 -0000 1.1 +++ sources 4 May 2009 07:45:54 -0000 1.2 @@ -0,0 +1 @@ +14c1fa2fcf76c97de4d0fe0d8d7fc145 JavaScript-Minifier-1.05.tar.gz From mmaslano at fedoraproject.org Mon May 4 07:53:58 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 07:53:58 +0000 (UTC) Subject: rpms/perl-ExtUtils-InstallPAR/devel perl-ExtUtils-InstallPAR.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504075358.C3BF0700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30793 Modified Files: .cvsignore sources Added Files: perl-ExtUtils-InstallPAR.spec Log Message: * Thu Apr 30 2009 Marcela Ma??l????ov?? 0.03-2 - add BR --- NEW FILE perl-ExtUtils-InstallPAR.spec --- Name: perl-ExtUtils-InstallPAR Version: 0.03 Release: 2%{?dist} Summary: Install .par's into any installed perl License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ExtUtils-InstallPAR/ Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/ExtUtils-InstallPAR-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(PAR::Dist) >= 0.40 BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module installs PAR distributions (i.e. .par files) into any perl installation on the system. The PAR::Dist module can install into the currently running perl by default and provides the necessary parameters to override any installation directories. Figuring out how to use those overrides in order to install into an arbitrary perl installation on the system may be beyond most users, however. Hence this convenience wrapper using ExtUtils::InferConfig to automatically determine the typical site installation paths of any perl interpreter than can be executed by the current user. %prep %setup -q -n ExtUtils-InstallPAR-%{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 %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Apr 30 2009 Marcela Ma??l????ov?? 0.03-2 - add BR * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.03-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:01:13 -0000 1.1 +++ .cvsignore 4 May 2009 07:53:28 -0000 1.2 @@ -0,0 +1 @@ +ExtUtils-InstallPAR-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:01:13 -0000 1.1 +++ sources 4 May 2009 07:53:28 -0000 1.2 @@ -0,0 +1 @@ +88832cdff670a78bb44e25cadd700f4d ExtUtils-InstallPAR-0.03.tar.gz From bskeggs at fedoraproject.org Mon May 4 07:55:22 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 4 May 2009 07:55:22 +0000 (UTC) Subject: rpms/kernel/F-11 config-generic, 1.279, 1.280 config-powerpc-generic, 1.39, 1.40 kernel.spec, 1.1586, 1.1587 Message-ID: <20090504075522.3F4D6700DB@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31031 Modified Files: config-generic config-powerpc-generic kernel.spec Log Message: * Mon May 04 2009 Ben Skeggs 2.6.29.2-125 - Disable CONFIG_FB_NVIDIA due to very bad interactions with nouveau Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v retrieving revision 1.279 retrieving revision 1.280 diff -u -p -r1.279 -r1.280 --- config-generic 1 May 2009 20:40:05 -0000 1.279 +++ config-generic 4 May 2009 07:54:51 -0000 1.280 @@ -2411,9 +2411,7 @@ CONFIG_FB_MATROX_I2C=m CONFIG_FB_MATROX_MAVEN=m CONFIG_FB_MATROX_MULTIHEAD=y CONFIG_FB_NEOMAGIC=m -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_I2C=y +# CONFIG_FB_NVIDIA is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM2_FIFO_DISCONNECT is not set # CONFIG_FB_PM3 is not set @@ -3382,7 +3380,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_FB_NVIDIA_BACKLIGHT=y CONFIG_FB_RIVA_BACKLIGHT=y CONFIG_FB_RADEON_BACKLIGHT=y CONFIG_FB_ATY128_BACKLIGHT=y Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc-generic,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- config-powerpc-generic 23 Mar 2009 19:21:08 -0000 1.39 +++ config-powerpc-generic 4 May 2009 07:54:51 -0000 1.40 @@ -54,13 +54,12 @@ CONFIG_FB_OF=y CONFIG_FB_IBM_GXT4500=y CONFIG_FB_RADEON=y CONFIG_FB_MATROX=y -CONFIG_FB_NVIDIA=y +# CONFIG_FB_NVIDIA is not set # CONFIG_FB_VGA16 is not set CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY_BACKLIGHT=y CONFIG_FB_RADEON_BACKLIGHT=y CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_NVIDIA_BACKLIGHT=y CONFIG_SND_POWERMAC=m CONFIG_SND_POWERMAC_AUTO_DRC=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1586 retrieving revision 1.1587 diff -u -p -r1.1586 -r1.1587 --- kernel.spec 3 May 2009 02:25:35 -0000 1.1586 +++ kernel.spec 4 May 2009 07:54:51 -0000 1.1587 @@ -1967,6 +1967,9 @@ fi # and build. %changelog +* Mon May 04 2009 Ben Skeggs 2.6.29.2-125 +- Disable CONFIG_FB_NVIDIA due to very bad interactions with nouveau + * Sun May 03 2009 Ben Skeggs 2.6.29.2-124 - drm-nouveau.patch: ignore unsupported dcb encoder types completely - nv50: module option to run output scripts, too raw to be by default yet, From mmaslano at fedoraproject.org Mon May 4 08:09:32 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 08:09:32 +0000 (UTC) Subject: rpms/perl-ExtUtils-InferConfig/devel perl-ExtUtils-InferConfig.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504080932.D4653700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv991 Modified Files: .cvsignore sources Added Files: perl-ExtUtils-InferConfig.spec Log Message: * Thu Apr 30 2009 Marcela Ma??l????ov?? 1.03-2 - add BR --- NEW FILE perl-ExtUtils-InferConfig.spec --- Name: perl-ExtUtils-InferConfig Version: 1.03 Release: 2%{?dist} Summary: Infer Perl Configuration for non-running interpreters License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ExtUtils-InferConfig/ Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/ExtUtils-InferConfig-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IPC::Cmd) BuildRequires: perl(IPC::Run) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module can determine the configuration and @INC of a perl interpreter given its path and that it is runnable by the current user. %prep %setup -q -n ExtUtils-InferConfig-%{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 * Thu Apr 30 2009 Marcela Ma??l????ov?? 1.03-2 - add BR * Wed Apr 29 2009 Marcela Ma??l????ov?? 1.03-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:01:54 -0000 1.1 +++ .cvsignore 4 May 2009 08:09:02 -0000 1.2 @@ -0,0 +1 @@ +ExtUtils-InferConfig-1.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:01:54 -0000 1.1 +++ sources 4 May 2009 08:09:02 -0000 1.2 @@ -0,0 +1 @@ +bc428af291b36b1c0ffa1e5c96408f72 ExtUtils-InferConfig-1.03.tar.gz From mmaslano at fedoraproject.org Mon May 4 08:13:41 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 08:13:41 +0000 (UTC) Subject: rpms/perl-YAML-LibYAML/devel perl-YAML-LibYAML.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504081341.130D3700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-YAML-LibYAML/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2075 Modified Files: .cvsignore sources Added Files: perl-YAML-LibYAML.spec Log Message: * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.32-2 - add BR --- NEW FILE perl-YAML-LibYAML.spec --- Name: perl-YAML-LibYAML Version: 0.32 Release: 2%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML-LibYAML/ Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/YAML-LibYAML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kirill Siminov's "libyaml" is arguably the best YAML implementation. The C library is written precisely to the YAML 1.1 specification. It was originally bound to Python and was later bound to Ruby. %prep %setup -q -n YAML-LibYAML-%{version} iconv -f iso8859-1 -t utf-8 < README > README.1 mv README.1 README %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}/YAML* %{_mandir}/man3/* %changelog * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.32-2 - add BR * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.32-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-YAML-LibYAML/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:02:23 -0000 1.1 +++ .cvsignore 4 May 2009 08:13:10 -0000 1.2 @@ -0,0 +1 @@ +YAML-LibYAML-0.32.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-YAML-LibYAML/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:02:23 -0000 1.1 +++ sources 4 May 2009 08:13:10 -0000 1.2 @@ -0,0 +1 @@ +7a8b9258a311e52d0938744ad2ddfc4d YAML-LibYAML-0.32.tar.gz From mmaslano at fedoraproject.org Mon May 4 08:19:42 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 08:19:42 +0000 (UTC) Subject: rpms/perl-ExtUtils-InferConfig/F-11 perl-ExtUtils-InferConfig.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504081942.6524C700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2882 Modified Files: .cvsignore sources Added Files: perl-ExtUtils-InferConfig.spec Log Message: * Thu Apr 30 2009 Marcela Ma??l????ov?? 1.03-2 - add BR --- NEW FILE perl-ExtUtils-InferConfig.spec --- Name: perl-ExtUtils-InferConfig Version: 1.03 Release: 2%{?dist} Summary: Infer Perl Configuration for non-running interpreters License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ExtUtils-InferConfig/ Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/ExtUtils-InferConfig-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IPC::Cmd) BuildRequires: perl(IPC::Run) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module can determine the configuration and @INC of a perl interpreter given its path and that it is runnable by the current user. %prep %setup -q -n ExtUtils-InferConfig-%{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 * Thu Apr 30 2009 Marcela Ma??l????ov?? 1.03-2 - add BR * Wed Apr 29 2009 Marcela Ma??l????ov?? 1.03-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:01:54 -0000 1.1 +++ .cvsignore 4 May 2009 08:19:11 -0000 1.2 @@ -0,0 +1 @@ +ExtUtils-InferConfig-1.03.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:01:54 -0000 1.1 +++ sources 4 May 2009 08:19:12 -0000 1.2 @@ -0,0 +1 @@ +bc428af291b36b1c0ffa1e5c96408f72 ExtUtils-InferConfig-1.03.tar.gz From bskeggs at fedoraproject.org Mon May 4 08:22:57 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 4 May 2009 08:22:57 +0000 (UTC) Subject: rpms/kernel/F-11 config-generic, 1.280, 1.281 kernel.spec, 1.1587, 1.1588 Message-ID: <20090504082257.435F6700DB@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3462 Modified Files: config-generic kernel.spec Log Message: * Mon May 04 2009 Ben Skeggs 2.6.29.2-126 - Explicitly enable CONFIG_FB_MODE_HELPERS to fix build.. Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v retrieving revision 1.280 retrieving revision 1.281 diff -u -p -r1.280 -r1.281 --- config-generic 4 May 2009 07:54:51 -0000 1.280 +++ config-generic 4 May 2009 08:22:26 -0000 1.281 @@ -2447,6 +2447,7 @@ CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_LIME=y # CONFIG_FB_PRE_INIT_FB is not set # CONFIG_FB_TMIO is not set +CONFIG_FB_MODE_HELPERS=y # CONFIG_FIRMWARE_EDID is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1587 retrieving revision 1.1588 diff -u -p -r1.1587 -r1.1588 --- kernel.spec 4 May 2009 07:54:51 -0000 1.1587 +++ kernel.spec 4 May 2009 08:22:26 -0000 1.1588 @@ -1967,6 +1967,9 @@ fi # and build. %changelog +* Mon May 04 2009 Ben Skeggs 2.6.29.2-126 +- Explicitly enable CONFIG_FB_MODE_HELPERS to fix build.. + * Mon May 04 2009 Ben Skeggs 2.6.29.2-125 - Disable CONFIG_FB_NVIDIA due to very bad interactions with nouveau From mmaslano at fedoraproject.org Mon May 4 08:25:12 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 08:25:12 +0000 (UTC) Subject: rpms/perl-YAML-LibYAML/F-11 perl-YAML-LibYAML.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504082512.BDB58700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-YAML-LibYAML/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3891 Modified Files: .cvsignore sources Added Files: perl-YAML-LibYAML.spec Log Message: * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.32-2 - add BR --- NEW FILE perl-YAML-LibYAML.spec --- Name: perl-YAML-LibYAML Version: 0.32 Release: 2%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML-LibYAML/ Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/YAML-LibYAML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kirill Siminov's "libyaml" is arguably the best YAML implementation. The C library is written precisely to the YAML 1.1 specification. It was originally bound to Python and was later bound to Ruby. %prep %setup -q -n YAML-LibYAML-%{version} iconv -f iso8859-1 -t utf-8 < README > README.1 mv README.1 README %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}/YAML* %{_mandir}/man3/* %changelog * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.32-2 - add BR * Wed Apr 29 2009 Marcela Ma??l????ov?? 0.32-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-YAML-LibYAML/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 1 May 2009 21:02:23 -0000 1.1 +++ .cvsignore 4 May 2009 08:24:42 -0000 1.2 @@ -0,0 +1 @@ +YAML-LibYAML-0.32.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-YAML-LibYAML/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 1 May 2009 21:02:23 -0000 1.1 +++ sources 4 May 2009 08:24:42 -0000 1.2 @@ -0,0 +1 @@ +7a8b9258a311e52d0938744ad2ddfc4d YAML-LibYAML-0.32.tar.gz From pkgdb at fedoraproject.org Mon May 4 08:25:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:25:37 +0000 Subject: [pkgdb] cyrus-sasl ownership updated Message-ID: <20090504082537.4602610F890@bastion2.fedora.phx.redhat.com> Package cyrus-sasl in Fedora devel was orphaned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:25:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:25:41 +0000 Subject: [pkgdb] cyrus-sasl ownership updated Message-ID: <20090504082541.D1F6310F89E@bastion2.fedora.phx.redhat.com> Package cyrus-sasl in Fedora 9 was orphaned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:25:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:25:43 +0000 Subject: [pkgdb] cyrus-sasl ownership updated Message-ID: <20090504082543.AA84310F8A1@bastion2.fedora.phx.redhat.com> Package cyrus-sasl in Fedora 10 was orphaned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:25:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:25:46 +0000 Subject: [pkgdb] cyrus-sasl ownership updated Message-ID: <20090504082546.1D0E910F890@bastion2.fedora.phx.redhat.com> Package cyrus-sasl in Fedora 11 was orphaned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:27:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:27:04 +0000 Subject: [pkgdb] cyrus-sasl ownership updated Message-ID: <20090504082704.2EE9910F88C@bastion2.fedora.phx.redhat.com> Package cyrus-sasl in Fedora devel is now owned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:27:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:27:35 +0000 Subject: [pkgdb] cyrus-sasl ownership updated Message-ID: <20090504082735.4F56110F88C@bastion2.fedora.phx.redhat.com> Package cyrus-sasl in Fedora 9 is now owned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:27:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:27:43 +0000 Subject: [pkgdb] cyrus-sasl ownership updated Message-ID: <20090504082743.4363110F89C@bastion2.fedora.phx.redhat.com> Package cyrus-sasl in Fedora 10 is now owned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:27:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:27:49 +0000 Subject: [pkgdb] cyrus-sasl ownership updated Message-ID: <20090504082749.D0FD610F88C@bastion2.fedora.phx.redhat.com> Package cyrus-sasl in Fedora 11 is now owned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:08 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested watchcommits Message-ID: <20090504083008.2D16510F89E@bastion2.fedora.phx.redhat.com> tmraz has requested the watchcommits acl on cyrus-sasl (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:05 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested watchbugzilla Message-ID: <20090504083005.AFE5810F893@bastion2.fedora.phx.redhat.com> tmraz has requested the watchbugzilla acl on cyrus-sasl (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:10 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested commit Message-ID: <20090504083010.63DCD10F8A1@bastion2.fedora.phx.redhat.com> tmraz has requested the commit acl on cyrus-sasl (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:17 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested watchbugzilla Message-ID: <20090504083017.EAA1A10F8A3@bastion2.fedora.phx.redhat.com> tmraz has requested the watchbugzilla acl on cyrus-sasl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:20 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested watchcommits Message-ID: <20090504083020.6A80510F8A6@bastion2.fedora.phx.redhat.com> tmraz has requested the watchcommits acl on cyrus-sasl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:22 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested commit Message-ID: <20090504083022.7CC6410F89C@bastion2.fedora.phx.redhat.com> tmraz has requested the commit acl on cyrus-sasl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:24 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested watchbugzilla Message-ID: <20090504083024.BC71910F8A8@bastion2.fedora.phx.redhat.com> tmraz has requested the watchbugzilla acl on cyrus-sasl (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:26 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested watchcommits Message-ID: <20090504083026.7227A10F8AB@bastion2.fedora.phx.redhat.com> tmraz has requested the watchcommits acl on cyrus-sasl (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:28 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested commit Message-ID: <20090504083028.9EE7110F8AE@bastion2.fedora.phx.redhat.com> tmraz has requested the commit acl on cyrus-sasl (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:31 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested watchbugzilla Message-ID: <20090504083031.4907610F8A1@bastion2.fedora.phx.redhat.com> tmraz has requested the watchbugzilla acl on cyrus-sasl (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:33 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested watchcommits Message-ID: <20090504083033.66FFF10F890@bastion2.fedora.phx.redhat.com> tmraz has requested the watchcommits acl on cyrus-sasl (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:30:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:30:35 +0000 Subject: [pkgdb] cyrus-sasl: tmraz has requested commit Message-ID: <20090504083035.8740D10F8B2@bastion2.fedora.phx.redhat.com> tmraz has requested the commit acl on cyrus-sasl (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:31:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:31:53 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083153.2C8C110F89D@bastion2.fedora.phx.redhat.com> jfch2222 has set the watchbugzilla acl on cyrus-sasl (Fedora devel) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:31:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:31:58 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083158.79AB910F893@bastion2.fedora.phx.redhat.com> jfch2222 has set the watchcommits acl on cyrus-sasl (Fedora devel) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:32:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:32:02 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083202.E67A510F8A1@bastion2.fedora.phx.redhat.com> jfch2222 has set the commit acl on cyrus-sasl (Fedora devel) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:32:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:32:48 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083249.0EC9710F89E@bastion2.fedora.phx.redhat.com> jfch2222 has set the watchbugzilla acl on cyrus-sasl (Fedora 9) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:32:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:32:52 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083252.94AD410F8A2@bastion2.fedora.phx.redhat.com> jfch2222 has set the watchcommits acl on cyrus-sasl (Fedora 9) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:32:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:32:56 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083256.E793710F890@bastion2.fedora.phx.redhat.com> jfch2222 has set the commit acl on cyrus-sasl (Fedora 9) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:33:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:33:06 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083306.2C62310F8A8@bastion2.fedora.phx.redhat.com> jfch2222 has set the watchbugzilla acl on cyrus-sasl (Fedora 11) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:33:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:33:09 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083309.BAB9E10F89D@bastion2.fedora.phx.redhat.com> jfch2222 has set the watchcommits acl on cyrus-sasl (Fedora 11) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:33:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:33:14 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083314.3466410F8A7@bastion2.fedora.phx.redhat.com> jfch2222 has set the commit acl on cyrus-sasl (Fedora 11) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:38:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:38:04 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083804.4296310F890@bastion2.fedora.phx.redhat.com> jfch2222 has set the watchbugzilla acl on cyrus-sasl (Fedora 10) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:38:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:38:06 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083806.270F210F89D@bastion2.fedora.phx.redhat.com> jfch2222 has set the watchcommits acl on cyrus-sasl (Fedora 10) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From pkgdb at fedoraproject.org Mon May 4 08:38:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 08:38:08 +0000 Subject: [pkgdb] cyrus-sasl had acl change status Message-ID: <20090504083808.626F010F8A2@bastion2.fedora.phx.redhat.com> jfch2222 has set the commit acl on cyrus-sasl (Fedora 10) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-sasl From denis at fedoraproject.org Mon May 4 08:54:35 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Mon, 4 May 2009 08:54:35 +0000 (UTC) Subject: rpms/glibmm24/F-10 glibmm-2.18.2-makedir.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 glibmm.spec, 1.48, 1.49 sources, 1.34, 1.35 Message-ID: <20090504085435.BD267700DB@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/glibmm24/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8668 Modified Files: .cvsignore glibmm.spec sources Added Files: glibmm-2.18.2-makedir.patch Log Message: - Update to upstream 2.18.2 (memory leak fix) - Added patch for missing implementation (#498847) glibmm-2.18.2-makedir.patch: --- NEW FILE glibmm-2.18.2-makedir.patch --- --- glibmm-2.18.2/gio/giomm/file.cc 2009-03-23 17:58:10.000000000 +0100 +++ glibmm-2.19.2/gio/giomm/file.cc 2009-01-19 18:16:53.000000000 +0100 @@ -1907,6 +1907,25 @@ } #ifdef GLIBMM_EXCEPTIONS_ENABLED +bool File::make_directory_with_parents() +#else +bool File::make_directory_with_parents(std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + const bool retvalue = g_file_make_directory_with_parents(gobj(), NULL, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED bool File::make_symbolic_link(const std::string& symlink_value) #else bool File::make_symbolic_link(const std::string& symlink_value, std::auto_ptr& error) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/F-10/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- .cvsignore 21 Oct 2008 11:31:57 -0000 1.33 +++ .cvsignore 4 May 2009 08:54:05 -0000 1.34 @@ -1 +1 @@ -glibmm-2.18.1.tar.bz2 +glibmm-2.18.2.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/F-10/glibmm.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- glibmm.spec 21 Oct 2008 11:31:57 -0000 1.48 +++ glibmm.spec 4 May 2009 08:54:05 -0000 1.49 @@ -1,5 +1,5 @@ Name: glibmm24 -Version: 2.18.1 +Version: 2.18.2 Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -7,6 +7,7 @@ Group: System Environment/Libra License: LGPLv2+ URL: http://gtkmm.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2 +Patch0: glibmm-2.18.2-makedir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsigc++20-devel >= 2.0.0 @@ -44,6 +45,7 @@ This package contains the full API docum %prep %setup -q -n glibmm-%{version} +%patch0 -p1 -b .makedir %build @@ -100,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 24 2009 Denis Leroy - 2.18.2-1 +- Update to upstream 2.18.2 (memory leak fix) +- Added patch for missing implementation (#498847) + * Tue Oct 21 2008 Denis Leroy - 2.18.1-1 - Update to upstream 2.18.1, many bug fixes - Patch for define conflict upstreamed Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/F-10/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- sources 21 Oct 2008 11:31:57 -0000 1.34 +++ sources 4 May 2009 08:54:05 -0000 1.35 @@ -1 +1 @@ -942290a4b77dac3ea18a5b70373fe04c glibmm-2.18.1.tar.bz2 +acb1fc7d1afebb7fe64f569eb6ba2aed glibmm-2.18.2.tar.bz2 From makowski at fedoraproject.org Mon May 4 09:04:14 2009 From: makowski at fedoraproject.org (Philippe Makowski) Date: Mon, 4 May 2009 09:04:14 +0000 (UTC) Subject: rpms/firebird/devel firebird-2.1.2-doc.patch, NONE, 1.1 firebird-fix-initscript.patch, NONE, 1.1 firebird-logrotate, NONE, 1.1 firebird-mcpu-to-mtune.patch, NONE, 1.1 firebird-profile.csh, NONE, 1.1 firebird-profile.sh, NONE, 1.1 firebird.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504090414.C3151700DB@cvs1.fedora.phx.redhat.com> Author: makowski Update of /cvs/pkgs/rpms/firebird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10322/devel Modified Files: .cvsignore sources Added Files: firebird-2.1.2-doc.patch firebird-fix-initscript.patch firebird-logrotate firebird-mcpu-to-mtune.patch firebird-profile.csh firebird-profile.sh firebird.spec import.log Log Message: Initial import firebird-2.1.2-doc.patch: --- NEW FILE firebird-2.1.2-doc.patch --- --- doc/sql.extensions/README.global_temporary_tables.orig 2007-03-15 10:35:57.000000000 +0100 +++ doc/sql.extensions/README.global_temporary_tables 2009-04-13 15:56:47.000000000 +0200 @@ -67,11 +67,11 @@ garbage collection of deleted record versions. DELETE triggers are not fired in this case. - Data and index pages of all of the GTT?s instances are placed in separate temporary -file?s. Each connection has its own temporary file created when this connection -first referenced some GTT. Also these temporary files are always opened with ?Forced -Writes = OFF? setting despite of database setting. + Data and index pages of all of the GTTs instances are placed in separate temporary +files. Each connection has its own temporary file created when this connection +first referenced some GTT. Also these temporary files are always opened with "Forced +Writes = OFF" setting despite of database setting. There's no limit on number of GTT instances. If you have N transactions -active simultaneously and each transaction has referenced some GTT then you?ll -have N GTT?s instances. +active simultaneously and each transaction has referenced some GTT then you'll +have N GTTs instances. --- doc/sql.extensions/README.expression_indices.orig 2005-01-28 15:07:11.000000000 +0100 +++ doc/sql.extensions/README.expression_indices 2009-04-13 15:56:36.000000000 +0200 @@ -19,7 +19,7 @@ Example(s): 1. CREATE INDEX IDX1 ON T1 COMPUTED BY ( UPPER(COL1 COLLATE PXW_CYRL) ); - SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '????' + SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '' -- PLAN (T1 INDEX (IDX1)) 2. CREATE INDEX IDX2 ON T2 COMPUTED BY ( EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) ); SELECT * FROM T2 ORDER BY EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) --- doc/sql.extensions/README.common_table_expressions.orig 2007-03-15 10:34:22.000000000 +0100 +++ doc/sql.extensions/README.common_table_expressions 2009-04-13 15:55:55.000000000 +0200 @@ -6,7 +6,7 @@ Function: - Common Table Expressions is like view?s, locally defined within main query. + Common Table Expressions is like views, locally defined within main query. From the engine point of view CTE is a derived table so no intermediate materialization is performed. @@ -45,11 +45,11 @@ Or, in less formal format : WITH [RECURSIVE] - CTE_A [(a1, a2, ?)] - AS ( SELECT ? ), + CTE_A [(a1, a2, ...)] + AS ( SELECT ...), - CTE_B [(b1, b2, ?)] - AS ( SELECT ? ), + CTE_B [(b1, b2, ...)] + AS ( SELECT ... ), ... SELECT ... FROM CTE_A, CTE_B, TAB1, TAB2 ... @@ -60,7 +60,7 @@ Rules of non-recursive common table expressions : Several table expressions can be defined at one query - Any SELECT?s clause can be used in table expressions + Any SELECTs clause can be used in table expressions Table expressions can reference each other Table expressions can be used within any part of main query or another table expression @@ -104,7 +104,7 @@ Non-recursive members are placed first in UNION Recursive members are separated from anchor members and from each other with UNION ALL clause - References between CTE?s should not have loops + References between CTEs should not have loops Aggregates (DISTINCT, GROUP BY, HAVING) and aggregate functions (SUM, COUNT, MAX etc) are not allowed in recursive members Recursive member can have only one reference to itself and only in FROM clause firebird-fix-initscript.patch: --- NEW FILE firebird-fix-initscript.patch --- --- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2008-01-22 12:39:13.000000000 +0100 +++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in.pm 2009-05-03 12:10:31.000000000 +0200 @@ -19,6 +19,7 @@ # Optionally run chkconfig to autostart the new service INSTANCE=default FIREBIRD=@prefix@ +name=firebird # No changes needed below for multiple instances FBRunUser=firebird @@ -39,18 +40,22 @@ echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser RETVAL=$? [ $RETVAL -eq 0 ] && success || failure + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name echo ;; stop) - echo -n "Stopping $FULLNAME " - if [ -f $pidfile ] then - kill `cat $pidfile` + echo -n "Stopping $FULLNAME: " + killproc -p $pidfile $name + RETVAL=$? + echo + else + echo -n "$FULLNAME server is stopped" + echo fi RETVAL=$? - [ $RETVAL -eq 0 ] && success || failure - echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name ;; status) if [ -f $pidfile ] @@ -70,7 +75,7 @@ RETVAL=$? ;; *) - echo "Usage: firebird {start|stop|status|restart|reload}" + echo "Usage: $name {start|stop|status|restart|reload}" exit 1 esac --- NEW FILE firebird-logrotate --- firebird.log { weekly missingok rotate 52 compress delaycompress notifempty create 640 firebird adm } firebird-mcpu-to-mtune.patch: --- NEW FILE firebird-mcpu-to-mtune.patch --- --- builds/posix/prefix.linux 2007-05-03 07:24:50.000000000 -0400 +++ builds/posix/prefix.linux.oden 2008-07-18 08:45:48.000000000 -0400 @@ -22,7 +22,7 @@ # you may remove it if engine is getting compiled with any other GCC version COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin +OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -fno-builtin WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) --- NEW FILE firebird-profile.csh --- setenv PATH "${PATH}:%{fbroot}/bin" --- NEW FILE firebird-profile.sh --- export PATH=$PATH:%{fbroot}/bin --- NEW FILE firebird.spec --- %global pkgname Firebird-2.1.2.18118-0 %global fbroot %{_libdir}/%{name} %global major 2.1.2 Summary: SQL relational database management system Name: firebird Version: 2.1.2.18118.0 Release: 6%{?dist} Group: Applications/Databases License: Interbase URL: http://www.firebirdsql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2 Source1: firebird-profile.sh Source2: firebird-profile.csh Source3: firebird-logrotate Patch0: firebird-mcpu-to-mtune.patch Patch1: firebird-2.1.2-doc.patch Patch2: firebird-fix-initscript.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: libicu-devel Requires: %{name}-arch = %{version} Requires: grep Requires: sed Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires(postun): /usr/sbin/userdel Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: %{name}-filesystem Requires: %{name}-libfbclient Requires: logrotate %description This package contains common files between firebird-classic and firebird-superserver. You will need this if you want to use either one. %package doc Summary: Documentation for Firebird SQL RDBMS Group: Applications/Databases %description doc This are the Firebird SQL Database shared doc and examples files. %package filesystem Summary: Filesystem for Firebird SQL RDBMS Group: Applications/Databases %description filesystem This is the Firebird SQL Database root file system. %package devel Summary: Development Libraries for Firebird SQL RDBMS Group: Applications/Databases Requires: %{name}-filesystem Requires: %{name}-libfbclient = %{version}-%{release} Requires: %{name}-libfbembed = %{version}-%{release} %description devel Development libraries for firebird. %package classic Summary: Classic (xinetd) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: xinetd Requires: %{name} = %{version} Conflicts: %{name}-superserver Requires: %{name}-libfbembed Requires: %{name}-libfbclient Requires: %{name}-filesystem %description classic This is the classic (xinetd) server Firebird SQL RDBMS. It can also be used as an embedded server, when paired with the client-embedded package. %package superserver Summary: Superserver (single process) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: %{name} = %{version} Conflicts: %{name}-classic Requires: %{name}-libfbclient Requires: %{name}-filesystem %description superserver This is the Superserver (single process) Firebird SQL RDBMS. %package libfbclient Summary: Multi-threaded, non-local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbclient Multi-threaded, non-local client libraries for Firebird SQL Database %package libfbembed Summary: Multi-process, local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbembed Multi-process, local client libraries for Firebird SQL RDBMS %prep %setup -q -n %{pkgname} # convert intl character to UTF-8 iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl # backport patch %patch2 %patch1 %patch0 %build # classic autoreconf -vfi %configure --prefix=%{fbroot} \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-classic chmod 644 ./buildroot-classic%{fbroot}/help/help.fdb cd .. # superserver %configure --prefix=%{fbroot} \ --enable-superserver \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-superserver chmod 644 ./buildroot-superserver%{fbroot}/help/help.fdb %install # we wanted to setup both Classic and Superserver, we need to do all here rm -Rf %{buildroot} install -d %{buildroot} cd %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/%{name} mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_var}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data mkdir -p %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_includedir}/%{name} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{fbroot} mkdir -p %{buildroot}%{fbroot}/help mkdir -p %{buildroot}%{fbroot}/intl mkdir -p %{buildroot}%{fbroot}/lib mkdir -p %{buildroot}%{fbroot}/include mkdir -p %{buildroot}%{fbroot}/bin-classic mkdir -p %{buildroot}%{fbroot}/UDF-classic mkdir -p %{buildroot}%{fbroot}/bin-superserver mkdir -p %{buildroot}%{fbroot}/UDF-superserver cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/examples/empbuild/employee.fdb %{buildroot}%{_localstatedir}/lib/%{name}/data/employee.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/help/help.fdb %{buildroot}%{fbroot}/help/help.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/*.msg %{buildroot}%{fbroot}/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl %{buildroot}%{fbroot}/intl/fbintl cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libib_util.so %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbclient.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbembed.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-superserver/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-superserver/ cd %{buildroot}%{fbroot}/bin-superserver/ ln -s ./fbmgr.bin ./fbmgr cd %{buildroot} cd %{buildroot}%{fbroot}/lib/ ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so cd %{buildroot} cd %{buildroot}%{_libdir} ln -s %{fbroot}/lib/libfbembed.so libfbembed.so ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.%{major} ln -s %{fbroot}/lib/libfbclient.so libfbclient.so ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.%{major} ln -s %{fbroot}/lib/libib_util.so libib_util.so cd %{buildroot} echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log ln -s %{_localstatedir}/log/%{name}/%{name}.log .%{fbroot}/%{name}.log sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE3} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/include/* %{buildroot}%{_includedir}/%{name}/ cd %{buildroot}%{fbroot}/include/ ln -s %{_includedir}/%{name}/ibase.h ibase.h ln -s %{_includedir}/%{name}/iberror.h iberror.h ln -s %{_includedir}/%{name}/ib_util.h ib_util.h ln -s %{_includedir}/%{name}/perf.h perf.h cd %{buildroot} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/aliases.conf .%{_sysconfdir}/%{name}/aliases.conf sed "s@%{fbroot}/examples/empbuild@%{_localstatedir}/lib/%{name}/data@" -i .%{_sysconfdir}/%{name}/aliases.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/firebird.conf .%{_sysconfdir}/%{name}/firebird.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl.conf .%{_sysconfdir}/%{name}/fbintl.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/security2.fdb .%{_sysconfdir}/%{name}/security2.fdb ln -s %{_sysconfdir}/%{name}/aliases.conf .%{fbroot}/aliases.conf ln -s %{_sysconfdir}/%{name}/firebird.conf .%{fbroot}/firebird.conf ln -s %{_sysconfdir}/%{name}/security2.fdb .%{fbroot}/security2.fdb ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/profile.d/firebird.sh sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/profile.d/firebird.csh cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake %{buildroot}%{_initrddir}/%{name} sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name} %clean rm -Rf %{buildroot} %post libfbclient -p /sbin/ldconfig %postun libfbclient -p /sbin/ldconfig %post libfbembed -p /sbin/ldconfig %postun libfbembed -p /sbin/ldconfig %post classic if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-classic,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-classic,} fi if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi %preun classic if [ $1 -eq 0 ]; then if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-classic" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-classic" ]; then rm -f %{fbroot}/UDF fi fi %post superserver if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-superserver,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-superserver,} fi if [ $1 -eq 2 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird restart fi fi if [ $1 -eq 1 ]; then chkconfig firebird off fi %preun superserver if [ $1 -eq 0 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird stop fi chkconfig --del firebird if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-superserver" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-superserver" ]; then rm -f %{fbroot}/UDF fi fi %pre # Create the firebird group if it doesn't exist getent group %{name} || /usr/sbin/groupadd -r %{name} getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/sh -r %{name} # Add gds_db to /etc/services if needed FileName=/etc/services newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" oldLine=`grep "^gds_db" $FileName` if [ -z "$oldLine" ]; then echo $newLine >> $FileName fi %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,root,root) %{_localstatedir}/lib/%{name} %dir %attr(0770,%{name},%{name}) %{_localstatedir}/lib/%{name}/data %attr(0660,%{name},%{name}) %{_localstatedir}/lib/%{name}/data/employee.fdb %dir %{_localstatedir}/log/%{name} %dir %{fbroot}/intl %dir %{_sysconfdir}/%{name} %config(noreplace) %attr (0660,%{name},%{name}) %{_sysconfdir}/%{name}/security2.fdb %{fbroot}/security2.fdb %config(noreplace) %{_sysconfdir}/%{name}/fbintl.conf %config(noreplace) %{_sysconfdir}/%{name}/aliases.conf %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf %{fbroot}/aliases.conf %{fbroot}/firebird.conf %{fbroot}/intl/fbintl.conf %{fbroot}/firebird.log %attr(0660,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %{fbroot}/*.msg %{fbroot}/help %{_libdir}/libib_util.so %{fbroot}/lib/libib_util.so %defattr(0644,root,root,0644) %config(noreplace) %{_sysconfdir}/profile.d/firebird.csh %config(noreplace) %{_sysconfdir}/profile.d/firebird.sh %defattr(0755,root,root,0750) %{fbroot}/intl/fbintl %files filesystem %defattr(0755,%{name},%{name},0755) %dir %{fbroot} %defattr(0755,root,root,0755) %dir %{fbroot}/lib %files doc %defattr(0644,root,root,0755) %doc gen/buildroot-classic%{fbroot}/doc %doc gen/buildroot-classic%{fbroot}/examples %doc gen/buildroot-classic%{fbroot}/README %doc gen/buildroot-classic%{fbroot}/misc/intl.sql %doc gen/buildroot-classic%{fbroot}/misc/upgrade %files devel %defattr(0644,root,root,0755) %dir %{fbroot}/include %{fbroot}/include/* %{fbroot}/lib/*.so %{_includedir}/* %{_libdir}/*.so %files libfbclient %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbclient.so.* %{fbroot}/lib/libfbclient.so.* %files libfbembed %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbembed.so.* %{fbroot}/lib/libfbembed.so.* %files classic %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} %dir %{fbroot}/bin-classic %dir %{fbroot}/UDF-classic %defattr(0755,root,root,0755) %{fbroot}/bin-classic/* %{fbroot}/UDF-classic/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-classic/*.sql %files superserver %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name} %dir %{fbroot}/bin-superserver %dir %{fbroot}/UDF-superserver %defattr(0755,root,root,0755) %{_initrddir}/%{name} %{fbroot}/bin-superserver/* %{fbroot}/UDF-superserver/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-superserver/*.sql %changelog * Sat May 02 2009 Philippe Makowski 2.1.2.18118.0-6 - add filesystem-subpackage - remove common subpackage and use the main instead - add logrotate config * Thu Apr 30 2009 Philippe Makowski 2.1.2.18118.0-5 - fix directories owning * Thu Apr 23 2009 Philippe Makowski 2.1.2.18118.0-4 - major cleaning install process to take care of the two architectures (Classic and Superserver) the right way * Wed Apr 22 2009 Philippe Makowski 2.1.2.18118.0-3 - fix group creation * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-2 - fix autogen issue for f11 - patch init script - fix ppc64 lib destination issue * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-1 - backport doc patch - update to 2.1.2.18118 - cleanup macros - specifie libdir - change firebird user login * Sat Mar 28 2009 Philippe Makowski 2.1.1.17910.0-5 - Major packaging restructuring * Mon Mar 21 2009 Philippe Makowski 2.1.1.17190.0-4 - Create a doc package - major cleaning to avoid rpmlint errors - revert to 2.1.1 (last stable build published) * Mon Mar 09 2009 Jonathan MERCIER 2.1.2.18116.0-3 - Perform %%configure with option --with-system-icu - Add libicu-devel in BuildRequires - Use iconv for convert files to UTF-8 * Fri Mar 05 2009 Jonathan MERCIER 2.1.2.18116.0-2 - Update to 2.1.2 - Use %%global instead of %%define - Change ${SOURCE1} to %%{SOURCE1} - Change Group Database to Applications/Databases - Change License IPL to Interbase - Perform %%configure section's with some module - Cconvert cyrillic character to UTF-8 * Thu Jul 17 2008 Arkady L. Shane 2.1.1.17910.0-1 - Update to 2.1.1 * Fri Apr 18 2008 Arkady L. Shane 2.1.0.17798.0-1 - Update to 2.1.0 * Thu Sep 27 2007 Arkady L. Shane 2.0.3.12981.1-1 - Update to 2.0.3 * Thu Sep 13 2007 Arkady L. Shane 2.0.1.12855.0-1 - Initial build for Fedora - cleanup Mandriva spec --- NEW FILE import.log --- firebird-2_1_2_18118_0-6_fc10:HEAD:firebird-2.1.2.18118.0-6.fc10.src.rpm:1241427683 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firebird/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:56:33 -0000 1.1 +++ .cvsignore 4 May 2009 09:03:44 -0000 1.2 @@ -0,0 +1 @@ +Firebird-2.1.2.18118-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firebird/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:56:33 -0000 1.1 +++ sources 4 May 2009 09:03:44 -0000 1.2 @@ -0,0 +1 @@ +063b3825a06d328f726b733fd74614b1 Firebird-2.1.2.18118-0.tar.bz2 From makowski at fedoraproject.org Mon May 4 09:08:19 2009 From: makowski at fedoraproject.org (Philippe Makowski) Date: Mon, 4 May 2009 09:08:19 +0000 (UTC) Subject: rpms/firebird/F-9 firebird-2.1.2-doc.patch, NONE, 1.1 firebird-fix-initscript.patch, NONE, 1.1 firebird-logrotate, NONE, 1.1 firebird-mcpu-to-mtune.patch, NONE, 1.1 firebird-profile.csh, NONE, 1.1 firebird-profile.sh, NONE, 1.1 firebird.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504090819.8E9A8700DB@cvs1.fedora.phx.redhat.com> Author: makowski Update of /cvs/pkgs/rpms/firebird/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11888/F-9 Modified Files: .cvsignore sources Added Files: firebird-2.1.2-doc.patch firebird-fix-initscript.patch firebird-logrotate firebird-mcpu-to-mtune.patch firebird-profile.csh firebird-profile.sh firebird.spec import.log Log Message: Intitial import firebird-2.1.2-doc.patch: --- NEW FILE firebird-2.1.2-doc.patch --- --- doc/sql.extensions/README.global_temporary_tables.orig 2007-03-15 10:35:57.000000000 +0100 +++ doc/sql.extensions/README.global_temporary_tables 2009-04-13 15:56:47.000000000 +0200 @@ -67,11 +67,11 @@ garbage collection of deleted record versions. DELETE triggers are not fired in this case. - Data and index pages of all of the GTT?s instances are placed in separate temporary -file?s. Each connection has its own temporary file created when this connection -first referenced some GTT. Also these temporary files are always opened with ?Forced -Writes = OFF? setting despite of database setting. + Data and index pages of all of the GTTs instances are placed in separate temporary +files. Each connection has its own temporary file created when this connection +first referenced some GTT. Also these temporary files are always opened with "Forced +Writes = OFF" setting despite of database setting. There's no limit on number of GTT instances. If you have N transactions -active simultaneously and each transaction has referenced some GTT then you?ll -have N GTT?s instances. +active simultaneously and each transaction has referenced some GTT then you'll +have N GTTs instances. --- doc/sql.extensions/README.expression_indices.orig 2005-01-28 15:07:11.000000000 +0100 +++ doc/sql.extensions/README.expression_indices 2009-04-13 15:56:36.000000000 +0200 @@ -19,7 +19,7 @@ Example(s): 1. CREATE INDEX IDX1 ON T1 COMPUTED BY ( UPPER(COL1 COLLATE PXW_CYRL) ); - SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '????' + SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '' -- PLAN (T1 INDEX (IDX1)) 2. CREATE INDEX IDX2 ON T2 COMPUTED BY ( EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) ); SELECT * FROM T2 ORDER BY EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) --- doc/sql.extensions/README.common_table_expressions.orig 2007-03-15 10:34:22.000000000 +0100 +++ doc/sql.extensions/README.common_table_expressions 2009-04-13 15:55:55.000000000 +0200 @@ -6,7 +6,7 @@ Function: - Common Table Expressions is like view?s, locally defined within main query. + Common Table Expressions is like views, locally defined within main query. From the engine point of view CTE is a derived table so no intermediate materialization is performed. @@ -45,11 +45,11 @@ Or, in less formal format : WITH [RECURSIVE] - CTE_A [(a1, a2, ?)] - AS ( SELECT ? ), + CTE_A [(a1, a2, ...)] + AS ( SELECT ...), - CTE_B [(b1, b2, ?)] - AS ( SELECT ? ), + CTE_B [(b1, b2, ...)] + AS ( SELECT ... ), ... SELECT ... FROM CTE_A, CTE_B, TAB1, TAB2 ... @@ -60,7 +60,7 @@ Rules of non-recursive common table expressions : Several table expressions can be defined at one query - Any SELECT?s clause can be used in table expressions + Any SELECTs clause can be used in table expressions Table expressions can reference each other Table expressions can be used within any part of main query or another table expression @@ -104,7 +104,7 @@ Non-recursive members are placed first in UNION Recursive members are separated from anchor members and from each other with UNION ALL clause - References between CTE?s should not have loops + References between CTEs should not have loops Aggregates (DISTINCT, GROUP BY, HAVING) and aggregate functions (SUM, COUNT, MAX etc) are not allowed in recursive members Recursive member can have only one reference to itself and only in FROM clause firebird-fix-initscript.patch: --- NEW FILE firebird-fix-initscript.patch --- --- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2008-01-22 12:39:13.000000000 +0100 +++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in.pm 2009-05-03 12:10:31.000000000 +0200 @@ -19,6 +19,7 @@ # Optionally run chkconfig to autostart the new service INSTANCE=default FIREBIRD=@prefix@ +name=firebird # No changes needed below for multiple instances FBRunUser=firebird @@ -39,18 +40,22 @@ echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser RETVAL=$? [ $RETVAL -eq 0 ] && success || failure + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name echo ;; stop) - echo -n "Stopping $FULLNAME " - if [ -f $pidfile ] then - kill `cat $pidfile` + echo -n "Stopping $FULLNAME: " + killproc -p $pidfile $name + RETVAL=$? + echo + else + echo -n "$FULLNAME server is stopped" + echo fi RETVAL=$? - [ $RETVAL -eq 0 ] && success || failure - echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name ;; status) if [ -f $pidfile ] @@ -70,7 +75,7 @@ RETVAL=$? ;; *) - echo "Usage: firebird {start|stop|status|restart|reload}" + echo "Usage: $name {start|stop|status|restart|reload}" exit 1 esac --- NEW FILE firebird-logrotate --- firebird.log { weekly missingok rotate 52 compress delaycompress notifempty create 640 firebird adm } firebird-mcpu-to-mtune.patch: --- NEW FILE firebird-mcpu-to-mtune.patch --- --- builds/posix/prefix.linux 2007-05-03 07:24:50.000000000 -0400 +++ builds/posix/prefix.linux.oden 2008-07-18 08:45:48.000000000 -0400 @@ -22,7 +22,7 @@ # you may remove it if engine is getting compiled with any other GCC version COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin +OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -fno-builtin WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) --- NEW FILE firebird-profile.csh --- setenv PATH "${PATH}:%{fbroot}/bin" --- NEW FILE firebird-profile.sh --- export PATH=$PATH:%{fbroot}/bin --- NEW FILE firebird.spec --- %global pkgname Firebird-2.1.2.18118-0 %global fbroot %{_libdir}/%{name} %global major 2.1.2 Summary: SQL relational database management system Name: firebird Version: 2.1.2.18118.0 Release: 6%{?dist} Group: Applications/Databases License: Interbase URL: http://www.firebirdsql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2 Source1: firebird-profile.sh Source2: firebird-profile.csh Source3: firebird-logrotate Patch0: firebird-mcpu-to-mtune.patch Patch1: firebird-2.1.2-doc.patch Patch2: firebird-fix-initscript.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: libicu-devel Requires: %{name}-arch = %{version} Requires: grep Requires: sed Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires(postun): /usr/sbin/userdel Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: %{name}-filesystem Requires: %{name}-libfbclient Requires: logrotate %description This package contains common files between firebird-classic and firebird-superserver. You will need this if you want to use either one. %package doc Summary: Documentation for Firebird SQL RDBMS Group: Applications/Databases %description doc This are the Firebird SQL Database shared doc and examples files. %package filesystem Summary: Filesystem for Firebird SQL RDBMS Group: Applications/Databases %description filesystem This is the Firebird SQL Database root file system. %package devel Summary: Development Libraries for Firebird SQL RDBMS Group: Applications/Databases Requires: %{name}-filesystem Requires: %{name}-libfbclient = %{version}-%{release} Requires: %{name}-libfbembed = %{version}-%{release} %description devel Development libraries for firebird. %package classic Summary: Classic (xinetd) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: xinetd Requires: %{name} = %{version} Conflicts: %{name}-superserver Requires: %{name}-libfbembed Requires: %{name}-libfbclient Requires: %{name}-filesystem %description classic This is the classic (xinetd) server Firebird SQL RDBMS. It can also be used as an embedded server, when paired with the client-embedded package. %package superserver Summary: Superserver (single process) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: %{name} = %{version} Conflicts: %{name}-classic Requires: %{name}-libfbclient Requires: %{name}-filesystem %description superserver This is the Superserver (single process) Firebird SQL RDBMS. %package libfbclient Summary: Multi-threaded, non-local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbclient Multi-threaded, non-local client libraries for Firebird SQL Database %package libfbembed Summary: Multi-process, local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbembed Multi-process, local client libraries for Firebird SQL RDBMS %prep %setup -q -n %{pkgname} # convert intl character to UTF-8 iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl # backport patch %patch2 %patch1 %patch0 %build # classic autoreconf -vfi %configure --prefix=%{fbroot} \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-classic chmod 644 ./buildroot-classic%{fbroot}/help/help.fdb cd .. # superserver %configure --prefix=%{fbroot} \ --enable-superserver \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-superserver chmod 644 ./buildroot-superserver%{fbroot}/help/help.fdb %install # we wanted to setup both Classic and Superserver, we need to do all here rm -Rf %{buildroot} install -d %{buildroot} cd %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/%{name} mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_var}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data mkdir -p %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_includedir}/%{name} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{fbroot} mkdir -p %{buildroot}%{fbroot}/help mkdir -p %{buildroot}%{fbroot}/intl mkdir -p %{buildroot}%{fbroot}/lib mkdir -p %{buildroot}%{fbroot}/include mkdir -p %{buildroot}%{fbroot}/bin-classic mkdir -p %{buildroot}%{fbroot}/UDF-classic mkdir -p %{buildroot}%{fbroot}/bin-superserver mkdir -p %{buildroot}%{fbroot}/UDF-superserver cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/examples/empbuild/employee.fdb %{buildroot}%{_localstatedir}/lib/%{name}/data/employee.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/help/help.fdb %{buildroot}%{fbroot}/help/help.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/*.msg %{buildroot}%{fbroot}/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl %{buildroot}%{fbroot}/intl/fbintl cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libib_util.so %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbclient.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbembed.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-superserver/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-superserver/ cd %{buildroot}%{fbroot}/bin-superserver/ ln -s ./fbmgr.bin ./fbmgr cd %{buildroot} cd %{buildroot}%{fbroot}/lib/ ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so cd %{buildroot} cd %{buildroot}%{_libdir} ln -s %{fbroot}/lib/libfbembed.so libfbembed.so ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.%{major} ln -s %{fbroot}/lib/libfbclient.so libfbclient.so ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.%{major} ln -s %{fbroot}/lib/libib_util.so libib_util.so cd %{buildroot} echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log ln -s %{_localstatedir}/log/%{name}/%{name}.log .%{fbroot}/%{name}.log sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE3} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/include/* %{buildroot}%{_includedir}/%{name}/ cd %{buildroot}%{fbroot}/include/ ln -s %{_includedir}/%{name}/ibase.h ibase.h ln -s %{_includedir}/%{name}/iberror.h iberror.h ln -s %{_includedir}/%{name}/ib_util.h ib_util.h ln -s %{_includedir}/%{name}/perf.h perf.h cd %{buildroot} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/aliases.conf .%{_sysconfdir}/%{name}/aliases.conf sed "s@%{fbroot}/examples/empbuild@%{_localstatedir}/lib/%{name}/data@" -i .%{_sysconfdir}/%{name}/aliases.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/firebird.conf .%{_sysconfdir}/%{name}/firebird.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl.conf .%{_sysconfdir}/%{name}/fbintl.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/security2.fdb .%{_sysconfdir}/%{name}/security2.fdb ln -s %{_sysconfdir}/%{name}/aliases.conf .%{fbroot}/aliases.conf ln -s %{_sysconfdir}/%{name}/firebird.conf .%{fbroot}/firebird.conf ln -s %{_sysconfdir}/%{name}/security2.fdb .%{fbroot}/security2.fdb ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/profile.d/firebird.sh sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/profile.d/firebird.csh cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake %{buildroot}%{_initrddir}/%{name} sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name} %clean rm -Rf %{buildroot} %post libfbclient -p /sbin/ldconfig %postun libfbclient -p /sbin/ldconfig %post libfbembed -p /sbin/ldconfig %postun libfbembed -p /sbin/ldconfig %post classic if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-classic,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-classic,} fi if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi %preun classic if [ $1 -eq 0 ]; then if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-classic" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-classic" ]; then rm -f %{fbroot}/UDF fi fi %post superserver if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-superserver,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-superserver,} fi if [ $1 -eq 2 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird restart fi fi if [ $1 -eq 1 ]; then chkconfig firebird off fi %preun superserver if [ $1 -eq 0 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird stop fi chkconfig --del firebird if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-superserver" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-superserver" ]; then rm -f %{fbroot}/UDF fi fi %pre # Create the firebird group if it doesn't exist getent group %{name} || /usr/sbin/groupadd -r %{name} getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/sh -r %{name} # Add gds_db to /etc/services if needed FileName=/etc/services newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" oldLine=`grep "^gds_db" $FileName` if [ -z "$oldLine" ]; then echo $newLine >> $FileName fi %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,root,root) %{_localstatedir}/lib/%{name} %dir %attr(0770,%{name},%{name}) %{_localstatedir}/lib/%{name}/data %attr(0660,%{name},%{name}) %{_localstatedir}/lib/%{name}/data/employee.fdb %dir %{_localstatedir}/log/%{name} %dir %{fbroot}/intl %dir %{_sysconfdir}/%{name} %config(noreplace) %attr (0660,%{name},%{name}) %{_sysconfdir}/%{name}/security2.fdb %{fbroot}/security2.fdb %config(noreplace) %{_sysconfdir}/%{name}/fbintl.conf %config(noreplace) %{_sysconfdir}/%{name}/aliases.conf %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf %{fbroot}/aliases.conf %{fbroot}/firebird.conf %{fbroot}/intl/fbintl.conf %{fbroot}/firebird.log %attr(0660,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %{fbroot}/*.msg %{fbroot}/help %{_libdir}/libib_util.so %{fbroot}/lib/libib_util.so %defattr(0644,root,root,0644) %config(noreplace) %{_sysconfdir}/profile.d/firebird.csh %config(noreplace) %{_sysconfdir}/profile.d/firebird.sh %defattr(0755,root,root,0750) %{fbroot}/intl/fbintl %files filesystem %defattr(0755,%{name},%{name},0755) %dir %{fbroot} %defattr(0755,root,root,0755) %dir %{fbroot}/lib %files doc %defattr(0644,root,root,0755) %doc gen/buildroot-classic%{fbroot}/doc %doc gen/buildroot-classic%{fbroot}/examples %doc gen/buildroot-classic%{fbroot}/README %doc gen/buildroot-classic%{fbroot}/misc/intl.sql %doc gen/buildroot-classic%{fbroot}/misc/upgrade %files devel %defattr(0644,root,root,0755) %dir %{fbroot}/include %{fbroot}/include/* %{fbroot}/lib/*.so %{_includedir}/* %{_libdir}/*.so %files libfbclient %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbclient.so.* %{fbroot}/lib/libfbclient.so.* %files libfbembed %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbembed.so.* %{fbroot}/lib/libfbembed.so.* %files classic %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} %dir %{fbroot}/bin-classic %dir %{fbroot}/UDF-classic %defattr(0755,root,root,0755) %{fbroot}/bin-classic/* %{fbroot}/UDF-classic/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-classic/*.sql %files superserver %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name} %dir %{fbroot}/bin-superserver %dir %{fbroot}/UDF-superserver %defattr(0755,root,root,0755) %{_initrddir}/%{name} %{fbroot}/bin-superserver/* %{fbroot}/UDF-superserver/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-superserver/*.sql %changelog * Sat May 02 2009 Philippe Makowski 2.1.2.18118.0-6 - add filesystem-subpackage - remove common subpackage and use the main instead - add logrotate config * Thu Apr 30 2009 Philippe Makowski 2.1.2.18118.0-5 - fix directories owning * Thu Apr 23 2009 Philippe Makowski 2.1.2.18118.0-4 - major cleaning install process to take care of the two architectures (Classic and Superserver) the right way * Wed Apr 22 2009 Philippe Makowski 2.1.2.18118.0-3 - fix group creation * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-2 - fix autogen issue for f11 - patch init script - fix ppc64 lib destination issue * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-1 - backport doc patch - update to 2.1.2.18118 - cleanup macros - specifie libdir - change firebird user login * Sat Mar 28 2009 Philippe Makowski 2.1.1.17910.0-5 - Major packaging restructuring * Mon Mar 21 2009 Philippe Makowski 2.1.1.17190.0-4 - Create a doc package - major cleaning to avoid rpmlint errors - revert to 2.1.1 (last stable build published) * Mon Mar 09 2009 Jonathan MERCIER 2.1.2.18116.0-3 - Perform %%configure with option --with-system-icu - Add libicu-devel in BuildRequires - Use iconv for convert files to UTF-8 * Fri Mar 05 2009 Jonathan MERCIER 2.1.2.18116.0-2 - Update to 2.1.2 - Use %%global instead of %%define - Change ${SOURCE1} to %%{SOURCE1} - Change Group Database to Applications/Databases - Change License IPL to Interbase - Perform %%configure section's with some module - Cconvert cyrillic character to UTF-8 * Thu Jul 17 2008 Arkady L. Shane 2.1.1.17910.0-1 - Update to 2.1.1 * Fri Apr 18 2008 Arkady L. Shane 2.1.0.17798.0-1 - Update to 2.1.0 * Thu Sep 27 2007 Arkady L. Shane 2.0.3.12981.1-1 - Update to 2.0.3 * Thu Sep 13 2007 Arkady L. Shane 2.0.1.12855.0-1 - Initial build for Fedora - cleanup Mandriva spec --- NEW FILE import.log --- firebird-2_1_2_18118_0-6_fc10:F-9:firebird-2.1.2.18118.0-6.fc10.src.rpm:1241428024 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firebird/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:56:33 -0000 1.1 +++ .cvsignore 4 May 2009 09:07:48 -0000 1.2 @@ -0,0 +1 @@ +Firebird-2.1.2.18118-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firebird/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:56:33 -0000 1.1 +++ sources 4 May 2009 09:07:49 -0000 1.2 @@ -0,0 +1 @@ +063b3825a06d328f726b733fd74614b1 Firebird-2.1.2.18118-0.tar.bz2 From makowski at fedoraproject.org Mon May 4 09:11:33 2009 From: makowski at fedoraproject.org (Philippe Makowski) Date: Mon, 4 May 2009 09:11:33 +0000 (UTC) Subject: rpms/firebird/F-10 firebird-2.1.2-doc.patch, NONE, 1.1 firebird-fix-initscript.patch, NONE, 1.1 firebird-logrotate, NONE, 1.1 firebird-mcpu-to-mtune.patch, NONE, 1.1 firebird-profile.csh, NONE, 1.1 firebird-profile.sh, NONE, 1.1 firebird.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504091134.05300700DB@cvs1.fedora.phx.redhat.com> Author: makowski Update of /cvs/pkgs/rpms/firebird/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12540/F-10 Modified Files: .cvsignore sources Added Files: firebird-2.1.2-doc.patch firebird-fix-initscript.patch firebird-logrotate firebird-mcpu-to-mtune.patch firebird-profile.csh firebird-profile.sh firebird.spec import.log Log Message: Initial import firebird-2.1.2-doc.patch: --- NEW FILE firebird-2.1.2-doc.patch --- --- doc/sql.extensions/README.global_temporary_tables.orig 2007-03-15 10:35:57.000000000 +0100 +++ doc/sql.extensions/README.global_temporary_tables 2009-04-13 15:56:47.000000000 +0200 @@ -67,11 +67,11 @@ garbage collection of deleted record versions. DELETE triggers are not fired in this case. - Data and index pages of all of the GTT?s instances are placed in separate temporary -file?s. Each connection has its own temporary file created when this connection -first referenced some GTT. Also these temporary files are always opened with ?Forced -Writes = OFF? setting despite of database setting. + Data and index pages of all of the GTTs instances are placed in separate temporary +files. Each connection has its own temporary file created when this connection +first referenced some GTT. Also these temporary files are always opened with "Forced +Writes = OFF" setting despite of database setting. There's no limit on number of GTT instances. If you have N transactions -active simultaneously and each transaction has referenced some GTT then you?ll -have N GTT?s instances. +active simultaneously and each transaction has referenced some GTT then you'll +have N GTTs instances. --- doc/sql.extensions/README.expression_indices.orig 2005-01-28 15:07:11.000000000 +0100 +++ doc/sql.extensions/README.expression_indices 2009-04-13 15:56:36.000000000 +0200 @@ -19,7 +19,7 @@ Example(s): 1. CREATE INDEX IDX1 ON T1 COMPUTED BY ( UPPER(COL1 COLLATE PXW_CYRL) ); - SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '????' + SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '' -- PLAN (T1 INDEX (IDX1)) 2. CREATE INDEX IDX2 ON T2 COMPUTED BY ( EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) ); SELECT * FROM T2 ORDER BY EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) --- doc/sql.extensions/README.common_table_expressions.orig 2007-03-15 10:34:22.000000000 +0100 +++ doc/sql.extensions/README.common_table_expressions 2009-04-13 15:55:55.000000000 +0200 @@ -6,7 +6,7 @@ Function: - Common Table Expressions is like view?s, locally defined within main query. + Common Table Expressions is like views, locally defined within main query. From the engine point of view CTE is a derived table so no intermediate materialization is performed. @@ -45,11 +45,11 @@ Or, in less formal format : WITH [RECURSIVE] - CTE_A [(a1, a2, ?)] - AS ( SELECT ? ), + CTE_A [(a1, a2, ...)] + AS ( SELECT ...), - CTE_B [(b1, b2, ?)] - AS ( SELECT ? ), + CTE_B [(b1, b2, ...)] + AS ( SELECT ... ), ... SELECT ... FROM CTE_A, CTE_B, TAB1, TAB2 ... @@ -60,7 +60,7 @@ Rules of non-recursive common table expressions : Several table expressions can be defined at one query - Any SELECT?s clause can be used in table expressions + Any SELECTs clause can be used in table expressions Table expressions can reference each other Table expressions can be used within any part of main query or another table expression @@ -104,7 +104,7 @@ Non-recursive members are placed first in UNION Recursive members are separated from anchor members and from each other with UNION ALL clause - References between CTE?s should not have loops + References between CTEs should not have loops Aggregates (DISTINCT, GROUP BY, HAVING) and aggregate functions (SUM, COUNT, MAX etc) are not allowed in recursive members Recursive member can have only one reference to itself and only in FROM clause firebird-fix-initscript.patch: --- NEW FILE firebird-fix-initscript.patch --- --- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2008-01-22 12:39:13.000000000 +0100 +++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in.pm 2009-05-03 12:10:31.000000000 +0200 @@ -19,6 +19,7 @@ # Optionally run chkconfig to autostart the new service INSTANCE=default FIREBIRD=@prefix@ +name=firebird # No changes needed below for multiple instances FBRunUser=firebird @@ -39,18 +40,22 @@ echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser RETVAL=$? [ $RETVAL -eq 0 ] && success || failure + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name echo ;; stop) - echo -n "Stopping $FULLNAME " - if [ -f $pidfile ] then - kill `cat $pidfile` + echo -n "Stopping $FULLNAME: " + killproc -p $pidfile $name + RETVAL=$? + echo + else + echo -n "$FULLNAME server is stopped" + echo fi RETVAL=$? - [ $RETVAL -eq 0 ] && success || failure - echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name ;; status) if [ -f $pidfile ] @@ -70,7 +75,7 @@ RETVAL=$? ;; *) - echo "Usage: firebird {start|stop|status|restart|reload}" + echo "Usage: $name {start|stop|status|restart|reload}" exit 1 esac --- NEW FILE firebird-logrotate --- firebird.log { weekly missingok rotate 52 compress delaycompress notifempty create 640 firebird adm } firebird-mcpu-to-mtune.patch: --- NEW FILE firebird-mcpu-to-mtune.patch --- --- builds/posix/prefix.linux 2007-05-03 07:24:50.000000000 -0400 +++ builds/posix/prefix.linux.oden 2008-07-18 08:45:48.000000000 -0400 @@ -22,7 +22,7 @@ # you may remove it if engine is getting compiled with any other GCC version COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin +OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -fno-builtin WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) --- NEW FILE firebird-profile.csh --- setenv PATH "${PATH}:%{fbroot}/bin" --- NEW FILE firebird-profile.sh --- export PATH=$PATH:%{fbroot}/bin --- NEW FILE firebird.spec --- %global pkgname Firebird-2.1.2.18118-0 %global fbroot %{_libdir}/%{name} %global major 2.1.2 Summary: SQL relational database management system Name: firebird Version: 2.1.2.18118.0 Release: 6%{?dist} Group: Applications/Databases License: Interbase URL: http://www.firebirdsql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2 Source1: firebird-profile.sh Source2: firebird-profile.csh Source3: firebird-logrotate Patch0: firebird-mcpu-to-mtune.patch Patch1: firebird-2.1.2-doc.patch Patch2: firebird-fix-initscript.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: libicu-devel Requires: %{name}-arch = %{version} Requires: grep Requires: sed Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires(postun): /usr/sbin/userdel Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: %{name}-filesystem Requires: %{name}-libfbclient Requires: logrotate %description This package contains common files between firebird-classic and firebird-superserver. You will need this if you want to use either one. %package doc Summary: Documentation for Firebird SQL RDBMS Group: Applications/Databases %description doc This are the Firebird SQL Database shared doc and examples files. %package filesystem Summary: Filesystem for Firebird SQL RDBMS Group: Applications/Databases %description filesystem This is the Firebird SQL Database root file system. %package devel Summary: Development Libraries for Firebird SQL RDBMS Group: Applications/Databases Requires: %{name}-filesystem Requires: %{name}-libfbclient = %{version}-%{release} Requires: %{name}-libfbembed = %{version}-%{release} %description devel Development libraries for firebird. %package classic Summary: Classic (xinetd) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: xinetd Requires: %{name} = %{version} Conflicts: %{name}-superserver Requires: %{name}-libfbembed Requires: %{name}-libfbclient Requires: %{name}-filesystem %description classic This is the classic (xinetd) server Firebird SQL RDBMS. It can also be used as an embedded server, when paired with the client-embedded package. %package superserver Summary: Superserver (single process) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: %{name} = %{version} Conflicts: %{name}-classic Requires: %{name}-libfbclient Requires: %{name}-filesystem %description superserver This is the Superserver (single process) Firebird SQL RDBMS. %package libfbclient Summary: Multi-threaded, non-local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbclient Multi-threaded, non-local client libraries for Firebird SQL Database %package libfbembed Summary: Multi-process, local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbembed Multi-process, local client libraries for Firebird SQL RDBMS %prep %setup -q -n %{pkgname} # convert intl character to UTF-8 iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl # backport patch %patch2 %patch1 %patch0 %build # classic autoreconf -vfi %configure --prefix=%{fbroot} \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-classic chmod 644 ./buildroot-classic%{fbroot}/help/help.fdb cd .. # superserver %configure --prefix=%{fbroot} \ --enable-superserver \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-superserver chmod 644 ./buildroot-superserver%{fbroot}/help/help.fdb %install # we wanted to setup both Classic and Superserver, we need to do all here rm -Rf %{buildroot} install -d %{buildroot} cd %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/%{name} mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_var}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data mkdir -p %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_includedir}/%{name} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{fbroot} mkdir -p %{buildroot}%{fbroot}/help mkdir -p %{buildroot}%{fbroot}/intl mkdir -p %{buildroot}%{fbroot}/lib mkdir -p %{buildroot}%{fbroot}/include mkdir -p %{buildroot}%{fbroot}/bin-classic mkdir -p %{buildroot}%{fbroot}/UDF-classic mkdir -p %{buildroot}%{fbroot}/bin-superserver mkdir -p %{buildroot}%{fbroot}/UDF-superserver cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/examples/empbuild/employee.fdb %{buildroot}%{_localstatedir}/lib/%{name}/data/employee.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/help/help.fdb %{buildroot}%{fbroot}/help/help.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/*.msg %{buildroot}%{fbroot}/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl %{buildroot}%{fbroot}/intl/fbintl cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libib_util.so %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbclient.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbembed.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-superserver/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-superserver/ cd %{buildroot}%{fbroot}/bin-superserver/ ln -s ./fbmgr.bin ./fbmgr cd %{buildroot} cd %{buildroot}%{fbroot}/lib/ ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so cd %{buildroot} cd %{buildroot}%{_libdir} ln -s %{fbroot}/lib/libfbembed.so libfbembed.so ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.%{major} ln -s %{fbroot}/lib/libfbclient.so libfbclient.so ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.%{major} ln -s %{fbroot}/lib/libib_util.so libib_util.so cd %{buildroot} echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log ln -s %{_localstatedir}/log/%{name}/%{name}.log .%{fbroot}/%{name}.log sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE3} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/include/* %{buildroot}%{_includedir}/%{name}/ cd %{buildroot}%{fbroot}/include/ ln -s %{_includedir}/%{name}/ibase.h ibase.h ln -s %{_includedir}/%{name}/iberror.h iberror.h ln -s %{_includedir}/%{name}/ib_util.h ib_util.h ln -s %{_includedir}/%{name}/perf.h perf.h cd %{buildroot} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/aliases.conf .%{_sysconfdir}/%{name}/aliases.conf sed "s@%{fbroot}/examples/empbuild@%{_localstatedir}/lib/%{name}/data@" -i .%{_sysconfdir}/%{name}/aliases.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/firebird.conf .%{_sysconfdir}/%{name}/firebird.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl.conf .%{_sysconfdir}/%{name}/fbintl.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/security2.fdb .%{_sysconfdir}/%{name}/security2.fdb ln -s %{_sysconfdir}/%{name}/aliases.conf .%{fbroot}/aliases.conf ln -s %{_sysconfdir}/%{name}/firebird.conf .%{fbroot}/firebird.conf ln -s %{_sysconfdir}/%{name}/security2.fdb .%{fbroot}/security2.fdb ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/profile.d/firebird.sh sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/profile.d/firebird.csh cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake %{buildroot}%{_initrddir}/%{name} sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name} %clean rm -Rf %{buildroot} %post libfbclient -p /sbin/ldconfig %postun libfbclient -p /sbin/ldconfig %post libfbembed -p /sbin/ldconfig %postun libfbembed -p /sbin/ldconfig %post classic if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-classic,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-classic,} fi if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi %preun classic if [ $1 -eq 0 ]; then if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-classic" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-classic" ]; then rm -f %{fbroot}/UDF fi fi %post superserver if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-superserver,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-superserver,} fi if [ $1 -eq 2 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird restart fi fi if [ $1 -eq 1 ]; then chkconfig firebird off fi %preun superserver if [ $1 -eq 0 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird stop fi chkconfig --del firebird if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-superserver" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-superserver" ]; then rm -f %{fbroot}/UDF fi fi %pre # Create the firebird group if it doesn't exist getent group %{name} || /usr/sbin/groupadd -r %{name} getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/sh -r %{name} # Add gds_db to /etc/services if needed FileName=/etc/services newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" oldLine=`grep "^gds_db" $FileName` if [ -z "$oldLine" ]; then echo $newLine >> $FileName fi %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,root,root) %{_localstatedir}/lib/%{name} %dir %attr(0770,%{name},%{name}) %{_localstatedir}/lib/%{name}/data %attr(0660,%{name},%{name}) %{_localstatedir}/lib/%{name}/data/employee.fdb %dir %{_localstatedir}/log/%{name} %dir %{fbroot}/intl %dir %{_sysconfdir}/%{name} %config(noreplace) %attr (0660,%{name},%{name}) %{_sysconfdir}/%{name}/security2.fdb %{fbroot}/security2.fdb %config(noreplace) %{_sysconfdir}/%{name}/fbintl.conf %config(noreplace) %{_sysconfdir}/%{name}/aliases.conf %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf %{fbroot}/aliases.conf %{fbroot}/firebird.conf %{fbroot}/intl/fbintl.conf %{fbroot}/firebird.log %attr(0660,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %{fbroot}/*.msg %{fbroot}/help %{_libdir}/libib_util.so %{fbroot}/lib/libib_util.so %defattr(0644,root,root,0644) %config(noreplace) %{_sysconfdir}/profile.d/firebird.csh %config(noreplace) %{_sysconfdir}/profile.d/firebird.sh %defattr(0755,root,root,0750) %{fbroot}/intl/fbintl %files filesystem %defattr(0755,%{name},%{name},0755) %dir %{fbroot} %defattr(0755,root,root,0755) %dir %{fbroot}/lib %files doc %defattr(0644,root,root,0755) %doc gen/buildroot-classic%{fbroot}/doc %doc gen/buildroot-classic%{fbroot}/examples %doc gen/buildroot-classic%{fbroot}/README %doc gen/buildroot-classic%{fbroot}/misc/intl.sql %doc gen/buildroot-classic%{fbroot}/misc/upgrade %files devel %defattr(0644,root,root,0755) %dir %{fbroot}/include %{fbroot}/include/* %{fbroot}/lib/*.so %{_includedir}/* %{_libdir}/*.so %files libfbclient %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbclient.so.* %{fbroot}/lib/libfbclient.so.* %files libfbembed %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbembed.so.* %{fbroot}/lib/libfbembed.so.* %files classic %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} %dir %{fbroot}/bin-classic %dir %{fbroot}/UDF-classic %defattr(0755,root,root,0755) %{fbroot}/bin-classic/* %{fbroot}/UDF-classic/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-classic/*.sql %files superserver %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name} %dir %{fbroot}/bin-superserver %dir %{fbroot}/UDF-superserver %defattr(0755,root,root,0755) %{_initrddir}/%{name} %{fbroot}/bin-superserver/* %{fbroot}/UDF-superserver/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-superserver/*.sql %changelog * Sat May 02 2009 Philippe Makowski 2.1.2.18118.0-6 - add filesystem-subpackage - remove common subpackage and use the main instead - add logrotate config * Thu Apr 30 2009 Philippe Makowski 2.1.2.18118.0-5 - fix directories owning * Thu Apr 23 2009 Philippe Makowski 2.1.2.18118.0-4 - major cleaning install process to take care of the two architectures (Classic and Superserver) the right way * Wed Apr 22 2009 Philippe Makowski 2.1.2.18118.0-3 - fix group creation * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-2 - fix autogen issue for f11 - patch init script - fix ppc64 lib destination issue * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-1 - backport doc patch - update to 2.1.2.18118 - cleanup macros - specifie libdir - change firebird user login * Sat Mar 28 2009 Philippe Makowski 2.1.1.17910.0-5 - Major packaging restructuring * Mon Mar 21 2009 Philippe Makowski 2.1.1.17190.0-4 - Create a doc package - major cleaning to avoid rpmlint errors - revert to 2.1.1 (last stable build published) * Mon Mar 09 2009 Jonathan MERCIER 2.1.2.18116.0-3 - Perform %%configure with option --with-system-icu - Add libicu-devel in BuildRequires - Use iconv for convert files to UTF-8 * Fri Mar 05 2009 Jonathan MERCIER 2.1.2.18116.0-2 - Update to 2.1.2 - Use %%global instead of %%define - Change ${SOURCE1} to %%{SOURCE1} - Change Group Database to Applications/Databases - Change License IPL to Interbase - Perform %%configure section's with some module - Cconvert cyrillic character to UTF-8 * Thu Jul 17 2008 Arkady L. Shane 2.1.1.17910.0-1 - Update to 2.1.1 * Fri Apr 18 2008 Arkady L. Shane 2.1.0.17798.0-1 - Update to 2.1.0 * Thu Sep 27 2007 Arkady L. Shane 2.0.3.12981.1-1 - Update to 2.0.3 * Thu Sep 13 2007 Arkady L. Shane 2.0.1.12855.0-1 - Initial build for Fedora - cleanup Mandriva spec --- NEW FILE import.log --- firebird-2_1_2_18118_0-6_fc10:F-10:firebird-2.1.2.18118.0-6.fc10.src.rpm:1241428214 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firebird/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:56:33 -0000 1.1 +++ .cvsignore 4 May 2009 09:11:03 -0000 1.2 @@ -0,0 +1 @@ +Firebird-2.1.2.18118-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firebird/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:56:33 -0000 1.1 +++ sources 4 May 2009 09:11:03 -0000 1.2 @@ -0,0 +1 @@ +063b3825a06d328f726b733fd74614b1 Firebird-2.1.2.18118-0.tar.bz2 From makowski at fedoraproject.org Mon May 4 09:15:07 2009 From: makowski at fedoraproject.org (Philippe Makowski) Date: Mon, 4 May 2009 09:15:07 +0000 (UTC) Subject: rpms/firebird/F-11 firebird-2.1.2-doc.patch, NONE, 1.1 firebird-fix-initscript.patch, NONE, 1.1 firebird-logrotate, NONE, 1.1 firebird-mcpu-to-mtune.patch, NONE, 1.1 firebird-profile.csh, NONE, 1.1 firebird-profile.sh, NONE, 1.1 firebird.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504091507.A3C2A700DB@cvs1.fedora.phx.redhat.com> Author: makowski Update of /cvs/pkgs/rpms/firebird/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13343/F-11 Modified Files: .cvsignore sources Added Files: firebird-2.1.2-doc.patch firebird-fix-initscript.patch firebird-logrotate firebird-mcpu-to-mtune.patch firebird-profile.csh firebird-profile.sh firebird.spec import.log Log Message: Initial import firebird-2.1.2-doc.patch: --- NEW FILE firebird-2.1.2-doc.patch --- --- doc/sql.extensions/README.global_temporary_tables.orig 2007-03-15 10:35:57.000000000 +0100 +++ doc/sql.extensions/README.global_temporary_tables 2009-04-13 15:56:47.000000000 +0200 @@ -67,11 +67,11 @@ garbage collection of deleted record versions. DELETE triggers are not fired in this case. - Data and index pages of all of the GTT?s instances are placed in separate temporary -file?s. Each connection has its own temporary file created when this connection -first referenced some GTT. Also these temporary files are always opened with ?Forced -Writes = OFF? setting despite of database setting. + Data and index pages of all of the GTTs instances are placed in separate temporary +files. Each connection has its own temporary file created when this connection +first referenced some GTT. Also these temporary files are always opened with "Forced +Writes = OFF" setting despite of database setting. There's no limit on number of GTT instances. If you have N transactions -active simultaneously and each transaction has referenced some GTT then you?ll -have N GTT?s instances. +active simultaneously and each transaction has referenced some GTT then you'll +have N GTTs instances. --- doc/sql.extensions/README.expression_indices.orig 2005-01-28 15:07:11.000000000 +0100 +++ doc/sql.extensions/README.expression_indices 2009-04-13 15:56:36.000000000 +0200 @@ -19,7 +19,7 @@ Example(s): 1. CREATE INDEX IDX1 ON T1 COMPUTED BY ( UPPER(COL1 COLLATE PXW_CYRL) ); - SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '????' + SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '' -- PLAN (T1 INDEX (IDX1)) 2. CREATE INDEX IDX2 ON T2 COMPUTED BY ( EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) ); SELECT * FROM T2 ORDER BY EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) --- doc/sql.extensions/README.common_table_expressions.orig 2007-03-15 10:34:22.000000000 +0100 +++ doc/sql.extensions/README.common_table_expressions 2009-04-13 15:55:55.000000000 +0200 @@ -6,7 +6,7 @@ Function: - Common Table Expressions is like view?s, locally defined within main query. + Common Table Expressions is like views, locally defined within main query. From the engine point of view CTE is a derived table so no intermediate materialization is performed. @@ -45,11 +45,11 @@ Or, in less formal format : WITH [RECURSIVE] - CTE_A [(a1, a2, ?)] - AS ( SELECT ? ), + CTE_A [(a1, a2, ...)] + AS ( SELECT ...), - CTE_B [(b1, b2, ?)] - AS ( SELECT ? ), + CTE_B [(b1, b2, ...)] + AS ( SELECT ... ), ... SELECT ... FROM CTE_A, CTE_B, TAB1, TAB2 ... @@ -60,7 +60,7 @@ Rules of non-recursive common table expressions : Several table expressions can be defined at one query - Any SELECT?s clause can be used in table expressions + Any SELECTs clause can be used in table expressions Table expressions can reference each other Table expressions can be used within any part of main query or another table expression @@ -104,7 +104,7 @@ Non-recursive members are placed first in UNION Recursive members are separated from anchor members and from each other with UNION ALL clause - References between CTE?s should not have loops + References between CTEs should not have loops Aggregates (DISTINCT, GROUP BY, HAVING) and aggregate functions (SUM, COUNT, MAX etc) are not allowed in recursive members Recursive member can have only one reference to itself and only in FROM clause firebird-fix-initscript.patch: --- NEW FILE firebird-fix-initscript.patch --- --- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2008-01-22 12:39:13.000000000 +0100 +++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in.pm 2009-05-03 12:10:31.000000000 +0200 @@ -19,6 +19,7 @@ # Optionally run chkconfig to autostart the new service INSTANCE=default FIREBIRD=@prefix@ +name=firebird # No changes needed below for multiple instances FBRunUser=firebird @@ -39,18 +40,22 @@ echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser RETVAL=$? [ $RETVAL -eq 0 ] && success || failure + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name echo ;; stop) - echo -n "Stopping $FULLNAME " - if [ -f $pidfile ] then - kill `cat $pidfile` + echo -n "Stopping $FULLNAME: " + killproc -p $pidfile $name + RETVAL=$? + echo + else + echo -n "$FULLNAME server is stopped" + echo fi RETVAL=$? - [ $RETVAL -eq 0 ] && success || failure - echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name ;; status) if [ -f $pidfile ] @@ -70,7 +75,7 @@ RETVAL=$? ;; *) - echo "Usage: firebird {start|stop|status|restart|reload}" + echo "Usage: $name {start|stop|status|restart|reload}" exit 1 esac --- NEW FILE firebird-logrotate --- firebird.log { weekly missingok rotate 52 compress delaycompress notifempty create 640 firebird adm } firebird-mcpu-to-mtune.patch: --- NEW FILE firebird-mcpu-to-mtune.patch --- --- builds/posix/prefix.linux 2007-05-03 07:24:50.000000000 -0400 +++ builds/posix/prefix.linux.oden 2008-07-18 08:45:48.000000000 -0400 @@ -22,7 +22,7 @@ # you may remove it if engine is getting compiled with any other GCC version COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin +OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -fno-builtin WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) --- NEW FILE firebird-profile.csh --- setenv PATH "${PATH}:%{fbroot}/bin" --- NEW FILE firebird-profile.sh --- export PATH=$PATH:%{fbroot}/bin --- NEW FILE firebird.spec --- %global pkgname Firebird-2.1.2.18118-0 %global fbroot %{_libdir}/%{name} %global major 2.1.2 Summary: SQL relational database management system Name: firebird Version: 2.1.2.18118.0 Release: 6%{?dist} Group: Applications/Databases License: Interbase URL: http://www.firebirdsql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2 Source1: firebird-profile.sh Source2: firebird-profile.csh Source3: firebird-logrotate Patch0: firebird-mcpu-to-mtune.patch Patch1: firebird-2.1.2-doc.patch Patch2: firebird-fix-initscript.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: libicu-devel Requires: %{name}-arch = %{version} Requires: grep Requires: sed Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires(postun): /usr/sbin/userdel Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: %{name}-filesystem Requires: %{name}-libfbclient Requires: logrotate %description This package contains common files between firebird-classic and firebird-superserver. You will need this if you want to use either one. %package doc Summary: Documentation for Firebird SQL RDBMS Group: Applications/Databases %description doc This are the Firebird SQL Database shared doc and examples files. %package filesystem Summary: Filesystem for Firebird SQL RDBMS Group: Applications/Databases %description filesystem This is the Firebird SQL Database root file system. %package devel Summary: Development Libraries for Firebird SQL RDBMS Group: Applications/Databases Requires: %{name}-filesystem Requires: %{name}-libfbclient = %{version}-%{release} Requires: %{name}-libfbembed = %{version}-%{release} %description devel Development libraries for firebird. %package classic Summary: Classic (xinetd) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: xinetd Requires: %{name} = %{version} Conflicts: %{name}-superserver Requires: %{name}-libfbembed Requires: %{name}-libfbclient Requires: %{name}-filesystem %description classic This is the classic (xinetd) server Firebird SQL RDBMS. It can also be used as an embedded server, when paired with the client-embedded package. %package superserver Summary: Superserver (single process) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: %{name} = %{version} Conflicts: %{name}-classic Requires: %{name}-libfbclient Requires: %{name}-filesystem %description superserver This is the Superserver (single process) Firebird SQL RDBMS. %package libfbclient Summary: Multi-threaded, non-local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbclient Multi-threaded, non-local client libraries for Firebird SQL Database %package libfbembed Summary: Multi-process, local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbembed Multi-process, local client libraries for Firebird SQL RDBMS %prep %setup -q -n %{pkgname} # convert intl character to UTF-8 iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl # backport patch %patch2 %patch1 %patch0 %build # classic autoreconf -vfi %configure --prefix=%{fbroot} \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-classic chmod 644 ./buildroot-classic%{fbroot}/help/help.fdb cd .. # superserver %configure --prefix=%{fbroot} \ --enable-superserver \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-superserver chmod 644 ./buildroot-superserver%{fbroot}/help/help.fdb %install # we wanted to setup both Classic and Superserver, we need to do all here rm -Rf %{buildroot} install -d %{buildroot} cd %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/%{name} mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_var}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data mkdir -p %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_includedir}/%{name} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{fbroot} mkdir -p %{buildroot}%{fbroot}/help mkdir -p %{buildroot}%{fbroot}/intl mkdir -p %{buildroot}%{fbroot}/lib mkdir -p %{buildroot}%{fbroot}/include mkdir -p %{buildroot}%{fbroot}/bin-classic mkdir -p %{buildroot}%{fbroot}/UDF-classic mkdir -p %{buildroot}%{fbroot}/bin-superserver mkdir -p %{buildroot}%{fbroot}/UDF-superserver cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/examples/empbuild/employee.fdb %{buildroot}%{_localstatedir}/lib/%{name}/data/employee.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/help/help.fdb %{buildroot}%{fbroot}/help/help.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/*.msg %{buildroot}%{fbroot}/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl %{buildroot}%{fbroot}/intl/fbintl cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libib_util.so %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbclient.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbembed.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-superserver/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-superserver/ cd %{buildroot}%{fbroot}/bin-superserver/ ln -s ./fbmgr.bin ./fbmgr cd %{buildroot} cd %{buildroot}%{fbroot}/lib/ ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so cd %{buildroot} cd %{buildroot}%{_libdir} ln -s %{fbroot}/lib/libfbembed.so libfbembed.so ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.%{major} ln -s %{fbroot}/lib/libfbclient.so libfbclient.so ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.%{major} ln -s %{fbroot}/lib/libib_util.so libib_util.so cd %{buildroot} echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log ln -s %{_localstatedir}/log/%{name}/%{name}.log .%{fbroot}/%{name}.log sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE3} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/include/* %{buildroot}%{_includedir}/%{name}/ cd %{buildroot}%{fbroot}/include/ ln -s %{_includedir}/%{name}/ibase.h ibase.h ln -s %{_includedir}/%{name}/iberror.h iberror.h ln -s %{_includedir}/%{name}/ib_util.h ib_util.h ln -s %{_includedir}/%{name}/perf.h perf.h cd %{buildroot} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/aliases.conf .%{_sysconfdir}/%{name}/aliases.conf sed "s@%{fbroot}/examples/empbuild@%{_localstatedir}/lib/%{name}/data@" -i .%{_sysconfdir}/%{name}/aliases.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/firebird.conf .%{_sysconfdir}/%{name}/firebird.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl.conf .%{_sysconfdir}/%{name}/fbintl.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/security2.fdb .%{_sysconfdir}/%{name}/security2.fdb ln -s %{_sysconfdir}/%{name}/aliases.conf .%{fbroot}/aliases.conf ln -s %{_sysconfdir}/%{name}/firebird.conf .%{fbroot}/firebird.conf ln -s %{_sysconfdir}/%{name}/security2.fdb .%{fbroot}/security2.fdb ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/profile.d/firebird.sh sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/profile.d/firebird.csh cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake %{buildroot}%{_initrddir}/%{name} sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name} %clean rm -Rf %{buildroot} %post libfbclient -p /sbin/ldconfig %postun libfbclient -p /sbin/ldconfig %post libfbembed -p /sbin/ldconfig %postun libfbembed -p /sbin/ldconfig %post classic if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-classic,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-classic,} fi if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi %preun classic if [ $1 -eq 0 ]; then if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-classic" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-classic" ]; then rm -f %{fbroot}/UDF fi fi %post superserver if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-superserver,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-superserver,} fi if [ $1 -eq 2 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird restart fi fi if [ $1 -eq 1 ]; then chkconfig firebird off fi %preun superserver if [ $1 -eq 0 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird stop fi chkconfig --del firebird if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-superserver" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-superserver" ]; then rm -f %{fbroot}/UDF fi fi %pre # Create the firebird group if it doesn't exist getent group %{name} || /usr/sbin/groupadd -r %{name} getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/sh -r %{name} # Add gds_db to /etc/services if needed FileName=/etc/services newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" oldLine=`grep "^gds_db" $FileName` if [ -z "$oldLine" ]; then echo $newLine >> $FileName fi %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,root,root) %{_localstatedir}/lib/%{name} %dir %attr(0770,%{name},%{name}) %{_localstatedir}/lib/%{name}/data %attr(0660,%{name},%{name}) %{_localstatedir}/lib/%{name}/data/employee.fdb %dir %{_localstatedir}/log/%{name} %dir %{fbroot}/intl %dir %{_sysconfdir}/%{name} %config(noreplace) %attr (0660,%{name},%{name}) %{_sysconfdir}/%{name}/security2.fdb %{fbroot}/security2.fdb %config(noreplace) %{_sysconfdir}/%{name}/fbintl.conf %config(noreplace) %{_sysconfdir}/%{name}/aliases.conf %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf %{fbroot}/aliases.conf %{fbroot}/firebird.conf %{fbroot}/intl/fbintl.conf %{fbroot}/firebird.log %attr(0660,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %{fbroot}/*.msg %{fbroot}/help %{_libdir}/libib_util.so %{fbroot}/lib/libib_util.so %defattr(0644,root,root,0644) %config(noreplace) %{_sysconfdir}/profile.d/firebird.csh %config(noreplace) %{_sysconfdir}/profile.d/firebird.sh %defattr(0755,root,root,0750) %{fbroot}/intl/fbintl %files filesystem %defattr(0755,%{name},%{name},0755) %dir %{fbroot} %defattr(0755,root,root,0755) %dir %{fbroot}/lib %files doc %defattr(0644,root,root,0755) %doc gen/buildroot-classic%{fbroot}/doc %doc gen/buildroot-classic%{fbroot}/examples %doc gen/buildroot-classic%{fbroot}/README %doc gen/buildroot-classic%{fbroot}/misc/intl.sql %doc gen/buildroot-classic%{fbroot}/misc/upgrade %files devel %defattr(0644,root,root,0755) %dir %{fbroot}/include %{fbroot}/include/* %{fbroot}/lib/*.so %{_includedir}/* %{_libdir}/*.so %files libfbclient %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbclient.so.* %{fbroot}/lib/libfbclient.so.* %files libfbembed %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbembed.so.* %{fbroot}/lib/libfbembed.so.* %files classic %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} %dir %{fbroot}/bin-classic %dir %{fbroot}/UDF-classic %defattr(0755,root,root,0755) %{fbroot}/bin-classic/* %{fbroot}/UDF-classic/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-classic/*.sql %files superserver %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name} %dir %{fbroot}/bin-superserver %dir %{fbroot}/UDF-superserver %defattr(0755,root,root,0755) %{_initrddir}/%{name} %{fbroot}/bin-superserver/* %{fbroot}/UDF-superserver/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-superserver/*.sql %changelog * Sat May 02 2009 Philippe Makowski 2.1.2.18118.0-6 - add filesystem-subpackage - remove common subpackage and use the main instead - add logrotate config * Thu Apr 30 2009 Philippe Makowski 2.1.2.18118.0-5 - fix directories owning * Thu Apr 23 2009 Philippe Makowski 2.1.2.18118.0-4 - major cleaning install process to take care of the two architectures (Classic and Superserver) the right way * Wed Apr 22 2009 Philippe Makowski 2.1.2.18118.0-3 - fix group creation * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-2 - fix autogen issue for f11 - patch init script - fix ppc64 lib destination issue * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-1 - backport doc patch - update to 2.1.2.18118 - cleanup macros - specifie libdir - change firebird user login * Sat Mar 28 2009 Philippe Makowski 2.1.1.17910.0-5 - Major packaging restructuring * Mon Mar 21 2009 Philippe Makowski 2.1.1.17190.0-4 - Create a doc package - major cleaning to avoid rpmlint errors - revert to 2.1.1 (last stable build published) * Mon Mar 09 2009 Jonathan MERCIER 2.1.2.18116.0-3 - Perform %%configure with option --with-system-icu - Add libicu-devel in BuildRequires - Use iconv for convert files to UTF-8 * Fri Mar 05 2009 Jonathan MERCIER 2.1.2.18116.0-2 - Update to 2.1.2 - Use %%global instead of %%define - Change ${SOURCE1} to %%{SOURCE1} - Change Group Database to Applications/Databases - Change License IPL to Interbase - Perform %%configure section's with some module - Cconvert cyrillic character to UTF-8 * Thu Jul 17 2008 Arkady L. Shane 2.1.1.17910.0-1 - Update to 2.1.1 * Fri Apr 18 2008 Arkady L. Shane 2.1.0.17798.0-1 - Update to 2.1.0 * Thu Sep 27 2007 Arkady L. Shane 2.0.3.12981.1-1 - Update to 2.0.3 * Thu Sep 13 2007 Arkady L. Shane 2.0.1.12855.0-1 - Initial build for Fedora - cleanup Mandriva spec --- NEW FILE import.log --- firebird-2_1_2_18118_0-6_fc10:F-11:firebird-2.1.2.18118.0-6.fc10.src.rpm:1241428437 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firebird/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:56:33 -0000 1.1 +++ .cvsignore 4 May 2009 09:14:37 -0000 1.2 @@ -0,0 +1 @@ +Firebird-2.1.2.18118-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firebird/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:56:33 -0000 1.1 +++ sources 4 May 2009 09:14:37 -0000 1.2 @@ -0,0 +1 @@ +063b3825a06d328f726b733fd74614b1 Firebird-2.1.2.18118-0.tar.bz2 From makowski at fedoraproject.org Mon May 4 09:17:24 2009 From: makowski at fedoraproject.org (Philippe Makowski) Date: Mon, 4 May 2009 09:17:24 +0000 (UTC) Subject: rpms/firebird/EL-4 firebird-2.1.2-doc.patch, NONE, 1.1 firebird-fix-initscript.patch, NONE, 1.1 firebird-logrotate, NONE, 1.1 firebird-mcpu-to-mtune.patch, NONE, 1.1 firebird-profile.csh, NONE, 1.1 firebird-profile.sh, NONE, 1.1 firebird.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504091724.1D79A700DB@cvs1.fedora.phx.redhat.com> Author: makowski Update of /cvs/pkgs/rpms/firebird/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13947/EL-4 Modified Files: .cvsignore sources Added Files: firebird-2.1.2-doc.patch firebird-fix-initscript.patch firebird-logrotate firebird-mcpu-to-mtune.patch firebird-profile.csh firebird-profile.sh firebird.spec import.log Log Message: Initial import firebird-2.1.2-doc.patch: --- NEW FILE firebird-2.1.2-doc.patch --- --- doc/sql.extensions/README.global_temporary_tables.orig 2007-03-15 10:35:57.000000000 +0100 +++ doc/sql.extensions/README.global_temporary_tables 2009-04-13 15:56:47.000000000 +0200 @@ -67,11 +67,11 @@ garbage collection of deleted record versions. DELETE triggers are not fired in this case. - Data and index pages of all of the GTT?s instances are placed in separate temporary -file?s. Each connection has its own temporary file created when this connection -first referenced some GTT. Also these temporary files are always opened with ?Forced -Writes = OFF? setting despite of database setting. + Data and index pages of all of the GTTs instances are placed in separate temporary +files. Each connection has its own temporary file created when this connection +first referenced some GTT. Also these temporary files are always opened with "Forced +Writes = OFF" setting despite of database setting. There's no limit on number of GTT instances. If you have N transactions -active simultaneously and each transaction has referenced some GTT then you?ll -have N GTT?s instances. +active simultaneously and each transaction has referenced some GTT then you'll +have N GTTs instances. --- doc/sql.extensions/README.expression_indices.orig 2005-01-28 15:07:11.000000000 +0100 +++ doc/sql.extensions/README.expression_indices 2009-04-13 15:56:36.000000000 +0200 @@ -19,7 +19,7 @@ Example(s): 1. CREATE INDEX IDX1 ON T1 COMPUTED BY ( UPPER(COL1 COLLATE PXW_CYRL) ); - SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '????' + SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '' -- PLAN (T1 INDEX (IDX1)) 2. CREATE INDEX IDX2 ON T2 COMPUTED BY ( EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) ); SELECT * FROM T2 ORDER BY EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) --- doc/sql.extensions/README.common_table_expressions.orig 2007-03-15 10:34:22.000000000 +0100 +++ doc/sql.extensions/README.common_table_expressions 2009-04-13 15:55:55.000000000 +0200 @@ -6,7 +6,7 @@ Function: - Common Table Expressions is like view?s, locally defined within main query. + Common Table Expressions is like views, locally defined within main query. From the engine point of view CTE is a derived table so no intermediate materialization is performed. @@ -45,11 +45,11 @@ Or, in less formal format : WITH [RECURSIVE] - CTE_A [(a1, a2, ?)] - AS ( SELECT ? ), + CTE_A [(a1, a2, ...)] + AS ( SELECT ...), - CTE_B [(b1, b2, ?)] - AS ( SELECT ? ), + CTE_B [(b1, b2, ...)] + AS ( SELECT ... ), ... SELECT ... FROM CTE_A, CTE_B, TAB1, TAB2 ... @@ -60,7 +60,7 @@ Rules of non-recursive common table expressions : Several table expressions can be defined at one query - Any SELECT?s clause can be used in table expressions + Any SELECTs clause can be used in table expressions Table expressions can reference each other Table expressions can be used within any part of main query or another table expression @@ -104,7 +104,7 @@ Non-recursive members are placed first in UNION Recursive members are separated from anchor members and from each other with UNION ALL clause - References between CTE?s should not have loops + References between CTEs should not have loops Aggregates (DISTINCT, GROUP BY, HAVING) and aggregate functions (SUM, COUNT, MAX etc) are not allowed in recursive members Recursive member can have only one reference to itself and only in FROM clause firebird-fix-initscript.patch: --- NEW FILE firebird-fix-initscript.patch --- --- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2008-01-22 12:39:13.000000000 +0100 +++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in.pm 2009-05-03 12:10:31.000000000 +0200 @@ -19,6 +19,7 @@ # Optionally run chkconfig to autostart the new service INSTANCE=default FIREBIRD=@prefix@ +name=firebird # No changes needed below for multiple instances FBRunUser=firebird @@ -39,18 +40,22 @@ echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser RETVAL=$? [ $RETVAL -eq 0 ] && success || failure + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name echo ;; stop) - echo -n "Stopping $FULLNAME " - if [ -f $pidfile ] then - kill `cat $pidfile` + echo -n "Stopping $FULLNAME: " + killproc -p $pidfile $name + RETVAL=$? + echo + else + echo -n "$FULLNAME server is stopped" + echo fi RETVAL=$? - [ $RETVAL -eq 0 ] && success || failure - echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name ;; status) if [ -f $pidfile ] @@ -70,7 +75,7 @@ RETVAL=$? ;; *) - echo "Usage: firebird {start|stop|status|restart|reload}" + echo "Usage: $name {start|stop|status|restart|reload}" exit 1 esac --- NEW FILE firebird-logrotate --- firebird.log { weekly missingok rotate 52 compress delaycompress notifempty create 640 firebird adm } firebird-mcpu-to-mtune.patch: --- NEW FILE firebird-mcpu-to-mtune.patch --- --- builds/posix/prefix.linux 2007-05-03 07:24:50.000000000 -0400 +++ builds/posix/prefix.linux.oden 2008-07-18 08:45:48.000000000 -0400 @@ -22,7 +22,7 @@ # you may remove it if engine is getting compiled with any other GCC version COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin +OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -fno-builtin WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) --- NEW FILE firebird-profile.csh --- setenv PATH "${PATH}:%{fbroot}/bin" --- NEW FILE firebird-profile.sh --- export PATH=$PATH:%{fbroot}/bin --- NEW FILE firebird.spec --- %global pkgname Firebird-2.1.2.18118-0 %global fbroot %{_libdir}/%{name} %global major 2.1.2 Summary: SQL relational database management system Name: firebird Version: 2.1.2.18118.0 Release: 6%{?dist} Group: Applications/Databases License: Interbase URL: http://www.firebirdsql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2 Source1: firebird-profile.sh Source2: firebird-profile.csh Source3: firebird-logrotate Patch0: firebird-mcpu-to-mtune.patch Patch1: firebird-2.1.2-doc.patch Patch2: firebird-fix-initscript.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: libicu-devel Requires: %{name}-arch = %{version} Requires: grep Requires: sed Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires(postun): /usr/sbin/userdel Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: %{name}-filesystem Requires: %{name}-libfbclient Requires: logrotate %description This package contains common files between firebird-classic and firebird-superserver. You will need this if you want to use either one. %package doc Summary: Documentation for Firebird SQL RDBMS Group: Applications/Databases %description doc This are the Firebird SQL Database shared doc and examples files. %package filesystem Summary: Filesystem for Firebird SQL RDBMS Group: Applications/Databases %description filesystem This is the Firebird SQL Database root file system. %package devel Summary: Development Libraries for Firebird SQL RDBMS Group: Applications/Databases Requires: %{name}-filesystem Requires: %{name}-libfbclient = %{version}-%{release} Requires: %{name}-libfbembed = %{version}-%{release} %description devel Development libraries for firebird. %package classic Summary: Classic (xinetd) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: xinetd Requires: %{name} = %{version} Conflicts: %{name}-superserver Requires: %{name}-libfbembed Requires: %{name}-libfbclient Requires: %{name}-filesystem %description classic This is the classic (xinetd) server Firebird SQL RDBMS. It can also be used as an embedded server, when paired with the client-embedded package. %package superserver Summary: Superserver (single process) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: %{name} = %{version} Conflicts: %{name}-classic Requires: %{name}-libfbclient Requires: %{name}-filesystem %description superserver This is the Superserver (single process) Firebird SQL RDBMS. %package libfbclient Summary: Multi-threaded, non-local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbclient Multi-threaded, non-local client libraries for Firebird SQL Database %package libfbembed Summary: Multi-process, local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbembed Multi-process, local client libraries for Firebird SQL RDBMS %prep %setup -q -n %{pkgname} # convert intl character to UTF-8 iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl # backport patch %patch2 %patch1 %patch0 %build # classic autoreconf -vfi %configure --prefix=%{fbroot} \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-classic chmod 644 ./buildroot-classic%{fbroot}/help/help.fdb cd .. # superserver %configure --prefix=%{fbroot} \ --enable-superserver \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-superserver chmod 644 ./buildroot-superserver%{fbroot}/help/help.fdb %install # we wanted to setup both Classic and Superserver, we need to do all here rm -Rf %{buildroot} install -d %{buildroot} cd %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/%{name} mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_var}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data mkdir -p %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_includedir}/%{name} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{fbroot} mkdir -p %{buildroot}%{fbroot}/help mkdir -p %{buildroot}%{fbroot}/intl mkdir -p %{buildroot}%{fbroot}/lib mkdir -p %{buildroot}%{fbroot}/include mkdir -p %{buildroot}%{fbroot}/bin-classic mkdir -p %{buildroot}%{fbroot}/UDF-classic mkdir -p %{buildroot}%{fbroot}/bin-superserver mkdir -p %{buildroot}%{fbroot}/UDF-superserver cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/examples/empbuild/employee.fdb %{buildroot}%{_localstatedir}/lib/%{name}/data/employee.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/help/help.fdb %{buildroot}%{fbroot}/help/help.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/*.msg %{buildroot}%{fbroot}/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl %{buildroot}%{fbroot}/intl/fbintl cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libib_util.so %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbclient.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbembed.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-superserver/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-superserver/ cd %{buildroot}%{fbroot}/bin-superserver/ ln -s ./fbmgr.bin ./fbmgr cd %{buildroot} cd %{buildroot}%{fbroot}/lib/ ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so cd %{buildroot} cd %{buildroot}%{_libdir} ln -s %{fbroot}/lib/libfbembed.so libfbembed.so ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.%{major} ln -s %{fbroot}/lib/libfbclient.so libfbclient.so ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.%{major} ln -s %{fbroot}/lib/libib_util.so libib_util.so cd %{buildroot} echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log ln -s %{_localstatedir}/log/%{name}/%{name}.log .%{fbroot}/%{name}.log sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE3} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/include/* %{buildroot}%{_includedir}/%{name}/ cd %{buildroot}%{fbroot}/include/ ln -s %{_includedir}/%{name}/ibase.h ibase.h ln -s %{_includedir}/%{name}/iberror.h iberror.h ln -s %{_includedir}/%{name}/ib_util.h ib_util.h ln -s %{_includedir}/%{name}/perf.h perf.h cd %{buildroot} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/aliases.conf .%{_sysconfdir}/%{name}/aliases.conf sed "s@%{fbroot}/examples/empbuild@%{_localstatedir}/lib/%{name}/data@" -i .%{_sysconfdir}/%{name}/aliases.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/firebird.conf .%{_sysconfdir}/%{name}/firebird.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl.conf .%{_sysconfdir}/%{name}/fbintl.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/security2.fdb .%{_sysconfdir}/%{name}/security2.fdb ln -s %{_sysconfdir}/%{name}/aliases.conf .%{fbroot}/aliases.conf ln -s %{_sysconfdir}/%{name}/firebird.conf .%{fbroot}/firebird.conf ln -s %{_sysconfdir}/%{name}/security2.fdb .%{fbroot}/security2.fdb ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/profile.d/firebird.sh sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/profile.d/firebird.csh cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake %{buildroot}%{_initrddir}/%{name} sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name} %clean rm -Rf %{buildroot} %post libfbclient -p /sbin/ldconfig %postun libfbclient -p /sbin/ldconfig %post libfbembed -p /sbin/ldconfig %postun libfbembed -p /sbin/ldconfig %post classic if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-classic,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-classic,} fi if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi %preun classic if [ $1 -eq 0 ]; then if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-classic" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-classic" ]; then rm -f %{fbroot}/UDF fi fi %post superserver if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-superserver,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-superserver,} fi if [ $1 -eq 2 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird restart fi fi if [ $1 -eq 1 ]; then chkconfig firebird off fi %preun superserver if [ $1 -eq 0 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird stop fi chkconfig --del firebird if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-superserver" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-superserver" ]; then rm -f %{fbroot}/UDF fi fi %pre # Create the firebird group if it doesn't exist getent group %{name} || /usr/sbin/groupadd -r %{name} getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/sh -r %{name} # Add gds_db to /etc/services if needed FileName=/etc/services newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" oldLine=`grep "^gds_db" $FileName` if [ -z "$oldLine" ]; then echo $newLine >> $FileName fi %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,root,root) %{_localstatedir}/lib/%{name} %dir %attr(0770,%{name},%{name}) %{_localstatedir}/lib/%{name}/data %attr(0660,%{name},%{name}) %{_localstatedir}/lib/%{name}/data/employee.fdb %dir %{_localstatedir}/log/%{name} %dir %{fbroot}/intl %dir %{_sysconfdir}/%{name} %config(noreplace) %attr (0660,%{name},%{name}) %{_sysconfdir}/%{name}/security2.fdb %{fbroot}/security2.fdb %config(noreplace) %{_sysconfdir}/%{name}/fbintl.conf %config(noreplace) %{_sysconfdir}/%{name}/aliases.conf %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf %{fbroot}/aliases.conf %{fbroot}/firebird.conf %{fbroot}/intl/fbintl.conf %{fbroot}/firebird.log %attr(0660,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %{fbroot}/*.msg %{fbroot}/help %{_libdir}/libib_util.so %{fbroot}/lib/libib_util.so %defattr(0644,root,root,0644) %config(noreplace) %{_sysconfdir}/profile.d/firebird.csh %config(noreplace) %{_sysconfdir}/profile.d/firebird.sh %defattr(0755,root,root,0750) %{fbroot}/intl/fbintl %files filesystem %defattr(0755,%{name},%{name},0755) %dir %{fbroot} %defattr(0755,root,root,0755) %dir %{fbroot}/lib %files doc %defattr(0644,root,root,0755) %doc gen/buildroot-classic%{fbroot}/doc %doc gen/buildroot-classic%{fbroot}/examples %doc gen/buildroot-classic%{fbroot}/README %doc gen/buildroot-classic%{fbroot}/misc/intl.sql %doc gen/buildroot-classic%{fbroot}/misc/upgrade %files devel %defattr(0644,root,root,0755) %dir %{fbroot}/include %{fbroot}/include/* %{fbroot}/lib/*.so %{_includedir}/* %{_libdir}/*.so %files libfbclient %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbclient.so.* %{fbroot}/lib/libfbclient.so.* %files libfbembed %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbembed.so.* %{fbroot}/lib/libfbembed.so.* %files classic %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} %dir %{fbroot}/bin-classic %dir %{fbroot}/UDF-classic %defattr(0755,root,root,0755) %{fbroot}/bin-classic/* %{fbroot}/UDF-classic/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-classic/*.sql %files superserver %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name} %dir %{fbroot}/bin-superserver %dir %{fbroot}/UDF-superserver %defattr(0755,root,root,0755) %{_initrddir}/%{name} %{fbroot}/bin-superserver/* %{fbroot}/UDF-superserver/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-superserver/*.sql %changelog * Sat May 02 2009 Philippe Makowski 2.1.2.18118.0-6 - add filesystem-subpackage - remove common subpackage and use the main instead - add logrotate config * Thu Apr 30 2009 Philippe Makowski 2.1.2.18118.0-5 - fix directories owning * Thu Apr 23 2009 Philippe Makowski 2.1.2.18118.0-4 - major cleaning install process to take care of the two architectures (Classic and Superserver) the right way * Wed Apr 22 2009 Philippe Makowski 2.1.2.18118.0-3 - fix group creation * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-2 - fix autogen issue for f11 - patch init script - fix ppc64 lib destination issue * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-1 - backport doc patch - update to 2.1.2.18118 - cleanup macros - specifie libdir - change firebird user login * Sat Mar 28 2009 Philippe Makowski 2.1.1.17910.0-5 - Major packaging restructuring * Mon Mar 21 2009 Philippe Makowski 2.1.1.17190.0-4 - Create a doc package - major cleaning to avoid rpmlint errors - revert to 2.1.1 (last stable build published) * Mon Mar 09 2009 Jonathan MERCIER 2.1.2.18116.0-3 - Perform %%configure with option --with-system-icu - Add libicu-devel in BuildRequires - Use iconv for convert files to UTF-8 * Fri Mar 05 2009 Jonathan MERCIER 2.1.2.18116.0-2 - Update to 2.1.2 - Use %%global instead of %%define - Change ${SOURCE1} to %%{SOURCE1} - Change Group Database to Applications/Databases - Change License IPL to Interbase - Perform %%configure section's with some module - Cconvert cyrillic character to UTF-8 * Thu Jul 17 2008 Arkady L. Shane 2.1.1.17910.0-1 - Update to 2.1.1 * Fri Apr 18 2008 Arkady L. Shane 2.1.0.17798.0-1 - Update to 2.1.0 * Thu Sep 27 2007 Arkady L. Shane 2.0.3.12981.1-1 - Update to 2.0.3 * Thu Sep 13 2007 Arkady L. Shane 2.0.1.12855.0-1 - Initial build for Fedora - cleanup Mandriva spec --- NEW FILE import.log --- firebird-2_1_2_18118_0-6_fc10:EL-4:firebird-2.1.2.18118.0-6.fc10.src.rpm:1241428598 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firebird/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:56:33 -0000 1.1 +++ .cvsignore 4 May 2009 09:17:22 -0000 1.2 @@ -0,0 +1 @@ +Firebird-2.1.2.18118-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firebird/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:56:33 -0000 1.1 +++ sources 4 May 2009 09:17:22 -0000 1.2 @@ -0,0 +1 @@ +063b3825a06d328f726b733fd74614b1 Firebird-2.1.2.18118-0.tar.bz2 From makowski at fedoraproject.org Mon May 4 09:23:00 2009 From: makowski at fedoraproject.org (Philippe Makowski) Date: Mon, 4 May 2009 09:23:00 +0000 (UTC) Subject: rpms/firebird/EL-5 firebird-2.1.2-doc.patch, NONE, 1.1 firebird-fix-initscript.patch, NONE, 1.1 firebird-logrotate, NONE, 1.1 firebird-mcpu-to-mtune.patch, NONE, 1.1 firebird-profile.csh, NONE, 1.1 firebird-profile.sh, NONE, 1.1 firebird.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504092300.CC5EB700DB@cvs1.fedora.phx.redhat.com> Author: makowski Update of /cvs/pkgs/rpms/firebird/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14974/EL-5 Modified Files: .cvsignore sources Added Files: firebird-2.1.2-doc.patch firebird-fix-initscript.patch firebird-logrotate firebird-mcpu-to-mtune.patch firebird-profile.csh firebird-profile.sh firebird.spec import.log Log Message: Initial import firebird-2.1.2-doc.patch: --- NEW FILE firebird-2.1.2-doc.patch --- --- doc/sql.extensions/README.global_temporary_tables.orig 2007-03-15 10:35:57.000000000 +0100 +++ doc/sql.extensions/README.global_temporary_tables 2009-04-13 15:56:47.000000000 +0200 @@ -67,11 +67,11 @@ garbage collection of deleted record versions. DELETE triggers are not fired in this case. - Data and index pages of all of the GTT?s instances are placed in separate temporary -file?s. Each connection has its own temporary file created when this connection -first referenced some GTT. Also these temporary files are always opened with ?Forced -Writes = OFF? setting despite of database setting. + Data and index pages of all of the GTTs instances are placed in separate temporary +files. Each connection has its own temporary file created when this connection +first referenced some GTT. Also these temporary files are always opened with "Forced +Writes = OFF" setting despite of database setting. There's no limit on number of GTT instances. If you have N transactions -active simultaneously and each transaction has referenced some GTT then you?ll -have N GTT?s instances. +active simultaneously and each transaction has referenced some GTT then you'll +have N GTTs instances. --- doc/sql.extensions/README.expression_indices.orig 2005-01-28 15:07:11.000000000 +0100 +++ doc/sql.extensions/README.expression_indices 2009-04-13 15:56:36.000000000 +0200 @@ -19,7 +19,7 @@ Example(s): 1. CREATE INDEX IDX1 ON T1 COMPUTED BY ( UPPER(COL1 COLLATE PXW_CYRL) ); - SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '????' + SELECT * FROM T1 WHERE UPPER(COL1 COLLATE PXW_CYRL) = '' -- PLAN (T1 INDEX (IDX1)) 2. CREATE INDEX IDX2 ON T2 COMPUTED BY ( EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) ); SELECT * FROM T2 ORDER BY EXTRACT(YEAR FROM COL2) || EXTRACT(MONTH FROM COL2) --- doc/sql.extensions/README.common_table_expressions.orig 2007-03-15 10:34:22.000000000 +0100 +++ doc/sql.extensions/README.common_table_expressions 2009-04-13 15:55:55.000000000 +0200 @@ -6,7 +6,7 @@ Function: - Common Table Expressions is like view?s, locally defined within main query. + Common Table Expressions is like views, locally defined within main query. From the engine point of view CTE is a derived table so no intermediate materialization is performed. @@ -45,11 +45,11 @@ Or, in less formal format : WITH [RECURSIVE] - CTE_A [(a1, a2, ?)] - AS ( SELECT ? ), + CTE_A [(a1, a2, ...)] + AS ( SELECT ...), - CTE_B [(b1, b2, ?)] - AS ( SELECT ? ), + CTE_B [(b1, b2, ...)] + AS ( SELECT ... ), ... SELECT ... FROM CTE_A, CTE_B, TAB1, TAB2 ... @@ -60,7 +60,7 @@ Rules of non-recursive common table expressions : Several table expressions can be defined at one query - Any SELECT?s clause can be used in table expressions + Any SELECTs clause can be used in table expressions Table expressions can reference each other Table expressions can be used within any part of main query or another table expression @@ -104,7 +104,7 @@ Non-recursive members are placed first in UNION Recursive members are separated from anchor members and from each other with UNION ALL clause - References between CTE?s should not have loops + References between CTEs should not have loops Aggregates (DISTINCT, GROUP BY, HAVING) and aggregate functions (SUM, COUNT, MAX etc) are not allowed in recursive members Recursive member can have only one reference to itself and only in FROM clause firebird-fix-initscript.patch: --- NEW FILE firebird-fix-initscript.patch --- --- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2008-01-22 12:39:13.000000000 +0100 +++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in.pm 2009-05-03 12:10:31.000000000 +0200 @@ -19,6 +19,7 @@ # Optionally run chkconfig to autostart the new service INSTANCE=default FIREBIRD=@prefix@ +name=firebird # No changes needed below for multiple instances FBRunUser=firebird @@ -39,18 +40,22 @@ echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser RETVAL=$? [ $RETVAL -eq 0 ] && success || failure + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name echo ;; stop) - echo -n "Stopping $FULLNAME " - if [ -f $pidfile ] then - kill `cat $pidfile` + echo -n "Stopping $FULLNAME: " + killproc -p $pidfile $name + RETVAL=$? + echo + else + echo -n "$FULLNAME server is stopped" + echo fi RETVAL=$? - [ $RETVAL -eq 0 ] && success || failure - echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name ;; status) if [ -f $pidfile ] @@ -70,7 +75,7 @@ RETVAL=$? ;; *) - echo "Usage: firebird {start|stop|status|restart|reload}" + echo "Usage: $name {start|stop|status|restart|reload}" exit 1 esac --- NEW FILE firebird-logrotate --- firebird.log { weekly missingok rotate 52 compress delaycompress notifempty create 640 firebird adm } firebird-mcpu-to-mtune.patch: --- NEW FILE firebird-mcpu-to-mtune.patch --- --- builds/posix/prefix.linux 2007-05-03 07:24:50.000000000 -0400 +++ builds/posix/prefix.linux.oden 2008-07-18 08:45:48.000000000 -0400 @@ -22,7 +22,7 @@ # you may remove it if engine is getting compiled with any other GCC version COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin +OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -fno-builtin WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) --- NEW FILE firebird-profile.csh --- setenv PATH "${PATH}:%{fbroot}/bin" --- NEW FILE firebird-profile.sh --- export PATH=$PATH:%{fbroot}/bin --- NEW FILE firebird.spec --- %global pkgname Firebird-2.1.2.18118-0 %global fbroot %{_libdir}/%{name} %global major 2.1.2 Summary: SQL relational database management system Name: firebird Version: 2.1.2.18118.0 Release: 6%{?dist} Group: Applications/Databases License: Interbase URL: http://www.firebirdsql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2 Source1: firebird-profile.sh Source2: firebird-profile.csh Source3: firebird-logrotate Patch0: firebird-mcpu-to-mtune.patch Patch1: firebird-2.1.2-doc.patch Patch2: firebird-fix-initscript.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: libicu-devel Requires: %{name}-arch = %{version} Requires: grep Requires: sed Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires(postun): /usr/sbin/userdel Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: %{name}-filesystem Requires: %{name}-libfbclient Requires: logrotate %description This package contains common files between firebird-classic and firebird-superserver. You will need this if you want to use either one. %package doc Summary: Documentation for Firebird SQL RDBMS Group: Applications/Databases %description doc This are the Firebird SQL Database shared doc and examples files. %package filesystem Summary: Filesystem for Firebird SQL RDBMS Group: Applications/Databases %description filesystem This is the Firebird SQL Database root file system. %package devel Summary: Development Libraries for Firebird SQL RDBMS Group: Applications/Databases Requires: %{name}-filesystem Requires: %{name}-libfbclient = %{version}-%{release} Requires: %{name}-libfbembed = %{version}-%{release} %description devel Development libraries for firebird. %package classic Summary: Classic (xinetd) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: xinetd Requires: %{name} = %{version} Conflicts: %{name}-superserver Requires: %{name}-libfbembed Requires: %{name}-libfbclient Requires: %{name}-filesystem %description classic This is the classic (xinetd) server Firebird SQL RDBMS. It can also be used as an embedded server, when paired with the client-embedded package. %package superserver Summary: Superserver (single process) server for Firebird SQL RDBMS Group: Applications/Databases Provides: %{name}-arch = %{version} Requires: %{name} = %{version} Conflicts: %{name}-classic Requires: %{name}-libfbclient Requires: %{name}-filesystem %description superserver This is the Superserver (single process) Firebird SQL RDBMS. %package libfbclient Summary: Multi-threaded, non-local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbclient Multi-threaded, non-local client libraries for Firebird SQL Database %package libfbembed Summary: Multi-process, local client libraries for Firebird SQL RDBMS Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: %{name}-filesystem %description libfbembed Multi-process, local client libraries for Firebird SQL RDBMS %prep %setup -q -n %{pkgname} # convert intl character to UTF-8 iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl # backport patch %patch2 %patch1 %patch0 %build # classic autoreconf -vfi %configure --prefix=%{fbroot} \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-classic chmod 644 ./buildroot-classic%{fbroot}/help/help.fdb cd .. # superserver %configure --prefix=%{fbroot} \ --enable-superserver \ --with-system-icu # Can't use make %{?_smp_mflags} as parallel build is broken make cd gen ./install/makeInstallImage.sh # here we patch a bug in the configure script %ifarch ppc64 mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir} %endif mv ./buildroot/ buildroot-superserver chmod 644 ./buildroot-superserver%{fbroot}/help/help.fdb %install # we wanted to setup both Classic and Superserver, we need to do all here rm -Rf %{buildroot} install -d %{buildroot} cd %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/%{name} mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_var}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data mkdir -p %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_includedir}/%{name} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{fbroot} mkdir -p %{buildroot}%{fbroot}/help mkdir -p %{buildroot}%{fbroot}/intl mkdir -p %{buildroot}%{fbroot}/lib mkdir -p %{buildroot}%{fbroot}/include mkdir -p %{buildroot}%{fbroot}/bin-classic mkdir -p %{buildroot}%{fbroot}/UDF-classic mkdir -p %{buildroot}%{fbroot}/bin-superserver mkdir -p %{buildroot}%{fbroot}/UDF-superserver cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/examples/empbuild/employee.fdb %{buildroot}%{_localstatedir}/lib/%{name}/data/employee.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/help/help.fdb %{buildroot}%{fbroot}/help/help.fdb cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/*.msg %{buildroot}%{fbroot}/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl %{buildroot}%{fbroot}/intl/fbintl cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libib_util.so %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbclient.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/lib/libfbembed.so.%{major} %{buildroot}%{fbroot}/lib/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-classic/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/bin/* %{buildroot}%{fbroot}/bin-superserver/ cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-superserver/ cd %{buildroot}%{fbroot}/bin-superserver/ ln -s ./fbmgr.bin ./fbmgr cd %{buildroot} cd %{buildroot}%{fbroot}/lib/ ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so cd %{buildroot} cd %{buildroot}%{_libdir} ln -s %{fbroot}/lib/libfbembed.so libfbembed.so ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so.2.1 ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.%{major} ln -s %{fbroot}/lib/libfbclient.so libfbclient.so ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so.2 ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.%{major} ln -s %{fbroot}/lib/libib_util.so libib_util.so cd %{buildroot} echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log ln -s %{_localstatedir}/log/%{name}/%{name}.log .%{fbroot}/%{name}.log sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE3} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/include/* %{buildroot}%{_includedir}/%{name}/ cd %{buildroot}%{fbroot}/include/ ln -s %{_includedir}/%{name}/ibase.h ibase.h ln -s %{_includedir}/%{name}/iberror.h iberror.h ln -s %{_includedir}/%{name}/ib_util.h ib_util.h ln -s %{_includedir}/%{name}/perf.h perf.h cd %{buildroot} cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/aliases.conf .%{_sysconfdir}/%{name}/aliases.conf sed "s@%{fbroot}/examples/empbuild@%{_localstatedir}/lib/%{name}/data@" -i .%{_sysconfdir}/%{name}/aliases.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/firebird.conf .%{_sysconfdir}/%{name}/firebird.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl.conf .%{_sysconfdir}/%{name}/fbintl.conf cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/security2.fdb .%{_sysconfdir}/%{name}/security2.fdb ln -s %{_sysconfdir}/%{name}/aliases.conf .%{fbroot}/aliases.conf ln -s %{_sysconfdir}/%{name}/firebird.conf .%{fbroot}/firebird.conf ln -s %{_sysconfdir}/%{name}/security2.fdb .%{fbroot}/security2.fdb ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/profile.d/firebird.sh sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/profile.d/firebird.csh cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/%{name} cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake %{buildroot}%{_initrddir}/%{name} sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name} %clean rm -Rf %{buildroot} %post libfbclient -p /sbin/ldconfig %postun libfbclient -p /sbin/ldconfig %post libfbembed -p /sbin/ldconfig %postun libfbembed -p /sbin/ldconfig %post classic if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-classic,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-classic,} fi if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi %preun classic if [ $1 -eq 0 ]; then if /sbin/service xinetd status >& /dev/null; then /sbin/service xinetd reload fi if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-classic" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-classic" ]; then rm -f %{fbroot}/UDF fi fi %post superserver if test ! -e %{fbroot}/bin; then ln -s %{fbroot}/bin{-superserver,} fi if test ! -e %{fbroot}/UDF; then ln -s %{fbroot}/UDF{-superserver,} fi if [ $1 -eq 2 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird restart fi fi if [ $1 -eq 1 ]; then chkconfig firebird off fi %preun superserver if [ $1 -eq 0 ]; then if /sbin/service firebird status >& /dev/null; then /sbin/service firebird stop fi chkconfig --del firebird if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-superserver" ]; then rm -f %{fbroot}/bin fi if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" = "%{fbroot}/UDF-superserver" ]; then rm -f %{fbroot}/UDF fi fi %pre # Create the firebird group if it doesn't exist getent group %{name} || /usr/sbin/groupadd -r %{name} getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/sh -r %{name} # Add gds_db to /etc/services if needed FileName=/etc/services newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" oldLine=`grep "^gds_db" $FileName` if [ -z "$oldLine" ]; then echo $newLine >> $FileName fi %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,root,root) %{_localstatedir}/lib/%{name} %dir %attr(0770,%{name},%{name}) %{_localstatedir}/lib/%{name}/data %attr(0660,%{name},%{name}) %{_localstatedir}/lib/%{name}/data/employee.fdb %dir %{_localstatedir}/log/%{name} %dir %{fbroot}/intl %dir %{_sysconfdir}/%{name} %config(noreplace) %attr (0660,%{name},%{name}) %{_sysconfdir}/%{name}/security2.fdb %{fbroot}/security2.fdb %config(noreplace) %{_sysconfdir}/%{name}/fbintl.conf %config(noreplace) %{_sysconfdir}/%{name}/aliases.conf %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf %{fbroot}/aliases.conf %{fbroot}/firebird.conf %{fbroot}/intl/fbintl.conf %{fbroot}/firebird.log %attr(0660,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %{fbroot}/*.msg %{fbroot}/help %{_libdir}/libib_util.so %{fbroot}/lib/libib_util.so %defattr(0644,root,root,0644) %config(noreplace) %{_sysconfdir}/profile.d/firebird.csh %config(noreplace) %{_sysconfdir}/profile.d/firebird.sh %defattr(0755,root,root,0750) %{fbroot}/intl/fbintl %files filesystem %defattr(0755,%{name},%{name},0755) %dir %{fbroot} %defattr(0755,root,root,0755) %dir %{fbroot}/lib %files doc %defattr(0644,root,root,0755) %doc gen/buildroot-classic%{fbroot}/doc %doc gen/buildroot-classic%{fbroot}/examples %doc gen/buildroot-classic%{fbroot}/README %doc gen/buildroot-classic%{fbroot}/misc/intl.sql %doc gen/buildroot-classic%{fbroot}/misc/upgrade %files devel %defattr(0644,root,root,0755) %dir %{fbroot}/include %{fbroot}/include/* %{fbroot}/lib/*.so %{_includedir}/* %{_libdir}/*.so %files libfbclient %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbclient.so.* %{fbroot}/lib/libfbclient.so.* %files libfbembed %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %{_libdir}/libfbembed.so.* %{fbroot}/lib/libfbembed.so.* %files classic %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} %dir %{fbroot}/bin-classic %dir %{fbroot}/UDF-classic %defattr(0755,root,root,0755) %{fbroot}/bin-classic/* %{fbroot}/UDF-classic/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-classic/*.sql %files superserver %defattr(0644,root,root,0755) %doc doc/license/IDPL.txt %doc doc/license/README.license.usage.txt %defattr(0644,root,root,0755) %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name} %dir %{fbroot}/bin-superserver %dir %{fbroot}/UDF-superserver %defattr(0755,root,root,0755) %{_initrddir}/%{name} %{fbroot}/bin-superserver/* %{fbroot}/UDF-superserver/*.so %defattr(0644,root,root,0755) %{fbroot}/UDF-superserver/*.sql %changelog * Sat May 02 2009 Philippe Makowski 2.1.2.18118.0-6 - add filesystem-subpackage - remove common subpackage and use the main instead - add logrotate config * Thu Apr 30 2009 Philippe Makowski 2.1.2.18118.0-5 - fix directories owning * Thu Apr 23 2009 Philippe Makowski 2.1.2.18118.0-4 - major cleaning install process to take care of the two architectures (Classic and Superserver) the right way * Wed Apr 22 2009 Philippe Makowski 2.1.2.18118.0-3 - fix group creation * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-2 - fix autogen issue for f11 - patch init script - fix ppc64 lib destination issue * Sun Apr 19 2009 Philippe Makowski 2.1.2.18118.0-1 - backport doc patch - update to 2.1.2.18118 - cleanup macros - specifie libdir - change firebird user login * Sat Mar 28 2009 Philippe Makowski 2.1.1.17910.0-5 - Major packaging restructuring * Mon Mar 21 2009 Philippe Makowski 2.1.1.17190.0-4 - Create a doc package - major cleaning to avoid rpmlint errors - revert to 2.1.1 (last stable build published) * Mon Mar 09 2009 Jonathan MERCIER 2.1.2.18116.0-3 - Perform %%configure with option --with-system-icu - Add libicu-devel in BuildRequires - Use iconv for convert files to UTF-8 * Fri Mar 05 2009 Jonathan MERCIER 2.1.2.18116.0-2 - Update to 2.1.2 - Use %%global instead of %%define - Change ${SOURCE1} to %%{SOURCE1} - Change Group Database to Applications/Databases - Change License IPL to Interbase - Perform %%configure section's with some module - Cconvert cyrillic character to UTF-8 * Thu Jul 17 2008 Arkady L. Shane 2.1.1.17910.0-1 - Update to 2.1.1 * Fri Apr 18 2008 Arkady L. Shane 2.1.0.17798.0-1 - Update to 2.1.0 * Thu Sep 27 2007 Arkady L. Shane 2.0.3.12981.1-1 - Update to 2.0.3 * Thu Sep 13 2007 Arkady L. Shane 2.0.1.12855.0-1 - Initial build for Fedora - cleanup Mandriva spec --- NEW FILE import.log --- firebird-2_1_2_18118_0-6_fc10:EL-5:firebird-2.1.2.18118.0-6.fc10.src.rpm:1241428906 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firebird/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:56:33 -0000 1.1 +++ .cvsignore 4 May 2009 09:22:30 -0000 1.2 @@ -0,0 +1 @@ +Firebird-2.1.2.18118-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firebird/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:56:33 -0000 1.1 +++ sources 4 May 2009 09:22:30 -0000 1.2 @@ -0,0 +1 @@ +063b3825a06d328f726b733fd74614b1 Firebird-2.1.2.18118-0.tar.bz2 From tbzatek at fedoraproject.org Mon May 4 09:48:12 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 4 May 2009 09:48:12 +0000 (UTC) Subject: rpms/seahorse/devel .cvsignore, 1.28, 1.29 seahorse.spec, 1.70, 1.71 sources, 1.30, 1.31 Message-ID: <20090504094812.BA8DB700DB@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/seahorse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19022 Modified Files: .cvsignore seahorse.spec sources Log Message: * Mon May 4 2009 Tomas Bzatek 2.27.1-1 - Update to 2.27.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- .cvsignore 13 Apr 2009 03:48:03 -0000 1.28 +++ .cvsignore 4 May 2009 09:47:42 -0000 1.29 @@ -1 +1 @@ -seahorse-2.26.1.tar.bz2 +seahorse-2.27.1.tar.bz2 Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- seahorse.spec 13 Apr 2009 03:48:03 -0000 1.70 +++ seahorse.spec 4 May 2009 09:47:42 -0000 1.71 @@ -1,5 +1,5 @@ Name: seahorse -Version: 2.26.1 +Version: 2.27.1 Release: 1%{?dist} Summary: A GNOME application for managing encryption keys Group: User Interface/Desktops @@ -23,7 +23,7 @@ BuildRequires: gnome-panel-devel BuildRequires: libnotify-devel BuildRequires: openssh-clients BuildRequires: gnome-doc-utils >= 0.3.2 -BuildRequires: gnome-keyring-devel +BuildRequires: gnome-keyring-devel >= 2.25.5 BuildRequires: avahi-devel BuildRequires: avahi-glib-devel BuildRequires: intltool @@ -155,6 +155,9 @@ fi %{_datadir}/gtk-doc/html/libcryptui %changelog +* Mon May 4 2009 Tomas Bzatek 2.27.1-1 +- Update to 2.27.1 + * Sun Apr 12 2009 Matthias Clasen 2.26.1-1 - Update to 2.26.1 - See http://download.gnome.org/sources/seahorse/2.26/seahorse-2.26.1.news Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- sources 13 Apr 2009 03:48:03 -0000 1.30 +++ sources 4 May 2009 09:47:42 -0000 1.31 @@ -1 +1 @@ -f7b6d7755473db01ed1b802b9f3c91d2 seahorse-2.26.1.tar.bz2 +cf2f94eb7f7aa85f3b0400ea8020f4b6 seahorse-2.27.1.tar.bz2 From mmaslano at fedoraproject.org Mon May 4 10:04:11 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 10:04:11 +0000 (UTC) Subject: rpms/cronie/F-10 Inotify-initialization-left-open-file-descriptors-wh.patch, NONE, 1.1 cronie.spec, 1.17, 1.18 Message-ID: <20090504100411.3E303700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/cronie/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21886 Modified Files: cronie.spec Added Files: Inotify-initialization-left-open-file-descriptors-wh.patch Log Message: * Mon May 4 2009 Marcela Ma??l????ov?? - 1.2-8 - 498419 fix leaking file descriptor which makes SElinux unhappy Inotify-initialization-left-open-file-descriptors-wh.patch: --- NEW FILE Inotify-initialization-left-open-file-descriptors-wh.patch --- >From 0c43f4b4b8e39f32e3c6eeaed944f5cd3ee0508f Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 23 Apr 2009 11:24:33 +0200 Subject: [PATCH] Inotify initialization left open file descriptors which are leaking and annoying SElinux. This could be once fixed by inotify_init1, but that's supported from kernel 2.6.27. --- src/cron.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/cron.c b/src/cron.c index 28aebce..5b0ce2d 100644 --- a/src/cron.c +++ b/src/cron.c @@ -241,6 +241,7 @@ main(int argc, char *argv[]) { } database.ifd = fd = inotify_init(); + fcntl(fd, F_SETFD, FD_CLOEXEC); if (fd < 0) log_it("CRON", pid, "INFO", "Inotify init failed", errno); set_cron_watched(fd); -- 1.6.2.2 Index: cronie.spec =================================================================== RCS file: /cvs/pkgs/rpms/cronie/F-10/cronie.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- cronie.spec 23 Dec 2008 09:02:22 -0000 1.17 +++ cronie.spec 4 May 2009 10:03:40 -0000 1.18 @@ -6,7 +6,7 @@ Summary: Cron daemon for executing programs at set times Name: cronie Version: 1.2 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT and BSD Group: System Environment/Base URL: https://fedorahosted.org/cronie @@ -16,6 +16,7 @@ Patch0: init.patch Patch1: nofollow.patch Patch2: cronie-1.2-reload.patch Patch3: 0001-Update-manual-for-symlink.patch +Patch4: Inotify-initialization-left-open-file-descriptors-wh.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: syslog, bash >= 2.0 @@ -54,6 +55,7 @@ SELinux. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build @@ -133,6 +135,9 @@ cp -a /var/lock/subsys/crond /var/lock/s %config(noreplace) %{_sysconfdir}/cron.deny %changelog +* Mon May 4 2009 Marcela Ma??l????ov?? - 1.2-8 +- 498419 fix leaking file descriptor which makes SElinux unhappy + * Tue Dec 23 2008 Marcela Ma??l????ov?? - 1.2-7 - fix errors in man From robert at fedoraproject.org Mon May 4 10:17:01 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Mon, 4 May 2009 10:17:01 +0000 (UTC) Subject: rpms/ucview/F-9 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ucview.spec, 1.6, 1.7 Message-ID: <20090504101701.46FD6700DB@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24660/F-9 Modified Files: .cvsignore sources ucview.spec Log Message: Upgrade to 0.23 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Oct 2008 21:44:34 -0000 1.5 +++ .cvsignore 4 May 2009 10:16:30 -0000 1.6 @@ -1 +1 @@ -ucview-0.22.tar.gz +ucview-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Oct 2008 21:44:34 -0000 1.5 +++ sources 4 May 2009 10:16:30 -0000 1.6 @@ -1 +1 @@ -1b43c823624962bde3248ae493995750 ucview-0.22.tar.gz +570a5d155b22529267a5a63eb95554ee ucview-0.23.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-9/ucview.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- ucview.spec 19 Oct 2008 14:25:18 -0000 1.6 +++ ucview.spec 4 May 2009 10:16:30 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.22 -Release: 2%{?dist} +Version: 0.23 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -10,7 +10,7 @@ Source1: %{name}.desktop BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel BuildRequires: glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils -BuildRequires: libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73 +BuildRequires: libtheora-devel, libvorbis-devel Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -91,11 +91,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/dbus-1/services/*.service %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* %changelog +* Mon May 04 2009 Robert Scheck 0.23-1 +- Upgrade to 0.23 + +* Mon Feb 23 2009 Robert Scheck 0.22-3 +- Rebuild against gcc 4.4 and rpm 4.6 + * Sun Oct 19 2008 Robert Scheck 0.22-2 - Rebuild against unicap 0.93 From robert at fedoraproject.org Mon May 4 10:17:00 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Mon, 4 May 2009 10:17:00 +0000 (UTC) Subject: rpms/ucview/EL-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ucview.spec, 1.7, 1.8 Message-ID: <20090504101700.31493700DB@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24660/EL-5 Modified Files: .cvsignore sources ucview.spec Log Message: Upgrade to 0.23 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Oct 2008 21:44:34 -0000 1.5 +++ .cvsignore 4 May 2009 10:16:29 -0000 1.6 @@ -1 +1 @@ -ucview-0.22.tar.gz +ucview-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Oct 2008 21:44:34 -0000 1.5 +++ sources 4 May 2009 10:16:29 -0000 1.6 @@ -1 +1 @@ -1b43c823624962bde3248ae493995750 ucview-0.22.tar.gz +570a5d155b22529267a5a63eb95554ee ucview-0.23.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/EL-5/ucview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ucview.spec 19 Oct 2008 14:25:17 -0000 1.7 +++ ucview.spec 4 May 2009 10:16:29 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.22 -Release: 2%{?dist} +Version: 0.23 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -11,9 +11,6 @@ BuildRequires: intltool, /usr/bin/per BuildRequires: unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel BuildRequires: glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils BuildRequires: libtheora-devel, libvorbis-devel -%if 0%{?rhel} > 5 -BuildRequires: dbus-glib-devel >= 0.73 -%endif Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -94,13 +91,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop -%if 0%{?rhel} > 5 -%{_datadir}/dbus-1/services/*.service -%endif %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* %changelog +* Mon May 04 2009 Robert Scheck 0.23-1 +- Upgrade to 0.23 + +* Mon Feb 23 2009 Robert Scheck 0.22-3 +- Rebuild against gcc 4.4 and rpm 4.6 + * Sun Oct 19 2008 Robert Scheck 0.22-2 - Rebuild against unicap 0.93 From robert at fedoraproject.org Mon May 4 10:17:00 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Mon, 4 May 2009 10:17:00 +0000 (UTC) Subject: rpms/ucview/F-10 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ucview.spec, 1.6, 1.7 Message-ID: <20090504101700.651BA700DB@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24660/F-10 Modified Files: .cvsignore sources ucview.spec Log Message: Upgrade to 0.23 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Oct 2008 21:44:34 -0000 1.5 +++ .cvsignore 4 May 2009 10:16:30 -0000 1.6 @@ -1 +1 @@ -ucview-0.22.tar.gz +ucview-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Oct 2008 21:44:34 -0000 1.5 +++ sources 4 May 2009 10:16:30 -0000 1.6 @@ -1 +1 @@ -1b43c823624962bde3248ae493995750 ucview-0.22.tar.gz +570a5d155b22529267a5a63eb95554ee ucview-0.23.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-10/ucview.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- ucview.spec 19 Oct 2008 14:25:18 -0000 1.6 +++ ucview.spec 4 May 2009 10:16:30 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.22 -Release: 2%{?dist} +Version: 0.23 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -10,7 +10,7 @@ Source1: %{name}.desktop BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel BuildRequires: glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils -BuildRequires: libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73 +BuildRequires: libtheora-devel, libvorbis-devel Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -91,11 +91,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/dbus-1/services/*.service %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* %changelog +* Mon May 04 2009 Robert Scheck 0.23-1 +- Upgrade to 0.23 + +* Mon Feb 23 2009 Robert Scheck 0.22-3 +- Rebuild against gcc 4.4 and rpm 4.6 + * Sun Oct 19 2008 Robert Scheck 0.22-2 - Rebuild against unicap 0.93 From robert at fedoraproject.org Mon May 4 10:17:00 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Mon, 4 May 2009 10:17:00 +0000 (UTC) Subject: rpms/ucview/F-11 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ucview.spec, 1.7, 1.8 Message-ID: <20090504101700.C8701700DB@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24660/F-11 Modified Files: .cvsignore sources ucview.spec Log Message: Upgrade to 0.23 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Oct 2008 21:44:34 -0000 1.5 +++ .cvsignore 4 May 2009 10:16:30 -0000 1.6 @@ -1 +1 @@ -ucview-0.22.tar.gz +ucview-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Oct 2008 21:44:34 -0000 1.5 +++ sources 4 May 2009 10:16:30 -0000 1.6 @@ -1 +1 @@ -1b43c823624962bde3248ae493995750 ucview-0.22.tar.gz +570a5d155b22529267a5a63eb95554ee ucview-0.23.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-11/ucview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ucview.spec 23 Feb 2009 21:16:43 -0000 1.7 +++ ucview.spec 4 May 2009 10:16:30 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.22 -Release: 3%{?dist} +Version: 0.23 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -10,7 +10,7 @@ Source1: %{name}.desktop BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel BuildRequires: glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils -BuildRequires: libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73 +BuildRequires: libtheora-devel, libvorbis-devel Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -91,11 +91,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/dbus-1/services/*.service %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* %changelog +* Mon May 04 2009 Robert Scheck 0.23-1 +- Upgrade to 0.23 + * Mon Feb 23 2009 Robert Scheck 0.22-3 - Rebuild against gcc 4.4 and rpm 4.6 From robert at fedoraproject.org Mon May 4 10:17:01 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Mon, 4 May 2009 10:17:01 +0000 (UTC) Subject: rpms/ucview/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ucview.spec, 1.7, 1.8 Message-ID: <20090504101701.9F8D3700DB@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24660/devel Modified Files: .cvsignore sources ucview.spec Log Message: Upgrade to 0.23 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Oct 2008 21:44:34 -0000 1.5 +++ .cvsignore 4 May 2009 10:16:31 -0000 1.6 @@ -1 +1 @@ -ucview-0.22.tar.gz +ucview-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Oct 2008 21:44:34 -0000 1.5 +++ sources 4 May 2009 10:16:31 -0000 1.6 @@ -1 +1 @@ -1b43c823624962bde3248ae493995750 ucview-0.22.tar.gz +570a5d155b22529267a5a63eb95554ee ucview-0.23.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/devel/ucview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ucview.spec 23 Feb 2009 21:16:43 -0000 1.7 +++ ucview.spec 4 May 2009 10:16:31 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.22 -Release: 3%{?dist} +Version: 0.23 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -10,7 +10,7 @@ Source1: %{name}.desktop BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel BuildRequires: glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils -BuildRequires: libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73 +BuildRequires: libtheora-devel, libvorbis-devel Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -91,11 +91,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/dbus-1/services/*.service %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* %changelog +* Mon May 04 2009 Robert Scheck 0.23-1 +- Upgrade to 0.23 + * Mon Feb 23 2009 Robert Scheck 0.22-3 - Rebuild against gcc 4.4 and rpm 4.6 From than at fedoraproject.org Mon May 4 10:21:48 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 4 May 2009 10:21:48 +0000 (UTC) Subject: rpms/kde-l10n/F-11 .cvsignore, 1.22, 1.23 kde-l10n.spec, 1.78, 1.79 sources, 1.25, 1.26 Message-ID: <20090504102148.51A84700DB@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kde-l10n/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26657 Modified Files: .cvsignore kde-l10n.spec sources Log Message: 4.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-11/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- .cvsignore 2 Apr 2009 11:23:22 -0000 1.22 +++ .cvsignore 4 May 2009 10:21:17 -0000 1.23 @@ -54,3 +54,58 @@ kde-l10n-wa-4.2.2.tar.bz2 kde-l10n-zh_CN-4.2.2.tar.bz2 kde-l10n-zh_TW-4.2.2.tar.bz2 kde-l10n-sk-4.2.2.tar.bz2 +kde-l10n-ar-4.2.3.tar.bz2 +kde-l10n-bg-4.2.3.tar.bz2 +kde-l10n-bn_IN-4.2.3.tar.bz2 +kde-l10n-ca-4.2.3.tar.bz2 +kde-l10n-cs-4.2.3.tar.bz2 +kde-l10n-csb-4.2.3.tar.bz2 +kde-l10n-da-4.2.3.tar.bz2 +kde-l10n-de-4.2.3.tar.bz2 +kde-l10n-el-4.2.3.tar.bz2 +kde-l10n-en_GB-4.2.3.tar.bz2 +kde-l10n-es-4.2.3.tar.bz2 +kde-l10n-et-4.2.3.tar.bz2 +kde-l10n-eu-4.2.3.tar.bz2 +kde-l10n-fi-4.2.3.tar.bz2 +kde-l10n-fr-4.2.3.tar.bz2 +kde-l10n-ga-4.2.3.tar.bz2 +kde-l10n-gl-4.2.3.tar.bz2 +kde-l10n-gu-4.2.3.tar.bz2 +kde-l10n-he-4.2.3.tar.bz2 +kde-l10n-hi-4.2.3.tar.bz2 +kde-l10n-hu-4.2.3.tar.bz2 +kde-l10n-is-4.2.3.tar.bz2 +kde-l10n-it-4.2.3.tar.bz2 +kde-l10n-ja-4.2.3.tar.bz2 +kde-l10n-kk-4.2.3.tar.bz2 +kde-l10n-km-4.2.3.tar.bz2 +kde-l10n-ko-4.2.3.tar.bz2 +kde-l10n-ku-4.2.3.tar.bz2 +kde-l10n-lt-4.2.3.tar.bz2 +kde-l10n-lv-4.2.3.tar.bz2 +kde-l10n-mai-4.2.3.tar.bz2 +kde-l10n-mk-4.2.3.tar.bz2 +kde-l10n-ml-4.2.3.tar.bz2 +kde-l10n-mr-4.2.3.tar.bz2 +kde-l10n-nb-4.2.3.tar.bz2 +kde-l10n-nds-4.2.3.tar.bz2 +kde-l10n-nl-4.2.3.tar.bz2 +kde-l10n-nn-4.2.3.tar.bz2 +kde-l10n-pa-4.2.3.tar.bz2 +kde-l10n-pl-4.2.3.tar.bz2 +kde-l10n-pt-4.2.3.tar.bz2 +kde-l10n-pt_BR-4.2.3.tar.bz2 +kde-l10n-ro-4.2.3.tar.bz2 +kde-l10n-ru-4.2.3.tar.bz2 +kde-l10n-sk-4.2.3.tar.bz2 +kde-l10n-sl-4.2.3.tar.bz2 +kde-l10n-sr-4.2.3.tar.bz2 +kde-l10n-sv-4.2.3.tar.bz2 +kde-l10n-tg-4.2.3.tar.bz2 +kde-l10n-th-4.2.3.tar.bz2 +kde-l10n-tr-4.2.3.tar.bz2 +kde-l10n-uk-4.2.3.tar.bz2 +kde-l10n-wa-4.2.3.tar.bz2 +kde-l10n-zh_CN-4.2.3.tar.bz2 +kde-l10n-zh_TW-4.2.3.tar.bz2 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-11/kde-l10n.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -p -r1.78 -r1.79 --- kde-l10n.spec 2 Apr 2009 18:11:28 -0000 1.78 +++ kde-l10n.spec 4 May 2009 10:21:17 -0000 1.79 @@ -1,7 +1,7 @@ %define buildall 0 Name: kde-l10n -Version: 4.2.2 +Version: 4.2.3 Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE @@ -1382,6 +1382,9 @@ rm -rf %{buildroot} %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Mar 31 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-11/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sources 2 Apr 2009 11:23:22 -0000 1.25 +++ sources 4 May 2009 10:21:17 -0000 1.26 @@ -1,56 +1,55 @@ -90f064a42e5c197631fdec8ae1e1c2df kde-l10n-ar-4.2.2.tar.bz2 -d6f9cc4fce05427c23e05ad7a6e501f8 kde-l10n-bg-4.2.2.tar.bz2 -0ca74656701506ff0e2eb404d42af4e5 kde-l10n-bn_IN-4.2.2.tar.bz2 -f860f8c0eb81764bf48d27fa253d1abd kde-l10n-ca-4.2.2.tar.bz2 -c8aa7eab14d89466bf3738e70e255d87 kde-l10n-cs-4.2.2.tar.bz2 -70145686a60f2db1ab66d0fe3a395e59 kde-l10n-csb-4.2.2.tar.bz2 -2db197e069695fe6ddaa709e2e646878 kde-l10n-da-4.2.2.tar.bz2 -4a669b86c523cb78a45bbf3e1d03507d kde-l10n-de-4.2.2.tar.bz2 -1dd033fc59ce3874d6cd30244a715253 kde-l10n-el-4.2.2.tar.bz2 -bec69c9899683a35b40fea7dc65cc920 kde-l10n-en_GB-4.2.2.tar.bz2 -37c561521e1d89389a0f1d5df39cc1b3 kde-l10n-es-4.2.2.tar.bz2 -c536c5f67a5cff82dc097c01f081e16d kde-l10n-et-4.2.2.tar.bz2 -00f1513bcfee2d6c5bfe413ecba67723 kde-l10n-eu-4.2.2.tar.bz2 -4c11d695a375f5fe830d92e80a19a8bf kde-l10n-fi-4.2.2.tar.bz2 -d0fbc486e241dd0a1ad650c044c82656 kde-l10n-fr-4.2.2.tar.bz2 -d9f5a315259812b48ca86cc3818d5825 kde-l10n-ga-4.2.2.tar.bz2 -b268bdfa5b8f603cdbe0a557aaedb1bc kde-l10n-gl-4.2.2.tar.bz2 -a73aabc124459d51eb3207042665f472 kde-l10n-gu-4.2.2.tar.bz2 -570cfa032ec3cb46bceb0eb1c0c9e6d4 kde-l10n-he-4.2.2.tar.bz2 -f43d0563b66a16a73bb3f2f5f95362bf kde-l10n-hi-4.2.2.tar.bz2 -4f58a17ed248c57ea55dbceeacf359e2 kde-l10n-hu-4.2.2.tar.bz2 -10faf2af63662f6842562b24a0c295a3 kde-l10n-is-4.2.2.tar.bz2 -c54364f89abb34d2469bc4cf4da6f840 kde-l10n-it-4.2.2.tar.bz2 -a8022ab1be8c8e143167828cdbcf0e1e kde-l10n-ja-4.2.2.tar.bz2 -d441ed4bed5e3dca6e8498f762f042c2 kde-l10n-kk-4.2.2.tar.bz2 -1443dad476a3df65222030000262001a kde-l10n-km-4.2.2.tar.bz2 -3bf7d7fb9004865d8da5588a25d352e6 kde-l10n-kn-4.2.2.tar.bz2 -2680181faf79a7c893a1a1240a2adf4d kde-l10n-ko-4.2.2.tar.bz2 -58e0a1ed8627c5b841b44994665ae5dc kde-l10n-ku-4.2.2.tar.bz2 -c7b90195d2cd4be2a723e8c0e9089166 kde-l10n-lt-4.2.2.tar.bz2 -028be5e0d058ab8759792e3da7d0daa9 kde-l10n-lv-4.2.2.tar.bz2 -4ea512bd91efa95a1af42c3156329815 kde-l10n-mai-4.2.2.tar.bz2 -7cdd7d4e33bb782a541f1d004f444e24 kde-l10n-mk-4.2.2.tar.bz2 -0f6ea12f6db2cace8491a7a2c4879b3b kde-l10n-ml-4.2.2.tar.bz2 -2bf97467d21b48d16a6a5c9e7db4a0ad kde-l10n-mr-4.2.2.tar.bz2 -7d8fec243c5b76a29807413d372e0356 kde-l10n-nb-4.2.2.tar.bz2 -346172f49029f9aa621bd8fa4e401083 kde-l10n-nds-4.2.2.tar.bz2 -bb7f95e030ee6b0b13ab12489ce5f963 kde-l10n-nl-4.2.2.tar.bz2 -5ada2c1895846e9c9985a8ea4f34f0e5 kde-l10n-nn-4.2.2.tar.bz2 -b019a54c931b1dcae659976f56d236c5 kde-l10n-pa-4.2.2.tar.bz2 -118f22de9b47b1ac326d849175ddd6f5 kde-l10n-pl-4.2.2.tar.bz2 -394964f96e21d087dfdf52989a2ec2fe kde-l10n-pt-4.2.2.tar.bz2 -b3ab2486a8079791682b17c3caa89ed1 kde-l10n-pt_BR-4.2.2.tar.bz2 -003ac0ebada9173c9eee8ded8b293454 kde-l10n-ro-4.2.2.tar.bz2 -45b2679ac7c1554ec02816a2c509dea0 kde-l10n-ru-4.2.2.tar.bz2 -3d8b43de7bd364364f01648a3bc9cf95 kde-l10n-sl-4.2.2.tar.bz2 -166976c4a4129fa361f7643e57bcebce kde-l10n-sr-4.2.2.tar.bz2 -d993387a13813af942154cc1d10a3ce5 kde-l10n-sv-4.2.2.tar.bz2 -6ec453392f7f7ebaa2bdce79c10a9884 kde-l10n-tg-4.2.2.tar.bz2 -bf04317460335654aa0482ad0000b58f kde-l10n-th-4.2.2.tar.bz2 -04c3780701be20682bd772159ec78f1f kde-l10n-tr-4.2.2.tar.bz2 -3863787f2e4721b1568db2a9736454e7 kde-l10n-uk-4.2.2.tar.bz2 -c2a082a4049fe340d108d1145d53451c kde-l10n-wa-4.2.2.tar.bz2 -34de085cac6f862b359d1ce3e9ccfeed kde-l10n-zh_CN-4.2.2.tar.bz2 -f0c15cd1f14783f7d895355fe5754f61 kde-l10n-zh_TW-4.2.2.tar.bz2 -855181e00df828278d4ae83e6c8aba7b kde-l10n-sk-4.2.2.tar.bz2 +95809a4c9667f3f25cbef8b53db6cf9a kde-l10n-ar-4.2.3.tar.bz2 +08ac7ea15ac0fe1aeae018b51218127e kde-l10n-bg-4.2.3.tar.bz2 +ced95c116f8156ee71add92c8a644c21 kde-l10n-bn_IN-4.2.3.tar.bz2 +47a9e27b2f2012f912ff5f5029d8ccfa kde-l10n-ca-4.2.3.tar.bz2 +272e849626d7f73fece2eb41df5f8564 kde-l10n-cs-4.2.3.tar.bz2 +2584d7952b48ee703441d47280231b6d kde-l10n-csb-4.2.3.tar.bz2 +2177ef96abba7651c40246d1b769fc21 kde-l10n-da-4.2.3.tar.bz2 +880e3653b093e9218cccc6475c831d24 kde-l10n-de-4.2.3.tar.bz2 +0a914f96a3c7674616b4721e5767772d kde-l10n-el-4.2.3.tar.bz2 +55fe19285930ccaac4d5c4a4b050597a kde-l10n-en_GB-4.2.3.tar.bz2 +9c5a529d44f76cc7e7359d38ca95f3c8 kde-l10n-es-4.2.3.tar.bz2 +415cb082a2cb3d27757f34d2d9f1be26 kde-l10n-et-4.2.3.tar.bz2 +aa1165755a8758326d6191c03268e91a kde-l10n-eu-4.2.3.tar.bz2 +d3d7050c380cdb693e92a32696d6424a kde-l10n-fi-4.2.3.tar.bz2 +170850e43ac8b613797a9803e35b76d7 kde-l10n-fr-4.2.3.tar.bz2 +46f90cff4dc01c9834c0a8629ad3c44f kde-l10n-ga-4.2.3.tar.bz2 +804dc1ba927ac609ac86af1d1eb07bb2 kde-l10n-gl-4.2.3.tar.bz2 +80bd46b64357e86d959a94ca0bdc8dd7 kde-l10n-gu-4.2.3.tar.bz2 +bbf3a3eac19a3d42db9992645d80363c kde-l10n-he-4.2.3.tar.bz2 +e14339721f8db47a81da3aad825e8be2 kde-l10n-hi-4.2.3.tar.bz2 +5c2d14ceca042f422260043f33988d0b kde-l10n-hu-4.2.3.tar.bz2 +248e06b8bbf2f86ab01a38604c17f067 kde-l10n-is-4.2.3.tar.bz2 +124afb0a334ded46259de1ca827ce9e3 kde-l10n-it-4.2.3.tar.bz2 +2019bb97f4ef60e8eb98a9b62afb1ea3 kde-l10n-ja-4.2.3.tar.bz2 +7be7bd63604b797d3799429ada43330b kde-l10n-kk-4.2.3.tar.bz2 +a64adffd0e69caf74bef668d5f41f7bf kde-l10n-km-4.2.3.tar.bz2 +f7280d96bfe4b3655873905bb6a348ea kde-l10n-ko-4.2.3.tar.bz2 +dac8760279c062a2b618ef2407d20eed kde-l10n-ku-4.2.3.tar.bz2 +a14e292256c56c0aac3cceb025169d2f kde-l10n-lt-4.2.3.tar.bz2 +0e58c3d1237ed139cf4481cc7aefca27 kde-l10n-lv-4.2.3.tar.bz2 +4624efc27c176e2798cee2a989fb5003 kde-l10n-mai-4.2.3.tar.bz2 +5243adb4503a8480888695b7b33f4e6a kde-l10n-mk-4.2.3.tar.bz2 +ee123b87203fb3af83419dc7f81a3f30 kde-l10n-ml-4.2.3.tar.bz2 +f729127f4fa9aa2ab607e579468bff98 kde-l10n-mr-4.2.3.tar.bz2 +cbdd2cf71d48739d76319b0cd64f83ed kde-l10n-nb-4.2.3.tar.bz2 +dd6ec56d0b6dabf4b3398f7aedf91d22 kde-l10n-nds-4.2.3.tar.bz2 +6d1d498d712e5531a6dc25650ba0568d kde-l10n-nl-4.2.3.tar.bz2 +015b7a90b06f628882b108e507de1b08 kde-l10n-nn-4.2.3.tar.bz2 +975b2e078ff917c58426c0c9e15dc7f5 kde-l10n-pa-4.2.3.tar.bz2 +588fa168569034994b097bcf84cc017f kde-l10n-pl-4.2.3.tar.bz2 +95ff08b154d2ea493619548cc7b7e4cd kde-l10n-pt-4.2.3.tar.bz2 +c0a148cedc216d68d8f00ca3e67f0e32 kde-l10n-pt_BR-4.2.3.tar.bz2 +165d7be11d8715d10a2f308af63b622a kde-l10n-ro-4.2.3.tar.bz2 +6eb77d7060d66cb1bb197c56c0bfa037 kde-l10n-ru-4.2.3.tar.bz2 +1dafc2ff1a3cd03560821f6543a52c72 kde-l10n-sk-4.2.3.tar.bz2 +d4e9cabebf23dcfbb3396a455eb5d313 kde-l10n-sl-4.2.3.tar.bz2 +c344832cc27e7ea334c8c6403e103a3d kde-l10n-sr-4.2.3.tar.bz2 +a2e41b974fa502abac3e3e1844f2b2c4 kde-l10n-sv-4.2.3.tar.bz2 +6d78d6c7d163dfc05c26eec22037fe33 kde-l10n-tg-4.2.3.tar.bz2 +f3df1d0c698f6e7a0f39a2ecd6ba8c86 kde-l10n-th-4.2.3.tar.bz2 +8858f2a10c00300c70d58e76823cbc84 kde-l10n-tr-4.2.3.tar.bz2 +e2b5a450f9993d89283fbd49692e77bd kde-l10n-uk-4.2.3.tar.bz2 +73078462bb9308568830ad80d4ab73c1 kde-l10n-wa-4.2.3.tar.bz2 +c682c6b9d2acb18f3262ccf2b099f1fe kde-l10n-zh_CN-4.2.3.tar.bz2 +f439a4e95bd100e0ec090fb0401d1f4e kde-l10n-zh_TW-4.2.3.tar.bz2 From mnowak at fedoraproject.org Mon May 4 10:40:51 2009 From: mnowak at fedoraproject.org (Michal Nowak) Date: Mon, 4 May 2009 10:40:51 +0000 (UTC) Subject: rpms/eclipse-pydev/devel .cvsignore, 1.17, 1.18 eclipse-pydev.spec, 1.26, 1.27 import.log, 1.2, 1.3 sources, 1.17, 1.18 Message-ID: <20090504104051.3FB69700DB@cvs1.fedora.phx.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/eclipse-pydev/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30016/devel Modified Files: .cvsignore eclipse-pydev.spec import.log sources Log Message: 1.4.5; Resolves: rhbz#498651 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- .cvsignore 25 Feb 2009 08:29:26 -0000 1.17 +++ .cvsignore 4 May 2009 10:40:20 -0000 1.18 @@ -1,4 +1,2 @@ -org.python.pydev.feature-src-1_4_2.zip org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2 -org.python.pydev.feature-1.4.3.2627-sources.zip -org.python.pydev.feature-1.4.4.2636-sources.zip +org.python.pydev.feature-1.4.5.2727-sources.zip Index: eclipse-pydev.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- eclipse-pydev.spec 23 Mar 2009 16:36:14 -0000 1.26 +++ eclipse-pydev.spec 4 May 2009 10:40:20 -0000 1.27 @@ -1,6 +1,6 @@ # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo %global debug_package %{nil} -%global qualifier 2636 +%global qualifier 2727 Epoch: 1 @@ -9,12 +9,12 @@ Epoch: 1 %define major 1 %define minor 4 -%define maint 4 +%define maint 5 Summary: Eclipse Python development plug-in Name: eclipse-pydev Version: %{major}.%{minor}.%{maint} -Release: 2%{?dist} +Release: 1%{?dist} License: EPL URL: http://pydev.sourceforge.net Group: Development/Tools @@ -213,6 +213,9 @@ rm -rf ${RPM_BUILD_ROOT} %{install_loc}/pydev-mylyn %changelog +* Mon May 4 2009 Michal Nowak 1:1.4.5-1 +- 1.4.5; Resolves: rhbz#498651 + * Mon Mar 23 2009 Alexander Kurtakov 1:1.4.4-2 - Rebuild to not ship p2 context.xml. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 30 Jan 2009 23:09:57 -0000 1.2 +++ import.log 4 May 2009 10:40:20 -0000 1.3 @@ -1,2 +1,3 @@ eclipse-pydev-1_3_20-1_fc10:HEAD:eclipse-pydev-1.3.20-1.fc10.src.rpm:1224001997 eclipse-pydev-1_4_2-2_fc10:HEAD:eclipse-pydev-1.4.2-2.fc10.src.rpm:1233356816 +eclipse-pydev-1_4_5-1_fc11:HEAD:eclipse-pydev-1.4.5-1.fc11.src.rpm:1241433462 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- sources 25 Feb 2009 08:29:26 -0000 1.17 +++ sources 4 May 2009 10:40:20 -0000 1.18 @@ -1,3 +1,2 @@ 3a42402df10a42af0a8d648711c36239 org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2 -95b7969a1411cf82520f8c78549bc96f org.python.pydev.feature-1.4.3.2627-sources.zip -ee35f8f29e9168f2aa54b1fb6ecb10fd org.python.pydev.feature-1.4.4.2636-sources.zip +16f526756fd1ef86e94bf1bd5ccb4546 org.python.pydev.feature-1.4.5.2727-sources.zip From pkgdb at fedoraproject.org Mon May 4 10:46:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 10:46:06 +0000 Subject: [pkgdb] eclipse-pydev had acl change status Message-ID: <20090504104606.7B06310F89D@bastion2.fedora.phx.redhat.com> mnowak has set the commit acl on eclipse-pydev (Fedora 10) to Obsolete for bkonrath To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev From pkgdb at fedoraproject.org Mon May 4 10:46:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 10:46:11 +0000 Subject: [pkgdb] eclipse-pydev had acl change status Message-ID: <20090504104611.518D210F89E@bastion2.fedora.phx.redhat.com> mnowak has set the watchbugzilla acl on eclipse-pydev (Fedora 9) to Obsolete for bkonrath To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev From pkgdb at fedoraproject.org Mon May 4 10:46:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 10:46:14 +0000 Subject: [pkgdb] eclipse-pydev had acl change status Message-ID: <20090504104614.9483710F8A4@bastion2.fedora.phx.redhat.com> mnowak has set the commit acl on eclipse-pydev (Fedora 9) to Obsolete for bkonrath To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev From pkgdb at fedoraproject.org Mon May 4 10:46:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 10:46:14 +0000 Subject: [pkgdb] eclipse-pydev had acl change status Message-ID: <20090504104614.ACD3310F8A5@bastion2.fedora.phx.redhat.com> mnowak has set the watchcommits acl on eclipse-pydev (Fedora 9) to Obsolete for bkonrath To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev From tbzatek at fedoraproject.org Mon May 4 11:23:32 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 4 May 2009 11:23:32 +0000 (UTC) Subject: rpms/seahorse-plugins/devel .cvsignore, 1.12, 1.13 seahorse-plugins.spec, 1.25, 1.26 sources, 1.12, 1.13 sp-atexit.patch, 1.1, NONE Message-ID: <20090504112332.A85B4700DB@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/seahorse-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4264 Modified Files: .cvsignore seahorse-plugins.spec sources Removed Files: sp-atexit.patch Log Message: * Mon May 4 2009 Tomas Bzatek 2.27.1-1 - Update to 2.27.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse-plugins/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 13 Apr 2009 17:39:35 -0000 1.12 +++ .cvsignore 4 May 2009 11:23:00 -0000 1.13 @@ -1 +1 @@ -seahorse-plugins-2.26.1.tar.bz2 +seahorse-plugins-2.27.1.tar.bz2 Index: seahorse-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- seahorse-plugins.spec 28 Apr 2009 06:21:47 -0000 1.25 +++ seahorse-plugins.spec 4 May 2009 11:23:00 -0000 1.26 @@ -1,6 +1,6 @@ Name: seahorse-plugins -Version: 2.26.1 -Release: 3%{?dist} +Version: 2.27.1 +Release: 1%{?dist} Summary: Plugins and utilities for encryption in GNOME Group: User Interface/Desktops License: GPLv2+ and GFDL @@ -52,9 +52,6 @@ Requires(postun): scrollkeeper Requires(postun): shared-mime-info Requires(postun): GConf2 -# http://bugzilla.gnome.org/show_bug.cgi?id=579738 -Patch0: sp-atexit.patch - %description The plugins and utilities in this package integrate seahorse into the GNOME desktop environment and allow users to perform operations @@ -62,7 +59,6 @@ from applications like nautilus or gedit %prep %setup -q -%patch0 -p1 -b .atexit autoreconf -i -f @@ -176,6 +172,9 @@ fi %changelog +* Mon May 4 2009 Tomas Bzatek 2.27.1-1 +- Update to 2.27.1 + * Mon Apr 27 2009 Christopher Aillon - 2.26.1-3 - Rebuild against newer gecko Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse-plugins/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 13 Apr 2009 17:39:35 -0000 1.12 +++ sources 4 May 2009 11:23:00 -0000 1.13 @@ -1 +1 @@ -d0aecc4e8e008b45362adf8a8716f38c seahorse-plugins-2.26.1.tar.bz2 +8ef8e5738e1b76d593544461859c3c45 seahorse-plugins-2.27.1.tar.bz2 --- sp-atexit.patch DELETED --- From mmaslano at fedoraproject.org Mon May 4 11:24:58 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 4 May 2009 11:24:58 +0000 (UTC) Subject: rpms/cronie/F-11 .cvsignore, 1.4, 1.5 cronie.spec, 1.16, 1.17 sources, 1.4, 1.5 0001-Update-manual-for-symlink.patch, 1.1, NONE cronie-1.2-reload.patch, 1.1, NONE init.patch, 1.1, NONE nofollow.patch, 1.1, NONE Message-ID: <20090504112458.D8D03700DB@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/cronie/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4528 Modified Files: .cvsignore cronie.spec sources Removed Files: 0001-Update-manual-for-symlink.patch cronie-1.2-reload.patch init.patch nofollow.patch Log Message: * Mon Apr 27 2009 Marcela Ma??l????ov?? - 1.3-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cronie/F-11/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 26 Jun 2008 14:07:20 -0000 1.4 +++ .cvsignore 4 May 2009 11:24:27 -0000 1.5 @@ -1 +1 @@ -cronie-1.2.tar.gz +cronie-1.3.tar.gz Index: cronie.spec =================================================================== RCS file: /cvs/pkgs/rpms/cronie/F-11/cronie.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- cronie.spec 9 Mar 2009 08:12:18 -0000 1.16 +++ cronie.spec 4 May 2009 11:24:28 -0000 1.17 @@ -5,17 +5,13 @@ Summary: Cron daemon for executing programs at set times Name: cronie -Version: 1.2 -Release: 7%{?dist} +Version: 1.3 +Release: 1%{?dist} License: MIT and BSD Group: System Environment/Base URL: https://fedorahosted.org/cronie -#Source0: https://fedorahosted.org/cronie/%{name}-%{version}.tar.gz -Source0: http://mmaslano.fedorapeople.org/cronie/%{name}-%{version}.tar.gz -Patch0: init.patch -Patch1: nofollow.patch -Patch2: cronie-1.2-reload.patch -Patch3: 0001-Update-manual-for-symlink.patch +Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz +#Source0: http://mmaslano.fedorapeople.org/cronie/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: syslog, bash >= 2.0 @@ -50,10 +46,6 @@ SELinux. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build @@ -133,6 +125,9 @@ cp -a /var/lock/subsys/crond /var/lock/s %config(noreplace) %{_sysconfdir}/cron.deny %changelog +* Mon Apr 27 2009 Marcela Ma??l????ov?? - 1.3-1 +- new release + * Mon Mar 9 2009 Tomas Mraz - 1.2-7 - rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cronie/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 26 Jun 2008 14:07:20 -0000 1.4 +++ sources 4 May 2009 11:24:28 -0000 1.5 @@ -1 +1 @@ -8b4283a5bea2f503b419ad16f46a6592 cronie-1.2.tar.gz +dbb21448103e80c61d0a2c0f6ec2475c cronie-1.3.tar.gz --- 0001-Update-manual-for-symlink.patch DELETED --- --- cronie-1.2-reload.patch DELETED --- --- init.patch DELETED --- --- nofollow.patch DELETED --- From hadess at fedoraproject.org Mon May 4 11:46:32 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 4 May 2009 11:46:32 +0000 (UTC) Subject: rpms/bluez/devel .cvsignore, 1.32, 1.33 bluez.spec, 1.61, 1.62 sources, 1.32, 1.33 Message-ID: <20090504114632.B3507700DB@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7577 Modified Files: .cvsignore bluez.spec sources Log Message: * Mon May 04 2009 Bastien Nocera 4.38-1 - Update to 4.38 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- .cvsignore 23 Apr 2009 12:54:21 -0000 1.32 +++ .cvsignore 4 May 2009 11:46:00 -0000 1.33 @@ -1 +1 @@ -bluez-4.37.tar.gz +bluez-4.38.tar.gz Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- bluez.spec 29 Apr 2009 10:22:58 -0000 1.61 +++ bluez.spec 4 May 2009 11:46:00 -0000 1.62 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez -Version: 4.37 -Release: 2%{?dist} +Version: 4.38 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -251,6 +251,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/pand %changelog +* Mon May 04 2009 Bastien Nocera 4.38-1 +- Update to 4.38 + * Wed Apr 29 2009 Bastien Nocera 4.37-2 - Split off dund, pand, hidd, and rfcomm helper into a compat package (#477890, #473892) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- sources 23 Apr 2009 12:54:21 -0000 1.32 +++ sources 4 May 2009 11:46:00 -0000 1.33 @@ -1 +1 @@ -c1106f56f8e5562cf7c49d3455d2c5f7 bluez-4.37.tar.gz +80eae83a64c634390b7e88a1ea12048f bluez-4.38.tar.gz From jzeleny at fedoraproject.org Mon May 4 11:53:24 2009 From: jzeleny at fedoraproject.org (Jan Zeleny) Date: Mon, 4 May 2009 11:53:24 +0000 (UTC) Subject: rpms/fcoe-utils/devel fcoe-utils-1.0.7-free.patch, NONE, 1.1 fcoe-utils.spec, 1.2, 1.3 fcoe-utils-1.0.7-make.patch, 1.1, NONE Message-ID: <20090504115324.5F980700DB@cvs1.fedora.phx.redhat.com> Author: jzeleny Update of /cvs/extras/rpms/fcoe-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17615 Modified Files: fcoe-utils.spec Added Files: fcoe-utils-1.0.7-free.patch Removed Files: fcoe-utils-1.0.7-make.patch Log Message: - fixed SIGSEGV when fcoe module isn't loaded (#498550) - removed make patch, which was previously imported, but it's useless fcoe-utils-1.0.7-free.patch: --- NEW FILE fcoe-utils-1.0.7-free.patch --- --- fcoe-utils-1.0.7/fcoeadm.c 2009-03-27 21:40:22.000000000 +0100 +++ fcoe-utils-1.0.7/fcoeadm.c.free 2009-05-04 11:29:00.000000000 +0200 @@ -250,8 +250,8 @@ fcoeadm_find_fchost(char *ifname, char * } free(namelist[n]); } + free(namelist); } - free(namelist); return found; } Index: fcoe-utils.spec =================================================================== RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- fcoe-utils.spec 27 Apr 2009 11:24:53 -0000 1.2 +++ fcoe-utils.spec 4 May 2009 11:52:53 -0000 1.3 @@ -1,6 +1,6 @@ Name: fcoe-utils Version: 1.0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System @@ -8,6 +8,7 @@ License: GPLv2 URL: http://www.open-fcoe.org Source0: http://www.open-fcoe.org/openfc/downloads/%{name}-%{version}.tar.gz Patch0: fcoe-utils-1.0.7-init.patch +Patch1: fcoe-utils-1.0.7-free.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libhbaapi-devel dcbd-devel @@ -24,6 +25,7 @@ fcoemon - service to configure DCB Ether %prep %setup -q %patch0 -p1 -b .initPatch +%patch1 -p1 -b .freePatch %build @@ -72,6 +74,9 @@ fi %changelog +* Wed May 4 2009 Jan Zeleny - 1.0.7-5 +- fixed SIGSEGV when fcoe module isn't loaded (#498550) + * Wed Apr 27 2009 Jan Zeleny - 1.0.7-4 - added libhbalinux to Requires (#497605) - correction of spec file (_initddir -> _initrddir) --- fcoe-utils-1.0.7-make.patch DELETED --- From michich at fedoraproject.org Mon May 4 11:58:34 2009 From: michich at fedoraproject.org (Michal Schmidt) Date: Mon, 4 May 2009 11:58:34 +0000 (UTC) Subject: rpms/icecream/EL-5 icecream.spec, 1.17, 1.18 icecream.te, 1.6, 1.7 sources, 1.5, 1.6 icecream-0.9.3-fix-gcc44-ftbfs.patch, 1.1, NONE Message-ID: <20090504115834.3D87F700DB@cvs1.fedora.phx.redhat.com> Author: michich Update of /cvs/pkgs/rpms/icecream/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28500 Modified Files: icecream.spec icecream.te sources Removed Files: icecream-0.9.3-fix-gcc44-ftbfs.patch Log Message: * Thu Apr 30 2009 Michal Schmidt - 0.9.4-1 - Upstream release 0.9.4. - Dropped merged patches. Index: icecream.spec =================================================================== RCS file: /cvs/pkgs/rpms/icecream/EL-5/icecream.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- icecream.spec 16 Feb 2009 20:52:28 -0000 1.17 +++ icecream.spec 4 May 2009 11:58:03 -0000 1.18 @@ -1,5 +1,5 @@ %if 0%{?fedora} -%bcond_without fedora +%bcond_without fedora %bcond_without selinux %else %bcond_with fedora @@ -10,8 +10,8 @@ Name: icecream -Version: 0.9.3 -Release: 3%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: Distributed compiler Group: Development/Tools @@ -29,7 +29,6 @@ Source7: initscript-scheduler Source8: %{name}-manpages.tar.bz2 Patch0: %{name}-rename-scheduler.patch Patch1: %{name}-cleanup-conffile.patch -Patch2: %{name}-0.9.3-fix-gcc44-ftbfs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,8 +50,8 @@ Requires(post): chkconfig policycoreuti Requires(preun): chkconfig initscripts policycoreutils Requires(postun): initscripts policycoreutils -Provides: group(icecream) = 44 -Provides: user(icecream) = 44 +Provides: group(icecream) = 44 +Provides: user(icecream) = 44 # description copied from Debian icecc package @@ -77,7 +76,6 @@ This package contains development files %setup -q -a 8 -n icecc-%{version} %patch0 -p1 %patch1 -p0 -%patch2 -p1 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh mkdir SELinux @@ -235,6 +233,22 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/icecc.pc %changelog +* Thu Apr 30 2009 Michal Schmidt - 0.9.4-1 +- Upstream release 0.9.4. +- Dropped merged patches. + +* Mon Apr 06 2009 Michal Schmidt - 0.9.3-6 +- Fix wrong permissions on the cache dir preventing the jobs from being + distributed. +- SELinux policy update based on review comments on refpolicy ML. + +* Mon Mar 02 2009 Michal Schmidt - 0.9.3-5 +- Fix a fd leak from iceccd + avoid using system(). +- Allows tighter SELinux policy. + +* Tue Feb 24 2009 Fedora Release Engineering - 0.9.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Michal Schmidt - 0.9.3-3 - Do not use --disable-rpath, icecream's configure script does not understand it and warns about it. We still remove rpath using the sed tricks. Index: icecream.te =================================================================== RCS file: /cvs/pkgs/rpms/icecream/EL-5/icecream.te,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- icecream.te 16 Feb 2009 20:52:28 -0000 1.6 +++ icecream.te 4 May 2009 11:58:03 -0000 1.7 @@ -1,12 +1,11 @@ -policy_module(icecream,0.0.42) +policy_module(icecream,0.1.3) ######################################## # -# Declarations +# iceccd declarations # -# the compiler node daemon type iceccd_t; type iceccd_exec_t; init_daemon_domain(iceccd_t, iceccd_exec_t) @@ -20,29 +19,39 @@ files_tmp_file(iceccd_tmp_t) type iceccd_var_run_t; files_pid_file(iceccd_var_run_t) -# the working area type iceccd_cache_t; files_type(iceccd_cache_t) -# icecc-create-env script makes a tarball of the local compiler and its -# dependencies for other nodes to use +######################################## +# +# iceccd_createenv declarations +# + type iceccd_createenv_t; type iceccd_createenv_exec_t; -domain_type(iceccd_createenv_t) -domain_entry_file(iceccd_createenv_t, iceccd_createenv_exec_t) +application_domain(iceccd_createenv_t, iceccd_createenv_exec_t) role system_r types iceccd_createenv_t; -# foreign compilers -type iceccd_untrusted_t; -domain_type(iceccd_untrusted_t); -domain_entry_file(iceccd_untrusted_t, iceccd_cache_t) -role system_r types iceccd_untrusted_t; +######################################## +# +# icecc_scheduler declarations +# -# the scheduler type icecc_scheduler_t; type icecc_scheduler_exec_t; init_daemon_domain(icecc_scheduler_t, icecc_scheduler_exec_t) +######################################## +# +# iceccd_untrusted declarations +# + +type iceccd_untrusted_t; +domain_type(iceccd_untrusted_t); +domain_entry_file(iceccd_untrusted_t, iceccd_cache_t) +role system_r types iceccd_untrusted_t; + +# port declarations. for separate module only. type iceccd_port_t; type icecc_scheduler_port_t; corenet_port(iceccd_port_t); @@ -50,31 +59,39 @@ corenet_port(icecc_scheduler_port_t); ######################################## # -# Icecream policy +# iceccd policy # -allow iceccd_t self:process { signal_perms setsched setrlimit }; +allow iceccd_t self:capability { chown dac_override fowner fsetid kill + setgid setuid sys_chroot }; +allow iceccd_t self:fifo_file rw_fifo_file_perms; allow iceccd_t self:netlink_route_socket r_netlink_socket_perms; +allow iceccd_t self:process { signal_perms setsched setrlimit }; allow iceccd_t self:tcp_socket create_stream_socket_perms; allow iceccd_t self:udp_socket create_socket_perms; -allow iceccd_t self:fifo_file rw_fifo_file_perms; -allow iceccd_t self:capability { chown dac_override fowner fsetid kill setgid setuid sys_chroot }; -allow iceccd_t iceccd_untrusted_t:process { siginh rlimitinh noatsecure signal }; -files_read_etc_files(iceccd_t) -libs_use_ld_so(iceccd_t) -libs_use_shared_libs(iceccd_t) -miscfiles_read_localization(iceccd_t) +dontaudit iceccd_t iceccd_untrusted_t:process { siginh rlimitinh + noatsecure }; -fs_getattr_all_fs(iceccd_t) -kernel_read_system_state(iceccd_t) -sysnet_read_config(iceccd_t) +allow iceccd_t iceccd_untrusted_t:process signal; -corecmd_exec_bin(iceccd_t) -corecmd_read_bin_symlinks(iceccd_t) +domtrans_pattern(iceccd_t, iceccd_createenv_exec_t, iceccd_createenv_t) +domtrans_pattern(iceccd_t, iceccd_cache_t, iceccd_untrusted_t) + +manage_files_pattern(iceccd_t, iceccd_log_t, iceccd_log_t) +logging_log_filetrans(iceccd_t, iceccd_log_t, file) + +manage_files_pattern(iceccd_t, iceccd_var_run_t, iceccd_var_run_t) +files_pid_filetrans(iceccd_t, iceccd_var_run_t, file) + +manage_dirs_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t) +manage_files_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t) +files_var_filetrans(iceccd_t, iceccd_cache_t, { dir file }) -files_getattr_tmp_dirs(iceccd_t) files_search_tmp(iceccd_t) +manage_dirs_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t) +manage_files_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t) +files_tmp_filetrans(iceccd_t, iceccd_tmp_t, { dir file }) corenet_all_recvfrom_unlabeled(iceccd_t) corenet_all_recvfrom_netlabel(iceccd_t) @@ -88,84 +105,89 @@ corenet_tcp_bind_generic_node(iceccd_t) allow iceccd_t iceccd_port_t:tcp_socket { name_bind }; allow iceccd_t icecc_scheduler_port_t:tcp_socket { name_connect }; -domtrans_pattern(iceccd_t, iceccd_createenv_exec_t, iceccd_createenv_t) -domtrans_pattern(iceccd_t, iceccd_cache_t, iceccd_untrusted_t) +corecmd_exec_bin(iceccd_t) +corecmd_read_bin_symlinks(iceccd_t) -manage_files_pattern(iceccd_t, iceccd_log_t, iceccd_log_t) -logging_log_filetrans(iceccd_t, iceccd_log_t, file) +#files_getattr_tmp_dirs(iceccd_t) +files_read_etc_files(iceccd_t) -manage_files_pattern(iceccd_t, iceccd_var_run_t, iceccd_var_run_t) -files_pid_filetrans(iceccd_t, iceccd_var_run_t, file) +fs_getattr_all_fs(iceccd_t) -manage_dirs_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t) -manage_files_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t) +kernel_read_system_state(iceccd_t) -manage_dirs_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t) -manage_files_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t) -files_tmp_filetrans(iceccd_t, iceccd_tmp_t, file) +sysnet_read_config(iceccd_t) + +libs_use_ld_so(iceccd_t) +libs_use_shared_libs(iceccd_t) +miscfiles_read_localization(iceccd_t) + +######################################## +# +# iceccd_createenv policy +# -allow iceccd_createenv_t iceccd_log_t:file { append }; allow iceccd_createenv_t self:fifo_file rw_fifo_file_perms; -# icecc-create-env looks for executable files to strip them. It does not -# really execute them, but the -x check would trigger a denial. Do not allow -# this, typically the binaries are already stripped anyway. Just silence it. -dontaudit iceccd_createenv_t iceccd_tmp_t:file { execute }; -allow iceccd_untrusted_t self:fifo_file rw_fifo_file_perms; -allow iceccd_untrusted_t self:process signal_perms; -allow iceccd_untrusted_t iceccd_t:unix_stream_socket rw_sock_file_perms; -manage_files_pattern(iceccd_untrusted_t, iceccd_cache_t, iceccd_cache_t) -allow iceccd_untrusted_t iceccd_cache_t:file { execute_no_trans }; +dontaudit iceccd_createenv_t iceccd_tmp_t:file { execute }; -files_read_etc_files(iceccd_createenv_t) -libs_use_ld_so(iceccd_createenv_t) -libs_use_shared_libs(iceccd_createenv_t) -miscfiles_read_localization(iceccd_createenv_t) +allow iceccd_createenv_t iceccd_log_t:file { append }; manage_dirs_pattern(iceccd_createenv_t, iceccd_cache_t, iceccd_cache_t) manage_files_pattern(iceccd_createenv_t, iceccd_cache_t, iceccd_cache_t) +# no files_var_filetrans, createenv does not create the cache dir itself + +manage_dirs_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t) +manage_files_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t) +files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, { dir file }) -files_read_usr_files(iceccd_createenv_t) -libs_exec_ld_so(iceccd_createenv_t) -libs_exec_lib_files(iceccd_createenv_t) -libs_domtrans_ldconfig(iceccd_createenv_t) corecmd_exec_bin(iceccd_createenv_t) corecmd_exec_shell(iceccd_createenv_t) + dev_read_urand(iceccd_createenv_t) + +files_read_etc_files(iceccd_createenv_t) +files_read_usr_files(iceccd_createenv_t) + kernel_read_system_state(iceccd_createenv_t) -# silence file(1) looking for /root/.magic -userdom_dontaudit_search_admin_dir(iceccd_createenv_t) -manage_dirs_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t) -manage_files_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t) -files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, file) -files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, dir) +libs_exec_ld_so(iceccd_createenv_t) +libs_exec_lib_files(iceccd_createenv_t) + +libs_domtrans_ldconfig(iceccd_createenv_t) + +libs_use_ld_so(iceccd_createenv_t) +libs_use_shared_libs(iceccd_createenv_t) + +miscfiles_read_localization(iceccd_createenv_t) + +userdom_dontaudit_search_user_home_dirs(iceccd_createenv_t) optional_policy(` nscd_socket_use(iceccd_createenv_t) ') -# Some rules that can probably go away when iceccd is fixed properly: +######################################## # -# XXX: icecc-create-env does not really need to talk to the open UDP socket -# leaked from its parent. -dontaudit iceccd_createenv_t iceccd_t:udp_socket { read write }; -# XXX: iceccd could be modified to avoid the shell completely -corecmd_exec_shell(iceccd_t) -# XXX: fix iceccd to only nuke the contents of /var/cache/icecream, -# not the directory itself. -files_var_filetrans(iceccd_t, iceccd_cache_t, dir) +# iceccd_untrusted policy +# + +allow iceccd_untrusted_t self:fifo_file rw_fifo_file_perms; +allow iceccd_untrusted_t self:process signal_perms; +allow iceccd_untrusted_t iceccd_t:unix_stream_socket rw_stream_socket_perms; + +manage_files_pattern(iceccd_untrusted_t, iceccd_cache_t, iceccd_cache_t) +can_exec(iceccd_untrusted_t, iceccd_cache_t) + +######################################## +# +# icecc_scheduler policy +# allow icecc_scheduler_t self:tcp_socket create_stream_socket_perms; allow icecc_scheduler_t self:udp_socket create_socket_perms; -files_read_etc_files(icecc_scheduler_t) -libs_use_ld_so(icecc_scheduler_t) -libs_use_shared_libs(icecc_scheduler_t) -miscfiles_read_localization(icecc_scheduler_t) - corenet_all_recvfrom_unlabeled(icecc_scheduler_t) corenet_all_recvfrom_netlabel(icecc_scheduler_t) corenet_tcp_sendrecv_generic_if(icecc_scheduler_t) @@ -178,3 +200,10 @@ corenet_tcp_bind_generic_node(icecc_sche corenet_udp_bind_generic_node(icecc_scheduler_t) allow icecc_scheduler_t icecc_scheduler_port_t:tcp_socket { name_bind }; allow icecc_scheduler_t icecc_scheduler_port_t:udp_socket { name_bind }; + +files_read_etc_files(icecc_scheduler_t) + +libs_use_ld_so(icecc_scheduler_t) +libs_use_shared_libs(icecc_scheduler_t) + +miscfiles_read_localization(icecc_scheduler_t) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/icecream/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 16 Feb 2009 12:22:04 -0000 1.5 +++ sources 4 May 2009 11:58:03 -0000 1.6 @@ -1,2 +1,2 @@ -34bb950331ef5256299a2de4cf402ea6 icecc-0.9.3.tar.bz2 +b52192df5aa3713910fdf481dda4119e icecc-0.9.4.tar.bz2 a3829775870d5b2b60b750a88ee835b7 icecream-manpages.tar.bz2 --- icecream-0.9.3-fix-gcc44-ftbfs.patch DELETED --- From kasal at fedoraproject.org Mon May 4 12:35:57 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 4 May 2009 12:35:57 +0000 (UTC) Subject: rpms/perl-DBD-Pg/devel .cvsignore, 1.21, 1.22 perl-DBD-Pg.spec, 1.49, 1.50 sources, 1.22, 1.23 Message-ID: <20090504123557.D67C8700DB@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-DBD-Pg/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1330 Modified Files: .cvsignore perl-DBD-Pg.spec sources Log Message: new upstream release, also fixes #498899 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 5 Dec 2008 14:35:52 -0000 1.21 +++ .cvsignore 4 May 2009 12:35:26 -0000 1.22 @@ -1 +1 @@ -DBD-Pg-2.11.6.tar.gz +DBD-Pg-2.13.1.tar.gz Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- perl-DBD-Pg.spec 26 Feb 2009 14:08:08 -0000 1.49 +++ perl-DBD-Pg.spec 4 May 2009 12:35:26 -0000 1.50 @@ -1,6 +1,6 @@ Name: perl-DBD-Pg -Version: 2.11.6 -Release: 3%{?dist} +Version: 2.13.1 +Release: 1%{?dist} Summary: A PostgreSQL interface for perl Group: Development/Libraries @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 4 2009 Stepan Kasal - 2.13.1-1 +- new upstream release, also fixes #498899 + * Thu Feb 26 2009 Fedora Release Engineering - 2.11.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 5 Dec 2008 14:35:52 -0000 1.22 +++ sources 4 May 2009 12:35:26 -0000 1.23 @@ -1 +1 @@ -477c5f3811e21af5636aa2926ac92ce5 DBD-Pg-2.11.6.tar.gz +4e16c70109146d18a11a5170d30b305a DBD-Pg-2.13.1.tar.gz From kasal at fedoraproject.org Mon May 4 12:36:57 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 4 May 2009 12:36:57 +0000 (UTC) Subject: rpms/perl-DBD-Pg/F-9 .cvsignore, 1.19, 1.20 perl-DBD-Pg.spec, 1.43, 1.44 sources, 1.20, 1.21 Message-ID: <20090504123657.67FE5700DB@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-DBD-Pg/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1510 Modified Files: .cvsignore perl-DBD-Pg.spec sources Log Message: new upstream release, also fixes #498899 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- .cvsignore 29 Aug 2008 08:25:36 -0000 1.19 +++ .cvsignore 4 May 2009 12:36:27 -0000 1.20 @@ -1 +1 @@ -DBD-Pg-2.10.0.tar.gz +DBD-Pg-2.13.1.tar.gz Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-9/perl-DBD-Pg.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- perl-DBD-Pg.spec 29 Aug 2008 08:25:36 -0000 1.43 +++ perl-DBD-Pg.spec 4 May 2009 12:36:27 -0000 1.44 @@ -1,12 +1,12 @@ Name: perl-DBD-Pg -Version: 2.10.0 +Version: 2.13.1 Release: 1%{?dist} Summary: A PostgreSQL interface for perl Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/DBD-Pg/ -Source0: http://www.cpan.org/authors/id/D/DB/DBDPG/DBD-Pg-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/DBD-Pg-%{version}.tar.gz Patch0: perl-DBD-1.31-fixver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,9 +58,27 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 4 2009 Stepan Kasal - 2.13.1-1 +- new upstream release, also fixes #498899 + +* Thu Feb 26 2009 Fedora Release Engineering - 2.11.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Dec 5 2008 Stepan Kasal - 2.11.6-2 +- fix the source URL + +* Fri Dec 5 2008 Marcela Ma??l????ov?? - 2.11.6-1 +- update + +* Fri Oct 31 2008 Marcela Maslanova - 2.11.2-1 +- update to 2.11.2 + * Mon Aug 29 2008 Marcela Maslanova - 2.10.0-1 - update to 2.10.0 +* Mon Aug 25 2008 Marcela Maslanova - 2.9.2-1 +- update to 2.9.2 + * Mon Jul 28 2008 Marcela Maslanova - 2.8.7-1 - new version has Pg.pm twice in two locations - update Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sources 29 Aug 2008 08:25:36 -0000 1.20 +++ sources 4 May 2009 12:36:27 -0000 1.21 @@ -1 +1 @@ -92df1b25572d7df889edf5f508f3809c DBD-Pg-2.10.0.tar.gz +4e16c70109146d18a11a5170d30b305a DBD-Pg-2.13.1.tar.gz From kasal at fedoraproject.org Mon May 4 12:37:28 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 4 May 2009 12:37:28 +0000 (UTC) Subject: rpms/perl-DBD-Pg/F-10 .cvsignore, 1.21, 1.22 perl-DBD-Pg.spec, 1.48, 1.49 sources, 1.22, 1.23 Message-ID: <20090504123728.D3A71700DB@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-DBD-Pg/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1619 Modified Files: .cvsignore perl-DBD-Pg.spec sources Log Message: new upstream release, also fixes #498899 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-10/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 5 Dec 2008 14:38:43 -0000 1.21 +++ .cvsignore 4 May 2009 12:36:58 -0000 1.22 @@ -1 +1 @@ -DBD-Pg-2.11.6.tar.gz +DBD-Pg-2.13.1.tar.gz Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-10/perl-DBD-Pg.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- perl-DBD-Pg.spec 5 Dec 2008 14:47:27 -0000 1.48 +++ perl-DBD-Pg.spec 4 May 2009 12:36:58 -0000 1.49 @@ -1,6 +1,6 @@ Name: perl-DBD-Pg -Version: 2.11.6 -Release: 2%{?dist} +Version: 2.13.1 +Release: 1%{?dist} Summary: A PostgreSQL interface for perl Group: Development/Libraries @@ -58,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 4 2009 Stepan Kasal - 2.13.1-1 +- new upstream release, also fixes #498899 + +* Thu Feb 26 2009 Fedora Release Engineering - 2.11.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Dec 5 2008 Stepan Kasal - 2.11.6-2 - fix the source URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-10/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 5 Dec 2008 14:38:44 -0000 1.22 +++ sources 4 May 2009 12:36:58 -0000 1.23 @@ -1 +1 @@ -477c5f3811e21af5636aa2926ac92ce5 DBD-Pg-2.11.6.tar.gz +4e16c70109146d18a11a5170d30b305a DBD-Pg-2.13.1.tar.gz From kasal at fedoraproject.org Mon May 4 12:38:37 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 4 May 2009 12:38:37 +0000 (UTC) Subject: rpms/perl-DBD-Pg/F-11 .cvsignore, 1.21, 1.22 perl-DBD-Pg.spec, 1.49, 1.50 sources, 1.22, 1.23 Message-ID: <20090504123837.4D015700DB@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-DBD-Pg/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1993 Modified Files: .cvsignore perl-DBD-Pg.spec sources Log Message: new upstream release, also fixes #498899 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-11/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 5 Dec 2008 14:35:52 -0000 1.21 +++ .cvsignore 4 May 2009 12:38:06 -0000 1.22 @@ -1 +1 @@ -DBD-Pg-2.11.6.tar.gz +DBD-Pg-2.13.1.tar.gz Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-11/perl-DBD-Pg.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- perl-DBD-Pg.spec 26 Feb 2009 14:08:08 -0000 1.49 +++ perl-DBD-Pg.spec 4 May 2009 12:38:06 -0000 1.50 @@ -1,6 +1,6 @@ Name: perl-DBD-Pg -Version: 2.11.6 -Release: 3%{?dist} +Version: 2.13.1 +Release: 1%{?dist} Summary: A PostgreSQL interface for perl Group: Development/Libraries @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 4 2009 Stepan Kasal - 2.13.1-1 +- new upstream release, also fixes #498899 + * Thu Feb 26 2009 Fedora Release Engineering - 2.11.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-11/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 5 Dec 2008 14:35:52 -0000 1.22 +++ sources 4 May 2009 12:38:06 -0000 1.23 @@ -1 +1 @@ -477c5f3811e21af5636aa2926ac92ce5 DBD-Pg-2.11.6.tar.gz +4e16c70109146d18a11a5170d30b305a DBD-Pg-2.13.1.tar.gz From transif at fedoraproject.org Mon May 4 12:45:24 2009 From: transif at fedoraproject.org (Transifex System User) Date: Mon, 4 May 2009 12:45:24 +0000 (UTC) Subject: comps/po sk.po,1.21,1.22 Message-ID: <20090504124524.6372470135@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3105/po Modified Files: sk.po Log Message: Sending translation for Slovak View full diff with command: /usr/bin/cvs -f diff -kk -u -p -N -r 1.21 -r 1.22 sk.po Index: sk.po =================================================================== RCS file: /cvs/pkgs/comps/po/sk.po,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sk.po 29 Apr 2009 20:00:23 -0000 1.21 +++ sk.po 4 May 2009 12:44:52 -0000 1.22 @@ -1,25 +1,24 @@ # Slovak messages for comp-po # Copyright (C) 2003, 2004 Marcel Telka # This file is distributed under the same license as the comp-po package. -# # $Id$ -# # Marcel Telka , 2003, 2004. # Pavol ??imo , 2007. # Ondrej ??ulek , 2008, 2009. + msgid "" msgstr "" "Project-Id-Version: comp-po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-04-02 15:00+0200\n" +"POT-Creation-Date: 2009-05-04 08:09+0000\n" +"PO-Revision-Date: 2009-05-04 11:24+0200\n" "Last-Translator: Ondrej ??ulek \n" -"Language-Team: Slovak \n" +"Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Lokalize 0.3\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 ../comps-f11.xml.in.h:1 @@ -1306,19 +1305,16 @@ msgid "Amazigh Support" msgstr "Berbersk?? podpora" #: ../comps-f11.xml.in.h:13 -#, fuzzy msgid "Azerbaijani Support" -msgstr "Srbsk?? podpora" +msgstr "??zerbajd????nsk?? podpora" #: ../comps-f11.xml.in.h:27 -#, fuzzy msgid "Chichewa Support" -msgstr "????nska podpora" +msgstr "Chichewa podpora" #: ../comps-f11.xml.in.h:31 -#, fuzzy msgid "Coptic Support" -msgstr "Chorv??tska podpora" +msgstr "Koptick?? podpora" #: ../comps-f11.xml.in.h:37 msgid "Design and Simulation tools for hardware engineers" @@ -1329,9 +1325,8 @@ msgid "Electronic Lab" msgstr "Elektronick?? laborat??rium" #: ../comps-f11.xml.in.h:58 -#, fuzzy msgid "Fijian Support" -msgstr "Frisk?? podpora" +msgstr "Fid??sk?? podpora" #: ../comps-f11.xml.in.h:61 msgid "Font design and packaging" @@ -1346,47 +1341,40 @@ msgid "Friulian Support" msgstr "Friulsk?? podpora" #: ../comps-f11.xml.in.h:83 -#, fuzzy msgid "Hiligaynon Support" -msgstr "Filip??nska podpora" +msgstr "Hiligaynon podpora" #: ../comps-f11.xml.in.h:96 -#, fuzzy msgid "Interlingua Support" -msgstr "Talianska podpora" +msgstr "Interlingua podpora" #: ../comps-f11.xml.in.h:109 -#, fuzzy msgid "Kazakh Support" -msgstr "Kanadsk?? podpora" +msgstr "Kaza??sk?? podpora" #: ../comps-f11.xml.in.h:111 msgid "Kinyarwanda Support" msgstr "Rwandsk?? podpora" #: ../comps-f11.xml.in.h:118 -#, fuzzy msgid "Latin Support" -msgstr "Litovsk?? podpora" +msgstr "Latinsk?? podpora" #: ../comps-f11.xml.in.h:126 -#, fuzzy msgid "Luxembourgish Support" -msgstr "Tureck?? podpora" +msgstr "Luxembursk?? podpora" #: ../comps-f11.xml.in.h:130 msgid "Malagasy Support" msgstr "Malagajsk?? podpora" #: ../comps-f11.xml.in.h:133 -#, fuzzy msgid "Maltese Support" -msgstr "Malajsk?? podpora" +msgstr "Maltsk?? podpora" #: ../comps-f11.xml.in.h:134 -#, fuzzy msgid "Manx Support" -msgstr "Malajsk?? podpora" +msgstr "Manx podpora" #: ../comps-f11.xml.in.h:137 msgid "MinGW cross-compiler" @@ -1405,14 +1393,12 @@ msgid "Online Help and Documentation" msgstr "Online pomocn??k a dokument??cia" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "??panielska podpora" +msgstr "Sanskrit podpora" #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "Ukrajinsk?? podpora" +msgstr "Sard??nska podpora" #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" @@ -1435,14 +1421,12 @@ msgstr "" "Objective CAML." #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "Podpora swati" +msgstr "Swahilsk?? podpora" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "Podpora telugu" +msgstr "Tetum podpora" #: ../comps-f11.xml.in.h:223 msgid "" @@ -1531,3902 +1515,3 @@ msgstr "XEmacs" msgid "" "This group is a collection of tools and resources of Czech environments." msgstr "T??to skupina je kolekciou n??strojov a zdrojov ??esk??ch prostred??." - -#~ msgid "British Support" -#~ msgstr "Britsk?? podpora" - -#~ msgid "Cluster Storage" -#~ msgstr "??lo??isko klastra" - -#~ msgid "Clustering Support." -#~ msgstr "Podpora klastrov." - -#~ msgid "Libraries for applications built on older releases." -#~ msgstr "Kni??nice pre aplik??cie zostaven?? v star????ch vydaniach." - -#~ msgid "Miscellaneous Included Packages" -#~ msgstr "R??zne obsiahnut?? bal????ky" - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "Bal????ky poskytuj??ce podporu pre ulo??isk?? klastrov." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "Bal????ky poskytuj??ce podporu pre jednoduch?? uzly GFS." - -#~ msgid "Single Node GFS Support" -#~ msgstr "Podpora jednoduch??ho uzla GFS" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "" -#~ "Tieto bal????ky poskytuj?? podporu kompatibility s predch??dzaj??cimi " -#~ "vydaniami." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "Prostredia pre beh a v??voj aplik??ci?? v Jave" - -#~ msgid "Misc" [...3665 lines suppressed...] -#~ msgstr "" -#~ " false false " -#~ " compat-db " -#~ "compat-libgcc-295 compat-libgcc-296 compat-libgcc-32 compat-libstdc++-295 compat-libstdc++-296 compat-libstdc++-32 compat-" -#~ "pwdb compat-slang openssl096b mail-server <_name>Po??tov?? server <_description>Tieto bal??ky v??m umo??nia nakonfigurova?? IMAP alebo " -#~ "po??tov?? server Postfix." - -#, fuzzy -#~ msgid "" -#~ " false false " -#~ "si Deployment_Guide-si-LK fonts-sinhala m17n-db-" -#~ "sinhala scim-bridge-gtk scim-m17n scim-qtimm scim-sinhala slovak-support " -#~ "<_name>Slovak Support <_description>" -#~ msgstr "" -#~ " true false " -#~ " isdn4k-utils " -#~ "lrzsz minicom ppp " -#~ "statserial wvdial dutch-" -#~ "support <_name>Holandsk?? podpora <_description>" - -#, fuzzy -#~ msgid "" -#~ " false false " -#~ "sl aspell-sl fonts-ISO8859-2 fonts-ISO8859-2-100dpi fonts-ISO8859-2-" -#~ "75dpi kde-i18n-Slovenian " -#~ "sound-and-video <_name>Sound and Video " -#~ "<_description>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 "" -#~ " false false " -#~ " fonts-" -#~ "ISO8859-2-75dpi fonts-xorg-ISO8859-9-100dpi fonts-xorg-ISO8859-9-75dpi icelandic-support " -#~ "<_name>Islandsk?? podpora <_description>" - -#, fuzzy -#~ msgid "" -#~ " false false " -#~ "ta Deployment_Guide-ta-IN fonts-tamil kde-i18n-Tamil m17n-db-tamil scim-bridge-gtk scim-m17n " -#~ "scim-qtimm " -#~ " telugu-support <_name>Telugu " -#~ "Support <_description>" -#~ msgstr "" -#~ " true false " -#~ " isdn4k-utils " -#~ "lrzsz minicom ppp " -#~ "statserial wvdial dutch-" -#~ "support <_name>Holandsk?? podpora <_description>" - -#, fuzzy -#~ msgid "" -#~ " false false " -#~ "th m17n-" -#~ "db-thai scim-bridge-gtk scim-m17n scim-qtimm turkish-support <_name>Turkish " -#~ "Support <_description>" -#~ msgstr "" -#~ " false false " -#~ "pl ISO8859-2-support aspell-pl kde-i18n-Polish man-pages-pl portuguese-support " -#~ "<_name>Portugalsk?? podpora <_description>" - -#, fuzzy -#~ msgid "" -#~ " false false " -#~ "zh Deployment_Guide-zh-CN Deployment_Guide-zh-TW fonts-chinese kde-i18n-Chinese kde-i18n-Chinese-Big5 lv m17n-db-chinese scim-bridge-gtk scim-chewing scim-chinese-standard " -#~ "scim-" -#~ "pinyin scim-" -#~ "qtimm scim-tables-chinese stardict bogl " -#~ "bogl-bterm core <_name>Core <_description>Smallest " -#~ "possible installation" -#~ msgstr "" -#~ " false false " -#~ " anaconda " -#~ "anaconda-help anaconda-product anaconda-runtime bitmap-" -#~ "fonts-cjk bogl bogl-bterm booty busybox-anaconda " -#~ "dietlibc " -#~ "joe kernel kernel-smp lilo sg3_utils mysql " -#~ "<_name>Datab??za MySQL <_description>T??to skupina bal??kov obsahuje " -#~ "bal??ky vhodn?? pre pou??itie s MySQL." - -#~ msgid "Cups" -#~ msgstr "Cups" - -#~ msgid "Cups printing service and drivers to use it." -#~ msgstr "Tla??ov?? slu??ba cups a ovl??da??e na jej pou??itie." - -#~ msgid "SQL Database Server" -#~ msgstr "Datab??zov?? server SQL" - -#~ msgid "Supported Packages" -#~ msgstr "Podporovan?? bal??ky" - -#~ msgid "" -#~ "These packages include network-based servers such as CIPE, DHCP, and " -#~ "telnet." -#~ msgstr "Tieto bal??ky obsahuj?? sie??ov?? servery, napr. CIPE, DHCP a telnet." - -#~ msgid "This package group allows you to run an SQL server on the system." -#~ msgstr "T??to skupina bal??kov v??m umo??n?? spusti?? na po????ta??i SQL server." - -#~ msgid "GNOME Desktop" -#~ msgstr "Pracovn?? plocha GNOME" - -#~ msgid "" -#~ "These packages include network-based servers such as DHCP and telnet." -#~ msgstr "Tieto bal??ky obsahuj?? sie??ov?? servery, napr. DHCP a telnet." - -#~ msgid "" -#~ " false false " -#~ "sk ISO8859-2-support kde-i18n-Slovak " -#~ " slovenian-support <_name>Slovenian Support " -#~ "<_description>" -#~ msgstr "" -#~ " false false " -#~ "sk ISO8859-2-support kde-i18n-Slovak " -#~ " slovenian-support <_name>Slovinsk?? podpora " -#~ "<_description>" - -#~ msgid "" -#~ " false false " -#~ " fonts-KOI8-R " -#~ "fonts-KOI8-R-100dpi " -#~ "fonts-xorg-cyrillic czech-support " -#~ "<_name>Czech Support <_description>" -#~ msgstr "" -#~ " false false " -#~ " fonts-KOI8-R " -#~ "fonts-KOI8-R-100dpi " -#~ "fonts-xorg-cyrillic czech-support " -#~ "<_name>??esk?? podpora <_description>" From mbarnes at fedoraproject.org Mon May 4 12:54:33 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 12:54:33 +0000 (UTC) Subject: rpms/gtkhtml3/devel .cvsignore, 1.94, 1.95 gtkhtml3.spec, 1.149, 1.150 sources, 1.94, 1.95 Message-ID: <20090504125433.18CFF700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/gtkhtml3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5038 Modified Files: .cvsignore gtkhtml3.spec sources Log Message: * Mon May 04 2009 Matthew Barnes - 3.27.1-1.fc12 - Update to 3.27.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v retrieving revision 1.94 retrieving revision 1.95 diff -u -p -r1.94 -r1.95 --- .cvsignore 14 Apr 2009 15:07:10 -0000 1.94 +++ .cvsignore 4 May 2009 12:54:02 -0000 1.95 @@ -1 +1 @@ -gtkhtml-3.26.1.1.tar.bz2 +gtkhtml-3.27.1.tar.bz2 Index: gtkhtml3.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -p -r1.149 -r1.150 --- gtkhtml3.spec 14 Apr 2009 14:59:29 -0000 1.149 +++ gtkhtml3.spec 4 May 2009 12:54:02 -0000 1.150 @@ -9,7 +9,7 @@ ### Abstract ### Name: gtkhtml3 -Version: 3.26.1.1 +Version: 3.27.1 Release: 1%{?dist} Group: System Environment/Libraries Summary: GtkHTML library @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Mon May 04 2009 Matthew Barnes - 3.27.1-1.fc12 +- Update to 3.27.1 + * Tue Apr 14 2009 Matthew Barnes - 3.26.1.1-1.fc11 - Update to 3.26.1.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v retrieving revision 1.94 retrieving revision 1.95 diff -u -p -r1.94 -r1.95 --- sources 14 Apr 2009 15:07:11 -0000 1.94 +++ sources 4 May 2009 12:54:02 -0000 1.95 @@ -1 +1 @@ -fd5a76c425d3010af38dea5f36d84438 gtkhtml-3.26.1.1.tar.bz2 +69482ef7975c6c8b16963df1d21f2136 gtkhtml-3.27.1.tar.bz2 From mbarnes at fedoraproject.org Mon May 4 12:56:11 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 12:56:11 +0000 (UTC) Subject: rpms/evolution/devel .cvsignore, 1.112, 1.113 evolution.spec, 1.383, 1.384 sources, 1.112, 1.113 Message-ID: <20090504125611.EE1BE700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5366 Modified Files: .cvsignore evolution.spec sources Log Message: * Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - Bump evo_major to 2.28. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v retrieving revision 1.112 retrieving revision 1.113 diff -u -p -r1.112 -r1.113 --- .cvsignore 15 Apr 2009 15:05:41 -0000 1.112 +++ .cvsignore 4 May 2009 12:55:41 -0000 1.113 @@ -1 +1 @@ -evolution-2.26.1.1.tar.bz2 +evolution-data-server-2.27.1.tar.bz2 Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.383 retrieving revision 1.384 diff -u -p -r1.383 -r1.384 --- evolution.spec 27 Apr 2009 06:18:21 -0000 1.383 +++ evolution.spec 4 May 2009 12:55:41 -0000 1.384 @@ -16,7 +16,7 @@ %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.26 +%define evo_major 2.28 %define exchange_support 1 %define inline_audio_support 1 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.26.1.1 -Release: 2%{?dist} +Version: 2.27.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -691,6 +691,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 +- Update to 2.27.1 +- Bump evo_major to 2.28. + * Mon Apr 27 2009 Matthias Clasen - 2.26.1-2.fc11 - Don't drop schemas translations from po files Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v retrieving revision 1.112 retrieving revision 1.113 diff -u -p -r1.112 -r1.113 --- sources 15 Apr 2009 15:05:41 -0000 1.112 +++ sources 4 May 2009 12:55:41 -0000 1.113 @@ -1 +1 @@ -e24b8c13d350c17ab8332482f60aa144 evolution-2.26.1.1.tar.bz2 +aaba865951d49a337dc53a8d56f1f0ed evolution-data-server-2.27.1.tar.bz2 From mbarnes at fedoraproject.org Mon May 4 12:56:22 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 12:56:22 +0000 (UTC) Subject: rpms/evolution-exchange/devel .cvsignore, 1.41, 1.42 evolution-exchange.spec, 1.59, 1.60 sources, 1.41, 1.42 Message-ID: <20090504125622.9C68F700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-exchange/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5404 Modified Files: .cvsignore evolution-exchange.spec sources Log Message: * Mon May 02 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - Bump evo_major to 2.28. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- .cvsignore 14 Apr 2009 16:29:24 -0000 1.41 +++ .cvsignore 4 May 2009 12:55:52 -0000 1.42 @@ -1 +1 @@ -evolution-exchange-2.26.1.tar.bz2 +evolution-exchange-2.27.1.tar.bz2 Index: evolution-exchange.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- evolution-exchange.spec 14 Apr 2009 16:29:25 -0000 1.59 +++ evolution-exchange.spec 4 May 2009 12:55:52 -0000 1.60 @@ -1,7 +1,7 @@ %define intltool_version 0.35.5 %define libsoup_version 2.3.0 -%define evo_major 2.26 +%define evo_major 2.28 %define eds_major 1.2 # Make sure the evolution package is upgraded first, or else this variable @@ -20,7 +20,7 @@ ### Abstract ### Name: evolution-exchange -Version: 2.26.1 +Version: 2.27.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Evolution plugin to interact with MS Exchange Server @@ -151,6 +151,10 @@ gconftool-2 --makefile-install-rule %{_s %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas %changelog +* Mon May 02 2009 Matthew Barnes - 2.27.1-1.fc12 +- Update to 2.27.1 +- Bump evo_major to 2.28. + * Mon Apr 13 2009 Matthew Barnes - 2.26.1-1.fc11 - Update to 2.26.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- sources 14 Apr 2009 16:29:25 -0000 1.41 +++ sources 4 May 2009 12:55:52 -0000 1.42 @@ -1 +1 @@ -9333f3e0558aaf331d61493b7bae23ae evolution-exchange-2.26.1.tar.bz2 +bc930437d534dd1e63ad48fb76aa8067 evolution-exchange-2.27.1.tar.bz2 From mbarnes at fedoraproject.org Mon May 4 12:58:04 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 12:58:04 +0000 (UTC) Subject: rpms/evolution-data-server/devel .cvsignore, 1.106, 1.107 evolution-data-server.spec, 1.261, 1.262 sources, 1.106, 1.107 Message-ID: <20090504125804.6B8D2700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-data-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5746 Modified Files: .cvsignore evolution-data-server.spec sources Log Message: * Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - Bump evo_major to 2.28. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.106 retrieving revision 1.107 diff -u -p -r1.106 -r1.107 --- .cvsignore 15 Apr 2009 14:55:40 -0000 1.106 +++ .cvsignore 4 May 2009 12:57:33 -0000 1.107 @@ -1 +1 @@ -evolution-data-server-2.26.1.1.tar.bz2 +evolution-data-server-2.27.1.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.261 retrieving revision 1.262 diff -u -p -r1.261 -r1.262 --- evolution-data-server.spec 15 Apr 2009 14:55:40 -0000 1.261 +++ evolution-data-server.spec 4 May 2009 12:57:33 -0000 1.262 @@ -15,7 +15,7 @@ %define soup_version 2.3.0 %define sqlite_version 3.5 -%define eds_base_version 2.26 +%define eds_base_version 2.28 %define eds_api_version 1.2 %define use_gnome_keyring 1 @@ -30,7 +30,7 @@ ### Abstract ### Name: evolution-data-server -Version: 2.26.1.1 +Version: 2.27.1 Release: 1%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -381,6 +381,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 +- Update to 2.27.1 +- Bump evo_major to 2.28. + * Wed Apr 15 2009 Matthew Barnes - 2.26.1.1-1.fc11 - Update to 2.26.1.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v retrieving revision 1.106 retrieving revision 1.107 diff -u -p -r1.106 -r1.107 --- sources 15 Apr 2009 14:55:41 -0000 1.106 +++ sources 4 May 2009 12:57:33 -0000 1.107 @@ -1 +1 @@ -0d626ddc09116f25fe5b42bd38b7f440 evolution-data-server-2.26.1.1.tar.bz2 +aaba865951d49a337dc53a8d56f1f0ed evolution-data-server-2.27.1.tar.bz2 From jskala at fedoraproject.org Mon May 4 13:06:48 2009 From: jskala at fedoraproject.org (Jiri Skala) Date: Mon, 4 May 2009 13:06:48 +0000 (UTC) Subject: rpms/quagga/devel quagga-0.99.11-asn32.patch, NONE, 1.1 quagga.spec, 1.48, 1.49 Message-ID: <20090504130648.A6F5A700DB@cvs1.fedora.phx.redhat.com> Author: jskala Update of /cvs/extras/rpms/quagga/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7303 Modified Files: quagga.spec Added Files: quagga-0.99.11-asn32.patch Log Message: * Mon May 04 2009 Jiri Skala - 0.99.11-2 - fix #498832 - bgpd crashes on as paths containing more 6 digit as numbers quagga-0.99.11-asn32.patch: --- NEW FILE quagga-0.99.11-asn32.patch --- diff -up quagga-0.99.11/bgpd/bgp_aspath.c.asn32 quagga-0.99.11/bgpd/bgp_aspath.c --- quagga-0.99.11/bgpd/bgp_aspath.c.asn32 2009-05-04 14:52:13.000000000 +0200 +++ quagga-0.99.11/bgpd/bgp_aspath.c 2009-05-04 14:52:24.000000000 +0200 @@ -549,7 +549,7 @@ aspath_make_str_count (struct aspath *as * With 32bit ASNs, this range will increase, but only worth changing * once there are significant numbers of ASN >= 100000 */ -#define ASN_STR_LEN (5 + 1) +#define ASN_STR_LEN (10 + 1) str_size = MAX (assegment_count_asns (seg, 0) * ASN_STR_LEN + 2 + 1, ASPATH_STR_DEFAULT_LEN); str_buf = XMALLOC (MTYPE_AS_STR, str_size); Index: quagga.spec =================================================================== RCS file: /cvs/extras/rpms/quagga/devel/quagga.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- quagga.spec 25 Feb 2009 18:18:10 -0000 1.48 +++ quagga.spec 4 May 2009 13:06:18 -0000 1.49 @@ -39,8 +39,8 @@ Group: System Environment/Daemons Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz Source1: quagga-filter-perl-requires.sh Patch2: quagga-0.96.5-nostart.patch -#Patch6: quagga-0.98.5-pie.patch Patch7: quagga-0.99.9-initscript.patch +Patch8: quagga-0.99.11-asn32.patch URL: http://www.quagga.net %if %with_snmp @@ -93,11 +93,10 @@ developing OSPF-API and quagga applicati %prep %setup -q -#%patch0 -p1 -b .lib64 %patch2 -p1 -b .nostart # This creates a .diff file that we apply after configuring -#%patch6 -p1 %patch7 -p1 -b .initscript +%patch8 -p1 -b .asn32 %build # FC5+ automatic -fstack-protector-all switch @@ -348,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 04 2009 Jiri Skala - 0.99.11-2 +- fix #498832 - bgpd crashes on as paths containing more 6 digit as numbers + * Wed Feb 25 2009 Fedora Release Engineering - 0:0.99.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jskala at fedoraproject.org Mon May 4 13:16:25 2009 From: jskala at fedoraproject.org (Jiri Skala) Date: Mon, 4 May 2009 13:16:25 +0000 (UTC) Subject: rpms/quagga/F-10 quagga-0.99.10-asn32.patch, NONE, 1.1 quagga.spec, 1.46, 1.47 Message-ID: <20090504131625.3B3E470131@cvs1.fedora.phx.redhat.com> Author: jskala Update of /cvs/extras/rpms/quagga/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8937 Modified Files: quagga.spec Added Files: quagga-0.99.10-asn32.patch Log Message: * Mon May 04 2009 Jiri Skala - 0.99.10-3 - fixes #498832 - bgpd crashes on as paths containing more 6 digit as numbers quagga-0.99.10-asn32.patch: --- NEW FILE quagga-0.99.10-asn32.patch --- diff -up quagga-0.99.10/bgpd/bgp_aspath.c.asn32 quagga-0.99.10/bgpd/bgp_aspath.c --- quagga-0.99.10/bgpd/bgp_aspath.c.asn32 2009-05-04 15:10:48.000000000 +0200 +++ quagga-0.99.10/bgpd/bgp_aspath.c 2009-05-04 15:11:10.000000000 +0200 @@ -549,7 +549,7 @@ aspath_make_str_count (struct aspath *as * With 32bit ASNs, this range will increase, but only worth changing * once there are significant numbers of ASN >= 100000 */ -#define ASN_STR_LEN (5 + 1) +#define ASN_STR_LEN (10 + 1) str_size = MAX (assegment_count_asns (seg, 0) * ASN_STR_LEN + 2 + 1, ASPATH_STR_DEFAULT_LEN); str_buf = XMALLOC (MTYPE_AS_STR, str_size); Index: quagga.spec =================================================================== RCS file: /cvs/extras/rpms/quagga/F-10/quagga.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -r1.46 -r1.47 --- quagga.spec 3 Sep 2008 19:46:03 -0000 1.46 +++ quagga.spec 4 May 2009 13:15:54 -0000 1.47 @@ -32,15 +32,15 @@ Summary: Routing daemon Name: quagga Version: 0.99.10 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 License: GPLv2+ Group: System Environment/Daemons Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz Source1: quagga-filter-perl-requires.sh Patch2: quagga-0.96.5-nostart.patch -#Patch6: quagga-0.98.5-pie.patch Patch7: quagga-0.99.9-initscript.patch +Patch8: quagga-0.99.10-asn32.patch URL: http://www.quagga.net %if %with_snmp @@ -93,11 +93,10 @@ developing OSPF-API and quagga applicati %prep %setup -q -#%patch0 -p1 -b .lib64 %patch2 -p1 -b .nostart # This creates a .diff file that we apply after configuring -#%patch6 -p1 %patch7 -p1 -b .initscript +%patch8 -p1 -b .asn32 %build # FC5+ automatic -fstack-protector-all switch @@ -348,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 04 2009 Jiri Skala - 0.99.10-3 +- fixes #498832 - bgpd crashes on as paths containing more 6 digit as numbers + * Wed Sep 3 2008 Tom "spot" Callaway - 0.99.10-2 - fix license tag From jskala at fedoraproject.org Mon May 4 13:22:13 2009 From: jskala at fedoraproject.org (Jiri Skala) Date: Mon, 4 May 2009 13:22:13 +0000 (UTC) Subject: rpms/quagga/devel quagga.spec,1.49,1.50 Message-ID: <20090504132213.18C00700DB@cvs1.fedora.phx.redhat.com> Author: jskala Update of /cvs/extras/rpms/quagga/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10616 Modified Files: quagga.spec Log Message: * Mon May 04 2009 Jiri Skala - 0.99.11-3 - fix #498832 - bgpd crashes on as paths containing more 6 digit as numbers - corrected release number Index: quagga.spec =================================================================== RCS file: /cvs/extras/rpms/quagga/devel/quagga.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- quagga.spec 4 May 2009 13:06:18 -0000 1.49 +++ quagga.spec 4 May 2009 13:21:42 -0000 1.50 @@ -32,7 +32,7 @@ Summary: Routing daemon Name: quagga Version: 0.99.11 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 License: GPLv2+ Group: System Environment/Daemons @@ -347,8 +347,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon May 04 2009 Jiri Skala - 0.99.11-2 +* Mon May 04 2009 Jiri Skala - 0.99.11-3 - fix #498832 - bgpd crashes on as paths containing more 6 digit as numbers +- corrected release number * Wed Feb 25 2009 Fedora Release Engineering - 0:0.99.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jskala at fedoraproject.org Mon May 4 13:25:54 2009 From: jskala at fedoraproject.org (Jiri Skala) Date: Mon, 4 May 2009 13:25:54 +0000 (UTC) Subject: rpms/quagga/F-11 quagga-0.99.11-asn32.patch, NONE, 1.1 quagga.spec, 1.48, 1.49 Message-ID: <20090504132554.DC1C6700DB@cvs1.fedora.phx.redhat.com> Author: jskala Update of /cvs/extras/rpms/quagga/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11235 Modified Files: quagga.spec Added Files: quagga-0.99.11-asn32.patch Log Message: * Mon May 04 2009 Jiri Skala - 0:0.99.11-3 - fixes #498832 - bgpd crashes on as paths containing more 6 digit as numbers quagga-0.99.11-asn32.patch: --- NEW FILE quagga-0.99.11-asn32.patch --- diff -up quagga-0.99.11/bgpd/bgp_aspath.c.asn32 quagga-0.99.11/bgpd/bgp_aspath.c --- quagga-0.99.11/bgpd/bgp_aspath.c.asn32 2009-05-04 15:16:34.000000000 +0200 +++ quagga-0.99.11/bgpd/bgp_aspath.c 2009-05-04 15:17:01.000000000 +0200 @@ -549,7 +549,7 @@ aspath_make_str_count (struct aspath *as * With 32bit ASNs, this range will increase, but only worth changing * once there are significant numbers of ASN >= 100000 */ -#define ASN_STR_LEN (5 + 1) +#define ASN_STR_LEN (10 + 1) str_size = MAX (assegment_count_asns (seg, 0) * ASN_STR_LEN + 2 + 1, ASPATH_STR_DEFAULT_LEN); str_buf = XMALLOC (MTYPE_AS_STR, str_size); Index: quagga.spec =================================================================== RCS file: /cvs/extras/rpms/quagga/F-11/quagga.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- quagga.spec 25 Feb 2009 18:18:10 -0000 1.48 +++ quagga.spec 4 May 2009 13:25:24 -0000 1.49 @@ -32,15 +32,15 @@ Summary: Routing daemon Name: quagga Version: 0.99.11 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 License: GPLv2+ Group: System Environment/Daemons Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz Source1: quagga-filter-perl-requires.sh Patch2: quagga-0.96.5-nostart.patch -#Patch6: quagga-0.98.5-pie.patch Patch7: quagga-0.99.9-initscript.patch +Patch8: quagga-0.99.11-asn32.patch URL: http://www.quagga.net %if %with_snmp @@ -93,11 +93,10 @@ developing OSPF-API and quagga applicati %prep %setup -q -#%patch0 -p1 -b .lib64 %patch2 -p1 -b .nostart # This creates a .diff file that we apply after configuring -#%patch6 -p1 %patch7 -p1 -b .initscript +%patch8 -p1 -b .asn32 %build # FC5+ automatic -fstack-protector-all switch @@ -348,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 04 2009 Jiri Skala - 0:0.99.11-3 +- fixes #498832 - bgpd crashes on as paths containing more 6 digit as numbers + * Wed Feb 25 2009 Fedora Release Engineering - 0:0.99.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Mon May 4 13:44:22 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 13:44:22 +0000 (UTC) Subject: rpms/qt/devel qt-x11-opensource-src-4.5.1-mysql_config.patch, NONE, 1.1 qt.spec, 1.273, 1.274 qt-x11-opensource-src-4.5.1-mysql_config-1.patch, 1.1, NONE Message-ID: <20090504134422.8AAC3700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13457 Modified Files: qt.spec Added Files: qt-x11-opensource-src-4.5.1-mysql_config.patch Removed Files: qt-x11-opensource-src-4.5.1-mysql_config-1.patch Log Message: better mysql_config patch, use --pkglibdir if available qt-x11-opensource-src-4.5.1-mysql_config.patch: --- NEW FILE qt-x11-opensource-src-4.5.1-mysql_config.patch --- diff -up qt-x11-opensource-src-4.5.1/configure.mysql_config qt-x11-opensource-src-4.5.1/configure --- qt-x11-opensource-src-4.5.1/configure.mysql_config 2009-05-04 08:30:42.198097263 -0500 +++ qt-x11-opensource-src-4.5.1/configure 2009-05-04 08:31:22.977827199 -0500 @@ -4334,6 +4334,7 @@ if [ "$CFG_ACCESSIBILITY" = "auto" ]; th CFG_ACCESSIBILITY=yes fi +set -x # auto-detect SQL-modules support for _SQLDR in $CFG_SQL_AVAILABLE; do case $_SQLDR in @@ -4342,8 +4343,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config` if [ -x "$CFG_MYSQL_CONFIG" ]; then QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` + $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \ + QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` + if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then + QT_LFLAGS_MYSQL_R="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient_r" + QT_LFLAGS_MYSQL="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient" + else QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` + fi QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` fi Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.273 retrieving revision 1.274 diff -u -p -r1.273 -r1.274 --- qt.spec 4 May 2009 00:44:04 -0000 1.273 +++ qt.spec 4 May 2009 13:43:52 -0000 1.274 @@ -55,7 +55,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix # http://bugzilla.redhat.com/440673 # well, not quite upstreamable yet, not but it's a first try... # until mysql_config can export a usable linker flags -Patch54: qt-x11-opensource-src-4.5.1-mysql_config-1.patch +Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch ## qt-copy patches %define qt_copy 20090424 --- qt-x11-opensource-src-4.5.1-mysql_config-1.patch DELETED --- From rdieter at fedoraproject.org Mon May 4 13:55:26 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 13:55:26 +0000 (UTC) Subject: rpms/qt/devel qt.spec,1.274,1.275 Message-ID: <20090504135526.784E4700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15634 Modified Files: qt.spec Log Message: mysql_config patch is upstream-worthy now, provided mysql --pkglibdir support lands upstream too Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.274 retrieving revision 1.275 diff -u -p -r1.274 -r1.275 --- qt.spec 4 May 2009 13:43:52 -0000 1.274 +++ qt.spec 4 May 2009 13:54:56 -0000 1.275 @@ -53,8 +53,6 @@ Patch52: qt-4.5-sparc64.patch Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch # fix invalid assumptions about mysql_config --libs # http://bugzilla.redhat.com/440673 -# well, not quite upstreamable yet, not but it's a first try... -# until mysql_config can export a usable linker flags Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch ## qt-copy patches From tmraz at fedoraproject.org Mon May 4 14:02:19 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 4 May 2009 14:02:19 +0000 (UTC) Subject: rpms/gnutls/devel .cvsignore, 1.20, 1.21 gnutls.spec, 1.42, 1.43 sources, 1.20, 1.21 Message-ID: <20090504140219.2866A700DB@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/gnutls/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16785 Modified Files: .cvsignore gnutls.spec sources Log Message: * Mon May 4 2009 Tomas Mraz 2.6.6-1 - upgrade to a new upstream version - security fixes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- .cvsignore 14 Apr 2009 07:53:54 -0000 1.20 +++ .cvsignore 4 May 2009 14:01:48 -0000 1.21 @@ -1 +1 @@ -gnutls-2.6.5-nosrp.tar.bz2 +gnutls-2.6.6-nosrp.tar.bz2 Index: gnutls.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -p -r1.42 -r1.43 --- gnutls.spec 14 Apr 2009 07:53:54 -0000 1.42 +++ gnutls.spec 4 May 2009 14:01:48 -0000 1.43 @@ -1,6 +1,6 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.6.5 +Version: 2.6.6 Release: 1%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ @@ -149,6 +149,9 @@ fi %{_datadir}/guile/site/gnutls.scm %changelog +* Mon May 4 2009 Tomas Mraz 2.6.6-1 +- upgrade to a new upstream version - security fixes + * Tue Apr 14 2009 Tomas Mraz 2.6.5-1 - upgrade to a new upstream version, minor bugfixes only Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sources 14 Apr 2009 07:53:54 -0000 1.20 +++ sources 4 May 2009 14:01:48 -0000 1.21 @@ -1 +1 @@ -3fc710671d1fe0df2d2f660672cc9ab2 gnutls-2.6.5-nosrp.tar.bz2 +32bbbd459d3572dc97b9a93399fae3fe gnutls-2.6.6-nosrp.tar.bz2 From jskala at fedoraproject.org Mon May 4 14:09:38 2009 From: jskala at fedoraproject.org (Jiri Skala) Date: Mon, 4 May 2009 14:09:38 +0000 (UTC) Subject: rpms/vsftpd/devel vsftpd-2.1.0-trim.patch, NONE, 1.1 vsftpd-2.1.0-userlistdelay.patch, NONE, 1.1 vsftpd-2.1.1-daemonize_plus.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 vsftpd.spec, 1.88, 1.89 Message-ID: <20090504140938.C1E55700DB@cvs1.fedora.phx.redhat.com> Author: jskala Update of /cvs/extras/rpms/vsftpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18007 Modified Files: .cvsignore sources vsftpd.spec Added Files: vsftpd-2.1.0-trim.patch vsftpd-2.1.0-userlistdelay.patch vsftpd-2.1.1-daemonize_plus.patch Log Message: * Wed Apr 22 2009 Jiri Skala - 2.1.0-3 - updated to latest upstream version - improved daemonizing - init script gets correct return code if binding fails - trim white spaces from option values - fixed #483604 - vsftpd not honouring delay_failed_login when userlist active vsftpd-2.1.0-trim.patch: --- NEW FILE vsftpd-2.1.0-trim.patch --- diff -up vsftpd-2.1.0/parseconf.c.trim vsftpd-2.1.0/parseconf.c --- vsftpd-2.1.0/parseconf.c.trim 2009-03-24 15:50:47.000000000 +0100 +++ vsftpd-2.1.0/parseconf.c 2009-03-24 15:51:10.000000000 +0100 @@ -273,7 +273,7 @@ handle_config_setting(struct mystr* p_se } else { - *p_curr_setting = str_strdup(p_value_str); + *p_curr_setting = str_strdup_trimmed(p_value_str); } return; } diff -up vsftpd-2.1.0/str.c.trim vsftpd-2.1.0/str.c --- vsftpd-2.1.0/str.c.trim 2009-03-24 15:50:34.000000000 +0100 +++ vsftpd-2.1.0/str.c 2009-03-24 15:54:07.000000000 +0100 @@ -89,6 +89,18 @@ str_strdup(const struct mystr* p_str) return vsf_sysutil_strdup(str_getbuf(p_str)); } +const char* +str_strdup_trimmed(const struct mystr* p_str) +{ + const char* p_trimmed = str_getbuf(p_str); + int h, t, newlen; + + for (h = 0; h < (int)str_getlen(p_str) && vsf_sysutil_isspace(p_trimmed[h]); h++) ; + for (t = str_getlen(p_str) - 1; t >= 0 && vsf_sysutil_isspace(p_trimmed[t]); t--) ; + newlen = t - h + 1; + return newlen ? vsf_sysutil_strndup(p_trimmed+h, (unsigned int)newlen) : 0L; +} + void str_alloc_alt_term(struct mystr* p_str, const char* p_src, char term) { diff -up vsftpd-2.1.0/str.h.trim vsftpd-2.1.0/str.h --- vsftpd-2.1.0/str.h.trim 2009-03-24 15:50:31.000000000 +0100 +++ vsftpd-2.1.0/str.h 2009-03-24 15:51:48.000000000 +0100 @@ -31,6 +31,7 @@ void str_alloc_ulong(struct mystr* p_str void str_alloc_filesize_t(struct mystr* p_str, filesize_t the_filesize); void str_copy(struct mystr* p_dest, const struct mystr* p_src); const char* str_strdup(const struct mystr* p_str); +const char* str_strdup_trimmed(const struct mystr* p_str); void str_empty(struct mystr* p_str); void str_free(struct mystr* p_str); void str_trunc(struct mystr* p_str, unsigned int trunc_len); diff -up vsftpd-2.1.0/sysutil.c.trim vsftpd-2.1.0/sysutil.c --- vsftpd-2.1.0/sysutil.c.trim 2009-03-24 15:50:19.000000000 +0100 +++ vsftpd-2.1.0/sysutil.c 2009-03-24 15:52:53.000000000 +0100 @@ -1031,6 +1031,18 @@ vsf_sysutil_strdup(const char* p_str) return strdup(p_str); } +char* +vsf_sysutil_strndup(const char* p_str, unsigned int p_len) +{ + char *new = (char *)malloc(p_len+1); + + if (new == NULL) + return NULL; + + new[p_len]='\0'; + return (char *)memcpy(new, p_str, p_len); +} + void vsf_sysutil_memclr(void* p_dest, unsigned int size) { diff -up vsftpd-2.1.0/sysutil.h.trim vsftpd-2.1.0/sysutil.h --- vsftpd-2.1.0/sysutil.h.trim 2009-03-24 15:50:23.000000000 +0100 +++ vsftpd-2.1.0/sysutil.h 2009-03-24 15:52:14.000000000 +0100 @@ -184,6 +184,7 @@ int vsf_sysutil_wait_get_exitcode( /* Various string functions */ unsigned int vsf_sysutil_strlen(const char* p_text); char* vsf_sysutil_strdup(const char* p_str); +char* vsf_sysutil_strndup(const char* p_str, unsigned int p_len); void vsf_sysutil_memclr(void* p_dest, unsigned int size); void vsf_sysutil_memcpy(void* p_dest, const void* p_src, const unsigned int size); vsftpd-2.1.0-userlistdelay.patch: --- NEW FILE vsftpd-2.1.0-userlistdelay.patch --- diff -pruN vsftpd-2.1.0.orig/prelogin.c vsftpd-2.1.0/prelogin.c --- vsftpd-2.1.0.orig/prelogin.c 2009-04-12 16:00:09.000000000 +0200 +++ vsftpd-2.1.0/prelogin.c 2009-04-12 16:13:57.000000000 +0200 @@ -217,6 +217,7 @@ handle_user_command(struct vsf_session* if ((located && tunable_userlist_deny) || (!located && !tunable_userlist_deny)) { + check_login_delay(); vsf_cmdio_write(p_sess, FTP_LOGINERR, "Permission denied."); check_login_fails(p_sess); if (tunable_userlist_log) vsftpd-2.1.1-daemonize_plus.patch: --- NEW FILE vsftpd-2.1.1-daemonize_plus.patch --- diff -up vsftpd-2.1.1/standalone.c.daemonize_plus vsftpd-2.1.1/standalone.c --- vsftpd-2.1.1/standalone.c.daemonize_plus 2009-04-29 17:46:52.000000000 +0200 +++ vsftpd-2.1.1/standalone.c 2009-04-29 17:46:52.000000000 +0200 @@ -26,6 +26,8 @@ static unsigned int s_ipaddr_size; static void handle_sigchld(void* duff); static void handle_sighup(void* duff); +static void handle_sigusr1(int sig); +static void handle_sigalrm(int sig); static void prepare_child(int sockfd); static unsigned int handle_ip_count(void* p_raw_addr); static void drop_ip_count(void* p_raw_addr); @@ -50,7 +52,13 @@ vsf_standalone_main(void) if (forkret > 0) { /* Parent, just exit */ - vsf_sysutil_exit(0); + vsf_sysutil_sigaction(kVSFSysUtilSigALRM, handle_sigalrm); + vsf_sysutil_sigaction(kVSFSysUtilSigUSR1, handle_sigusr1); + + vsf_sysutil_set_alarm(3); + vsf_sysutil_pause(); + + vsf_sysutil_exit(1); } /* Son, close standard FDs to avoid SSH hang-on-exit */ vsf_sysutil_reopen_standard_fds(); @@ -98,6 +106,10 @@ vsf_standalone_main(void) { die("could not bind listening IPv4 socket"); } + else + { + vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1); + } } else { @@ -127,6 +139,10 @@ vsf_standalone_main(void) { die("could not bind listening IPv6 socket"); } + else + { + vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1); + } } vsf_sysutil_close(0); vsf_sysutil_close(1); @@ -252,6 +268,20 @@ handle_sighup(void* duff) vsf_parseconf_load_file(0, 0); } +static void +handle_sigalrm(int sig) +{ + (void)sig; // avoid unused parameter error + vsf_sysutil_exit(1); +} + +static void +handle_sigusr1(int sig) +{ + (void)sig; // avoid unused parameter error + vsf_sysutil_exit(0); +} + static unsigned int hash_ip(unsigned int buckets, void* p_key) { diff -up vsftpd-2.1.1/sysutil.c.daemonize_plus vsftpd-2.1.1/sysutil.c --- vsftpd-2.1.1/sysutil.c.daemonize_plus 2009-02-26 02:44:29.000000000 +0100 +++ vsftpd-2.1.1/sysutil.c 2009-04-29 17:46:52.000000000 +0200 @@ -201,6 +201,9 @@ vsf_sysutil_translate_sig(const enum EVS case kVSFSysUtilSigHUP: realsig = SIGHUP; break; + case kVSFSysUtilSigUSR1: + realsig = SIGUSR1; + break; default: bug("unknown signal in vsf_sysutil_translate_sig"); break; @@ -538,6 +541,12 @@ vsf_sysutil_getpid(void) return (unsigned int) s_current_pid; } +unsigned int +vsf_sysutil_getppid(void) +{ + return (unsigned int)getppid(); +} + int vsf_sysutil_fork(void) { @@ -1031,6 +1040,18 @@ vsf_sysutil_strdup(const char* p_str) return strdup(p_str); } +char* +vsf_sysutil_strndup(const char* p_str, unsigned int p_len) +{ + char *new = (char *)malloc(p_len+1); + + if (new == NULL) + return NULL; + + new[p_len]='\0'; + return (char *)memcpy(new, p_str, p_len); +} + void vsf_sysutil_memclr(void* p_dest, unsigned int size) { @@ -2774,3 +2795,23 @@ vsf_sysutil_set_no_fds() die("setrlimit NOFILE"); } } + +void +vsf_sysutil_sigaction(const enum EVSFSysUtilSignal sig, void (*p_handlefunc)(int)) +{ + int realsig = vsf_sysutil_translate_sig(sig); + vsf_sysutil_set_sighandler(realsig, p_handlefunc); +} + +int +vsf_sysutil_kill(int pid, int sig) +{ + int realsig = vsf_sysutil_translate_sig(sig); + return kill(pid, realsig); +} + +int +vsf_sysutil_pause() +{ + return pause(); +} diff -up vsftpd-2.1.1/sysutil.h.daemonize_plus vsftpd-2.1.1/sysutil.h --- vsftpd-2.1.1/sysutil.h.daemonize_plus 2009-02-26 02:47:41.000000000 +0100 +++ vsftpd-2.1.1/sysutil.h 2009-04-29 17:46:52.000000000 +0200 @@ -29,7 +29,8 @@ enum EVSFSysUtilSignal kVSFSysUtilSigCHLD, kVSFSysUtilSigPIPE, kVSFSysUtilSigURG, - kVSFSysUtilSigHUP + kVSFSysUtilSigHUP, + kVSFSysUtilSigUSR1 }; enum EVSFSysUtilInterruptContext { @@ -164,6 +165,7 @@ void vsf_sysutil_free(void* p_ptr); /* Process creation/exit/process handling */ unsigned int vsf_sysutil_getpid(void); +unsigned int vsf_sysutil_getppid(void); int vsf_sysutil_fork(void); int vsf_sysutil_fork_failok(void); void vsf_sysutil_exit(int exit_code); @@ -180,10 +182,14 @@ int vsf_sysutil_wait_exited_normally( const struct vsf_sysutil_wait_retval* p_waitret); int vsf_sysutil_wait_get_exitcode( const struct vsf_sysutil_wait_retval* p_waitret); +void vsf_sysutil_sigaction(const enum EVSFSysUtilSignal sig, void (*p_handlefunc)(int)); +int vsf_sysutil_kill(int pid, int sig); +int vsf_sysutil_pause(); /* Various string functions */ unsigned int vsf_sysutil_strlen(const char* p_text); char* vsf_sysutil_strdup(const char* p_str); +char* vsf_sysutil_strndup(const char* p_str, unsigned int p_len); void vsf_sysutil_memclr(void* p_dest, unsigned int size); void vsf_sysutil_memcpy(void* p_dest, const void* p_src, const unsigned int size); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vsftpd/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- .cvsignore 24 Feb 2009 08:21:29 -0000 1.17 +++ .cvsignore 4 May 2009 14:09:07 -0000 1.18 @@ -1 +1 @@ -vsftpd-2.1.0.tar.gz +vsftpd-2.1.1pre1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/vsftpd/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- sources 24 Feb 2009 08:21:29 -0000 1.17 +++ sources 4 May 2009 14:09:07 -0000 1.18 @@ -1 +1 @@ -7890b54e7ffa6106ffbdfda53f47fa41 vsftpd-2.1.0.tar.gz +ea57505bf438eef6d4f53d4dc7fe8574 vsftpd-2.1.1pre1.tar.gz Index: vsftpd.spec =================================================================== RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -r1.88 -r1.89 --- vsftpd.spec 26 Feb 2009 00:52:32 -0000 1.88 +++ vsftpd.spec 4 May 2009 14:09:08 -0000 1.89 @@ -1,15 +1,16 @@ %{!?tcp_wrappers:%define tcp_wrappers 1} +%{!?pretag:%define pretag pre1} Name: vsftpd -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.1.1 +Release: 0.1.%{pretag}%{?dist} Summary: Very Secure Ftp Daemon Group: System Environment/Daemons # OpenSSL link exception License: GPLv2 with exceptions URL: http://vsftpd.beasts.org/ -Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz +Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}%{pretag}.tar.gz Source1: vsftpd.xinetd Source2: vsftpd.pam Source3: vsftpd.ftpusers @@ -46,6 +47,9 @@ Patch7: vsftpd-2.1.0-filter.patch Patch8: vsftpd-2.0.5-greedy.patch Patch9: vsftpd-2.1.0-userlist_log.patch +Patch10: vsftpd-2.1.1-daemonize_plus.patch +Patch11: vsftpd-2.1.0-trim.patch +Patch12: vsftpd-2.1.0-userlistdelay.patch %description vsftpd is a Very Secure FTP daemon. It was written completely from @@ -67,6 +71,9 @@ cp %{SOURCE1} . %patch7 -p1 -b .filter %patch8 -p1 -b .greedy %patch9 -p1 -b .userlist_log +%patch10 -p1 -b .daemonize_plus +%patch11 -p1 -b .trim +%patch12 -p1 -b .userlistdelay %build @@ -132,6 +139,12 @@ fi %changelog +* Wed Apr 22 2009 Jiri Skala - 2.1.0-3 +- updated to latest upstream version +- improved daemonizing - init script gets correct return code if binding fails +- trim white spaces from option values +- fixed #483604 - vsftpd not honouring delay_failed_login when userlist active + * Wed Feb 25 2009 Fedora Release Engineering - 2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Mon May 4 14:16:01 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 14:16:01 +0000 (UTC) Subject: rpms/qt/devel qt-x11-opensource-src-4.5.1-mysql_config.patch, 1.1, 1.2 Message-ID: <20090504141601.EAC9A700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19789 Modified Files: qt-x11-opensource-src-4.5.1-mysql_config.patch Log Message: simplify patch a bit, avoiding excessive calls to mysql_config qt-x11-opensource-src-4.5.1-mysql_config.patch: Index: qt-x11-opensource-src-4.5.1-mysql_config.patch =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.1-mysql_config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qt-x11-opensource-src-4.5.1-mysql_config.patch 4 May 2009 13:43:52 -0000 1.1 +++ qt-x11-opensource-src-4.5.1-mysql_config.patch 4 May 2009 14:16:01 -0000 1.2 @@ -1,6 +1,6 @@ diff -up qt-x11-opensource-src-4.5.1/configure.mysql_config qt-x11-opensource-src-4.5.1/configure ---- qt-x11-opensource-src-4.5.1/configure.mysql_config 2009-05-04 08:30:42.198097263 -0500 -+++ qt-x11-opensource-src-4.5.1/configure 2009-05-04 08:31:22.977827199 -0500 +--- qt-x11-opensource-src-4.5.1/configure.mysql_config 2009-05-04 09:14:37.105826464 -0500 ++++ qt-x11-opensource-src-4.5.1/configure 2009-05-04 09:15:26.747077312 -0500 @@ -4334,6 +4334,7 @@ if [ "$CFG_ACCESSIBILITY" = "auto" ]; th CFG_ACCESSIBILITY=yes fi @@ -16,8 +16,8 @@ diff -up qt-x11-opensource-src-4.5.1/con + $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \ + QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` + if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then -+ QT_LFLAGS_MYSQL_R="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient_r" -+ QT_LFLAGS_MYSQL="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient" ++ QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r" ++ QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient" + else QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` From steved at fedoraproject.org Mon May 4 14:16:55 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Mon, 4 May 2009 14:16:55 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-nfs41-v2.6.30-rc4.patch, NONE, 1.1.2.1 config-generic, 1.282, 1.282.2.1 kernel.spec, 1.1539, 1.1539.2.1 Message-ID: <20090504141655.6DA00700DB@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19882 Modified Files: Tag: kernel-2_6_30-nfs41_rc4 config-generic kernel.spec Added Files: Tag: kernel-2_6_30-nfs41_rc4 linux-2.6-nfs41-v2.6.30-rc4.patch Log Message: Updated to latest NFS41 code (v2.6.30-rc4) linux-2.6-nfs41-v2.6.30-rc4.patch: --- NEW FILE linux-2.6-nfs41-v2.6.30-rc4.patch --- diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index 8dd6db7..f15621e 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX @@ -66,6 +66,10 @@ mandatory-locking.txt - info on the Linux implementation of Sys V mandatory file locking. ncpfs.txt - info on Novell Netware(tm) filesystem using NCP protocol. +nfs41-server.txt + - info on the Linux server implementation of NFSv4 minor version 1. +nfs-rdma.txt + - how to install and setup the Linux NFS/RDMA client and server software. nfsroot.txt - short guide on setting up a diskless box with NFS root filesystem. nilfs2.txt diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index e67f3ec..5d6d6f4 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -74,6 +74,15 @@ config NFS_V4 If unsure, say N. +config NFS_V4_1 + bool "NFS client support for NFSv4.1 (DEVELOPER ONLY)" + depends on NFS_V4 && EXPERIMENTAL + help + This option enables support for minor version 1 of the NFSv4 protocol + (draft-ietf-nfsv4-minorversion1) in the kernel's NFS client. + + Unless you're an NFS developer, say N. + config ROOT_NFS bool "Root file system on NFS" depends on NFS_FS=y && IP_PNP diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index a886e69..972e38b 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -17,6 +17,9 @@ #include #include #include +#if defined(CONFIG_NFS_V4_1) +#include +#endif #include @@ -28,11 +31,12 @@ struct nfs_callback_data { unsigned int users; + struct svc_serv *serv; struct svc_rqst *rqst; struct task_struct *task; }; -static struct nfs_callback_data nfs_callback_info; +static struct nfs_callback_data nfs_callback_info[NFS4_MAX_MINOR_VERSION + 1]; static DEFINE_MUTEX(nfs_callback_mutex); static struct svc_program nfs4_callback_program; @@ -56,10 +60,10 @@ module_param_call(callback_tcpport, param_set_port, param_get_int, &nfs_callback_set_tcpport, 0644); /* - * This is the callback kernel thread. + * This is the NFSv4 callback kernel thread. */ static int -nfs_callback_svc(void *vrqstp) +nfs4_callback_svc(void *vrqstp) { int err, preverr = 0; struct svc_rqst *rqstp = vrqstp; @@ -97,20 +101,12 @@ nfs_callback_svc(void *vrqstp) } /* - * Bring up the callback thread if it is not already up. + * Prepare to bring up the NFSv4 callback service */ -int nfs_callback_up(void) +struct svc_rqst * +nfs4_callback_up(struct svc_serv *serv) { - struct svc_serv *serv = NULL; - int ret = 0; - - mutex_lock(&nfs_callback_mutex); - if (nfs_callback_info.users++ || nfs_callback_info.task != NULL) - goto out; - serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL); - ret = -ENOMEM; - if (!serv) - goto out_err; + int ret; ret = svc_create_xprt(serv, "tcp", PF_INET, nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); @@ -131,23 +127,149 @@ int nfs_callback_up(void) goto out_err; #endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */ - nfs_callback_info.rqst = svc_prepare_thread(serv, &serv->sv_pools[0]); - if (IS_ERR(nfs_callback_info.rqst)) { - ret = PTR_ERR(nfs_callback_info.rqst); - nfs_callback_info.rqst = NULL; + return svc_prepare_thread(serv, &serv->sv_pools[0]); + +out_err: + if (ret == 0) + ret = -ENOMEM; + return ERR_PTR(ret); +} + +#if defined(CONFIG_NFS_V4_1) +/* + * The callback service for NFSv4.1 callbacks + */ +static int +nfs41_callback_svc(void *vrqstp) +{ + struct svc_rqst *rqstp = vrqstp; + struct svc_serv *serv = rqstp->rq_server; + struct rpc_rqst *req; + int error; + DEFINE_WAIT(wq); + + set_freezable(); + + /* + * FIXME: do we really need to run this under the BKL? If so, please + * add a comment about what it's intended to protect. + */ + lock_kernel(); + while (!kthread_should_stop()) { + prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE); + spin_lock_bh(&serv->sv_cb_lock); + if (!list_empty(&serv->sv_cb_list)) { + req = list_first_entry(&serv->sv_cb_list, + struct rpc_rqst, rq_bc_list); + list_del(&req->rq_bc_list); + spin_unlock_bh(&serv->sv_cb_lock); + dprintk("Invoking bc_svc_process()\n"); + error = bc_svc_process(serv, req, rqstp); + dprintk("bc_svc_process() returned w/ error code= %d\n", + error); + } else { + spin_unlock_bh(&serv->sv_cb_lock); + schedule(); + } + finish_wait(&serv->sv_cb_waitq, &wq); + } + unlock_kernel(); + return 0; +} + +/* + * Bring up the NFSv4.1 callback service + */ +struct svc_rqst * +nfs41_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt) +{ + struct svc_xprt *bc_xprt; + struct svc_rqst *rqstp = ERR_PTR(-ENOMEM); + + dprintk("--> %s\n", __func__); + /* Create a svc_sock for the service */ + bc_xprt = svc_sock_create(serv, xprt->prot); + if (!bc_xprt) + goto out; + + /* + * Save the svc_serv in the transport so that it can + * be referenced when the session backchannel is initialized + */ + serv->bc_xprt = bc_xprt; + xprt->bc_serv = serv; + + INIT_LIST_HEAD(&serv->sv_cb_list); + spin_lock_init(&serv->sv_cb_lock); + init_waitqueue_head(&serv->sv_cb_waitq); + rqstp = svc_prepare_thread(serv, &serv->sv_pools[0]); + if (IS_ERR(rqstp)) + svc_sock_destroy(bc_xprt); +out: + dprintk("--> %s return %p\n", __func__, rqstp); + return rqstp; +} +#endif /* CONFIG_NFS_V4_1 */ + +/* + * Bring up the callback thread if it is not already up. + */ +int nfs_callback_up(u32 minorversion, void *args) +{ + struct svc_serv *serv = NULL; [...9890 lines suppressed...] + len = sock->ops->sendpage(sock, virt_to_page(xbufp->head[0].iov_base), + (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK, + xbufp->head[0].iov_len, flags); + + if (len != xbufp->head[0].iov_len) + goto out; + + /* + * send page data + * + * Check the amount of data to be sent. If it is less than the + * remaining page, then send it else send the current page + */ + + size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen; + while (pglen > 0) { + if (total_len == size) + flags = 0; + result = sock->ops->sendpage(sock, *pages, base, size, flags); + if (result > 0) + len += result; + if (result != size) + goto out; + total_len -= size; + pglen -= size; + size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen; + base = 0; + pages++; + } + /* + * send tail + */ + if (xbufp->tail[0].iov_len) { + result = sock->ops->sendpage(sock, + xbufp->tail[0].iov_base, + (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK, + xbufp->tail[0].iov_len, + 0); + + if (result > 0) + len += result; + } +out: + if (len != xbufp->len) + printk(KERN_NOTICE "Error sending entire callback!\n"); + + return len; +} + +/* + * The send routine. Borrows from svc_send + */ +static int bc_send_request(struct rpc_task *task) +{ + struct rpc_rqst *req = task->tk_rqstp; + struct rpc_xprt *bc_xprt = req->rq_xprt; + struct svc_xprt *xprt; + struct svc_sock *svsk; + u32 len; + + dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid)); + /* + * Get the server socket associated with this callback xprt + */ + svsk = bc_xprt->bc_sock; + xprt = &svsk->sk_xprt; + + mutex_lock(&xprt->xpt_mutex); + if (test_bit(XPT_DEAD, &xprt->xpt_flags)) + len = -ENOTCONN; + else + len = bc_sendto(req); + mutex_unlock(&xprt->xpt_mutex); + + return 0; + +} + +/* + * The close routine. Since this is client initiated, we do nothing + */ + +static void bc_close(struct rpc_xprt *xprt) +{ + return; +} + +/* + * The xprt destroy routine. Again, because this connection is client + * initiated, we do nothing + */ + +static void bc_destroy(struct rpc_xprt *xprt) +{ + return; +} + static struct rpc_xprt_ops xs_udp_ops = { .set_buffer_size = xs_udp_set_buffer_size, .reserve_xprt = xprt_reserve_xprt_cong, @@ -1994,11 +2359,32 @@ static struct rpc_xprt_ops xs_tcp_ops = { .buf_free = rpc_free, .send_request = xs_tcp_send_request, .set_retrans_timeout = xprt_set_retrans_timeout_def, +#if defined(CONFIG_NFS_V4_1) + .release_request = bc_release_request, +#endif /* CONFIG_NFS_V4_1 */ .close = xs_tcp_shutdown, .destroy = xs_destroy, .print_stats = xs_tcp_print_stats, }; +/* + * The rpc_xprt_ops for the server backchannel + */ + +static struct rpc_xprt_ops bc_tcp_ops = { + .reserve_xprt = xprt_reserve_xprt, + .release_xprt = xprt_release_xprt, + .set_port = bc_set_port, + .connect = bc_connect, + .buf_alloc = bc_malloc, + .buf_free = bc_free, + .send_request = bc_send_request, + .set_retrans_timeout = xprt_set_retrans_timeout_def, + .close = bc_close, + .destroy = bc_destroy, + .print_stats = xs_tcp_print_stats, +}; + static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args, unsigned int slot_table_size) { @@ -2131,13 +2517,29 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32); xprt->max_payload = RPC_MAX_FRAGMENT_SIZE; - xprt->bind_timeout = XS_BIND_TO; - xprt->connect_timeout = XS_TCP_CONN_TO; - xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; - xprt->idle_timeout = XS_IDLE_DISC_TO; + if (args->bc_sock) { + /* backchannel */ + xprt_set_bound(xprt); + INIT_DELAYED_WORK(&transport->connect_worker, + bc_connect_worker); + xprt->bind_timeout = 0; + xprt->connect_timeout = 0; + xprt->reestablish_timeout = 0; + xprt->idle_timeout = (~0); - xprt->ops = &xs_tcp_ops; - xprt->timeout = &xs_tcp_default_timeout; + /* + * The backchannel uses the same socket connection as the + * forechannel + */ + xprt->bc_sock = args->bc_sock; + xprt->bc_sock->sk_bc_xprt = xprt; + transport->sock = xprt->bc_sock->sk_sock; + transport->inet = xprt->bc_sock->sk_sk; + + xprt->ops = &bc_tcp_ops; + + goto next; + } switch (addr->sa_family) { case AF_INET: @@ -2145,13 +2547,29 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) xprt_set_bound(xprt); INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4); - xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP); break; case AF_INET6: if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0)) xprt_set_bound(xprt); INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6); + break; + } + xprt->bind_timeout = XS_BIND_TO; + xprt->connect_timeout = XS_TCP_CONN_TO; + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; + xprt->idle_timeout = XS_IDLE_DISC_TO; + + xprt->ops = &xs_tcp_ops; + +next: + xprt->timeout = &xs_tcp_default_timeout; + + switch (addr->sa_family) { + case AF_INET: + xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP); + break; + case AF_INET6: xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6); break; default: Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.282 retrieving revision 1.282.2.1 diff -u -p -r1.282 -r1.282.2.1 --- config-generic 22 Apr 2009 15:40:04 -0000 1.282 +++ config-generic 4 May 2009 14:16:24 -0000 1.282.2.1 @@ -3145,6 +3145,7 @@ CONFIG_NFSD=m CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y +CONFIG_NFS_V4_1=y CONFIG_NFSD_TCP=y CONFIG_NFS_FSCACHE=y CONFIG_LOCKD=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1539 retrieving revision 1.1539.2.1 diff -u -p -r1.1539 -r1.1539.2.1 --- kernel.spec 1 May 2009 18:29:15 -0000 1.1539 +++ kernel.spec 4 May 2009 14:16:24 -0000 1.1539.2.1 @@ -12,7 +12,7 @@ Summary: The Linux kernel # that the kernel isn't the stock distribution kernel, for example, # by setting the define to ".local" or ".bz123456" # -# % define buildid .local +%define buildid .nfs41_rc4 # fedora_build defines which build revision of this kernel version we're # building. Rather than incrementing forever, as with the prior versioning @@ -86,7 +86,7 @@ Summary: The Linux kernel # kernel-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} # kernel-firmware -%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 0} +%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 1} # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # kernel-bootwrapper (for creating zImages from kernel + initrd) @@ -681,6 +681,7 @@ Patch9100: linux-2.6-iwl3945-remove-usel #snmp fixes Patch10000: linux-2.6-missing-rfc2465-stats.patch +Patch20000: linux-2.6-nfs41-v2.6.30-rc4.patch %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1243,6 +1244,8 @@ ApplyPatch linux-2.6-silence-acpi-blackl ApplyPatch linux-2.6-iwl3945-remove-useless-exports.patch +ApplyPatch linux-2.6-nfs41-v2.6.30-rc4.patch + # END OF PATCH APPLICATIONS %endif @@ -1836,6 +1839,9 @@ fi # ||----w | # || || %changelog +* Mon May 4 2009 Steve Dickson +- Updated to latest NFS41 code (v2.6.30-rc4) + * Fri May 01 2009 Eric Sandeen - Fix ext4 corruption on partial write into prealloc block From mtasaka at fedoraproject.org Mon May 4 14:17:20 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 4 May 2009 14:17:20 +0000 (UTC) Subject: rpms/uget/F-10 uget.desktop, NONE, 1.1 uget.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504141720.CD041700DB@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/uget/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20069/F-10 Modified Files: .cvsignore sources Added Files: uget.desktop uget.spec Log Message: Initial commit --- NEW FILE uget.desktop --- [Desktop Entry] Name=Uget Download Manager Comment=Download files from the internet Comment[de]=Dateien aus dem Internet herunterladen GenericName=Download Manager Exec=uget-gtk Icon=document-save Terminal=false Type=Application Categories=GTK;Network;FileTransfer; --- NEW FILE uget.spec --- Name: uget Version: 1.4.7 Release: 1%{?dist} Summary: Download manager using GTK+ and libcurl Group: Applications/Internet License: LGPLv2+ URL: http://urlget.sourceforge.net/ Source0: http://downloads.sourceforge.net/urlget/%{name}-%{version}.tar.gz Source1: uget.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: gtk2-devel BuildRequires: libcurl-devel %if 0%{?fedora} >= 11 # Let's obsolete urlgfe on F-11+ Obsoletes: urlgfe < 1.0.4 Provides: urlgfe = %{name}-%{version} %endif %description Uget is a download manager that allows you to import downloads from HTML files and classify them by categories. Every category has an independent configuration that can be inherited by each download in that category. Uget is the successor of urlgfe, which was called URLget before. %prep %setup -q chmod 0644 [A-Z]* %build %configure make -k %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install \ DESTDIR=$RPM_BUILD_ROOT \ INSTALL="install -p" desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %doc ChangeLog %doc README %{_bindir}/%{name}-gtk %{_datadir}/applications/%{name}.desktop %changelog * Mon May 4 2009 Mamoru Tasaka - 1.4.7-2 - More detailed summary/description suggested by Christoph Wickert * Sat May 2 2009 Mamoru Tasaka - 1.4.7-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uget/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:51:28 -0000 1.1 +++ .cvsignore 4 May 2009 14:16:50 -0000 1.2 @@ -0,0 +1 @@ +uget-1.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uget/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:51:28 -0000 1.1 +++ sources 4 May 2009 14:16:50 -0000 1.2 @@ -0,0 +1 @@ +e2bb31a1e1064db59ce7f341b9d7b013 uget-1.4.7.tar.gz From mtasaka at fedoraproject.org Mon May 4 14:17:21 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 4 May 2009 14:17:21 +0000 (UTC) Subject: rpms/uget/devel uget.desktop, NONE, 1.1 uget.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504141721.95B37700DB@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/uget/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20069/devel Modified Files: .cvsignore sources Added Files: uget.desktop uget.spec Log Message: Initial commit --- NEW FILE uget.desktop --- [Desktop Entry] Name=Uget Download Manager Comment=Download files from the internet Comment[de]=Dateien aus dem Internet herunterladen GenericName=Download Manager Exec=uget-gtk Icon=document-save Terminal=false Type=Application Categories=GTK;Network;FileTransfer; --- NEW FILE uget.spec --- Name: uget Version: 1.4.7 Release: 1%{?dist} Summary: Download manager using GTK+ and libcurl Group: Applications/Internet License: LGPLv2+ URL: http://urlget.sourceforge.net/ Source0: http://downloads.sourceforge.net/urlget/%{name}-%{version}.tar.gz Source1: uget.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: gtk2-devel BuildRequires: libcurl-devel %if 0%{?fedora} >= 11 # Let's obsolete urlgfe on F-11+ Obsoletes: urlgfe < 1.0.4 Provides: urlgfe = %{name}-%{version} %endif %description Uget is a download manager that allows you to import downloads from HTML files and classify them by categories. Every category has an independent configuration that can be inherited by each download in that category. Uget is the successor of urlgfe, which was called URLget before. %prep %setup -q chmod 0644 [A-Z]* %build %configure make -k %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install \ DESTDIR=$RPM_BUILD_ROOT \ INSTALL="install -p" desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %doc ChangeLog %doc README %{_bindir}/%{name}-gtk %{_datadir}/applications/%{name}.desktop %changelog * Mon May 4 2009 Mamoru Tasaka - 1.4.7-2 - More detailed summary/description suggested by Christoph Wickert * Sat May 2 2009 Mamoru Tasaka - 1.4.7-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uget/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:51:28 -0000 1.1 +++ .cvsignore 4 May 2009 14:16:51 -0000 1.2 @@ -0,0 +1 @@ +uget-1.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uget/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:51:28 -0000 1.1 +++ sources 4 May 2009 14:16:51 -0000 1.2 @@ -0,0 +1 @@ +e2bb31a1e1064db59ce7f341b9d7b013 uget-1.4.7.tar.gz From mtasaka at fedoraproject.org Mon May 4 14:17:21 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 4 May 2009 14:17:21 +0000 (UTC) Subject: rpms/uget/F-11 uget.desktop, NONE, 1.1 uget.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504141721.260D4700DB@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/uget/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20069/F-11 Modified Files: .cvsignore sources Added Files: uget.desktop uget.spec Log Message: Initial commit --- NEW FILE uget.desktop --- [Desktop Entry] Name=Uget Download Manager Comment=Download files from the internet Comment[de]=Dateien aus dem Internet herunterladen GenericName=Download Manager Exec=uget-gtk Icon=document-save Terminal=false Type=Application Categories=GTK;Network;FileTransfer; --- NEW FILE uget.spec --- Name: uget Version: 1.4.7 Release: 1%{?dist} Summary: Download manager using GTK+ and libcurl Group: Applications/Internet License: LGPLv2+ URL: http://urlget.sourceforge.net/ Source0: http://downloads.sourceforge.net/urlget/%{name}-%{version}.tar.gz Source1: uget.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: gtk2-devel BuildRequires: libcurl-devel %if 0%{?fedora} >= 11 # Let's obsolete urlgfe on F-11+ Obsoletes: urlgfe < 1.0.4 Provides: urlgfe = %{name}-%{version} %endif %description Uget is a download manager that allows you to import downloads from HTML files and classify them by categories. Every category has an independent configuration that can be inherited by each download in that category. Uget is the successor of urlgfe, which was called URLget before. %prep %setup -q chmod 0644 [A-Z]* %build %configure make -k %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install \ DESTDIR=$RPM_BUILD_ROOT \ INSTALL="install -p" desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %doc ChangeLog %doc README %{_bindir}/%{name}-gtk %{_datadir}/applications/%{name}.desktop %changelog * Mon May 4 2009 Mamoru Tasaka - 1.4.7-2 - More detailed summary/description suggested by Christoph Wickert * Sat May 2 2009 Mamoru Tasaka - 1.4.7-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uget/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:51:28 -0000 1.1 +++ .cvsignore 4 May 2009 14:16:50 -0000 1.2 @@ -0,0 +1 @@ +uget-1.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uget/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:51:28 -0000 1.1 +++ sources 4 May 2009 14:16:50 -0000 1.2 @@ -0,0 +1 @@ +e2bb31a1e1064db59ce7f341b9d7b013 uget-1.4.7.tar.gz From tmraz at fedoraproject.org Mon May 4 14:17:54 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 4 May 2009 14:17:54 +0000 (UTC) Subject: rpms/gnutls/F-11 .cvsignore, 1.20, 1.21 gnutls.spec, 1.42, 1.43 sources, 1.20, 1.21 Message-ID: <20090504141754.DBBF6700DB@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/gnutls/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20223 Modified Files: .cvsignore gnutls.spec sources Log Message: * Mon May 4 2009 Tomas Mraz 2.6.6-1 - upgrade to a new upstream version - security fixes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/F-11/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- .cvsignore 14 Apr 2009 07:53:54 -0000 1.20 +++ .cvsignore 4 May 2009 14:17:24 -0000 1.21 @@ -1 +1 @@ -gnutls-2.6.5-nosrp.tar.bz2 +gnutls-2.6.6-nosrp.tar.bz2 Index: gnutls.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/F-11/gnutls.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -p -r1.42 -r1.43 --- gnutls.spec 14 Apr 2009 07:53:54 -0000 1.42 +++ gnutls.spec 4 May 2009 14:17:24 -0000 1.43 @@ -1,6 +1,6 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.6.5 +Version: 2.6.6 Release: 1%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ @@ -149,6 +149,9 @@ fi %{_datadir}/guile/site/gnutls.scm %changelog +* Mon May 4 2009 Tomas Mraz 2.6.6-1 +- upgrade to a new upstream version - security fixes + * Tue Apr 14 2009 Tomas Mraz 2.6.5-1 - upgrade to a new upstream version, minor bugfixes only Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/F-11/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sources 14 Apr 2009 07:53:54 -0000 1.20 +++ sources 4 May 2009 14:17:24 -0000 1.21 @@ -1 +1 @@ -3fc710671d1fe0df2d2f660672cc9ab2 gnutls-2.6.5-nosrp.tar.bz2 +32bbbd459d3572dc97b9a93399fae3fe gnutls-2.6.6-nosrp.tar.bz2 From mtasaka at fedoraproject.org Mon May 4 14:19:48 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 4 May 2009 14:19:48 +0000 (UTC) Subject: rpms/uget/F-10 uget.spec,1.1,1.2 Message-ID: <20090504141948.5EEAE700DB@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/uget/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20905/F-10 Modified Files: uget.spec Log Message: Argh.. Index: uget.spec =================================================================== RCS file: /cvs/extras/rpms/uget/F-10/uget.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- uget.spec 4 May 2009 14:16:50 -0000 1.1 +++ uget.spec 4 May 2009 14:19:17 -0000 1.2 @@ -1,6 +1,6 @@ Name: uget Version: 1.4.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Download manager using GTK+ and libcurl Group: Applications/Internet From mtasaka at fedoraproject.org Mon May 4 14:19:48 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 4 May 2009 14:19:48 +0000 (UTC) Subject: rpms/uget/F-11 uget.spec,1.1,1.2 Message-ID: <20090504141948.8BBFF700DB@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/uget/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20905/F-11 Modified Files: uget.spec Log Message: Argh.. Index: uget.spec =================================================================== RCS file: /cvs/extras/rpms/uget/F-11/uget.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- uget.spec 4 May 2009 14:16:50 -0000 1.1 +++ uget.spec 4 May 2009 14:19:18 -0000 1.2 @@ -1,6 +1,6 @@ Name: uget Version: 1.4.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Download manager using GTK+ and libcurl Group: Applications/Internet From mtasaka at fedoraproject.org Mon May 4 14:19:49 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 4 May 2009 14:19:49 +0000 (UTC) Subject: rpms/uget/devel uget.spec,1.1,1.2 Message-ID: <20090504141949.0E659700DB@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/uget/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20905/devel Modified Files: uget.spec Log Message: Argh.. Index: uget.spec =================================================================== RCS file: /cvs/extras/rpms/uget/devel/uget.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- uget.spec 4 May 2009 14:16:51 -0000 1.1 +++ uget.spec 4 May 2009 14:19:18 -0000 1.2 @@ -1,6 +1,6 @@ Name: uget Version: 1.4.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Download manager using GTK+ and libcurl Group: Applications/Internet From ltinkl at fedoraproject.org Mon May 4 14:22:55 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 4 May 2009 14:22:55 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs.spec, 1.423, 1.424 sources, 1.78, 1.79 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.4, NONE kdelibs-4.2.2-bidi-kde#189161.patch, 1.1, NONE kdelibs-4.2.2-kde#180785-2.patch, 1.1, NONE kdelibs-4.2.2-kde#180785.patch, 1.1, NONE kdelibs-4.2.2-kio_http.patch, 1.1, NONE kdelibs-4.2.2-kjob.patch, 1.1, NONE kdelibs-4.2.2-plasma-focus.patch, 1.2, NONE Message-ID: <20090504142255.159EF700DB@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21787/F-10 Modified Files: kdelibs.spec sources Removed Files: kdelibs-4.2.0-kjs-gcc44-crash.patch kdelibs-4.2.2-bidi-kde#189161.patch kdelibs-4.2.2-kde#180785-2.patch kdelibs-4.2.2-kde#180785.patch kdelibs-4.2.2-kio_http.patch kdelibs-4.2.2-kjob.patch kdelibs-4.2.2-plasma-focus.patch Log Message: KDE 4.2.3 Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.423 retrieving revision 1.424 diff -u -p -r1.423 -r1.424 --- kdelibs.spec 28 Apr 2009 12:20:36 -0000 1.423 +++ kdelibs.spec 4 May 2009 14:22:24 -0000 1.424 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries -Version: 4.2.2 -Release: 13%{?dist} +Version: 4.2.3 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -80,18 +80,10 @@ Patch18: kdelibs-4.1.72-kstandarddirs.pa Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) -Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch -Patch100: kdelibs-4.2.2-kio_http.patch -Patch101: kdelibs-4.2.2-kjob.patch -Patch102: kdelibs-4.2.2-bidi-kde#189161.patch -Patch103: kdelibs-4.2.2-kde#180785.patch -Patch104: kdelibs-4.2.2-kde#180785-2.patch -Patch105: kdelibs-4.2.2-plasma-focus.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -226,17 +218,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi %patch20 -p1 -b .xxcmake %patch22 -p1 -b .kdepimlibs-cmake %patch23 -p1 -b .gcc44 -%patch24 -p1 -b .kjs-gcc44-crash %patch25 -p1 -b .gcc44-misc # upstream patches # 4.2 -%patch100 -p0 -b .kio_http -%patch101 -p0 -b .kjob -%patch102 -p4 -b .bidi-kde#189161 -%patch103 -p4 -b .kde#180785 -%patch104 -p4 -b .kde#180785-2 -%patch105 -p1 -b .kickoff-focus # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -422,6 +407,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 28 2009 Luk???? Tinkl - 4.2.2-13 - upstream patch to fix GCC4.4 crashes in kjs (kdebug:189809) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-10/sources,v retrieving revision 1.78 retrieving revision 1.79 diff -u -p -r1.78 -r1.79 --- sources 1 Apr 2009 17:50:32 -0000 1.78 +++ sources 4 May 2009 14:22:24 -0000 1.79 @@ -1 +1 @@ -ff54817efef952e8812c607f5089c2e1 kdelibs-4.2.2.tar.bz2 +73f76b0521dff7d9aaf1057499624a8d kdelibs-4.2.3.tar.bz2 --- kdelibs-4.2.0-kjs-gcc44-crash.patch DELETED --- --- kdelibs-4.2.2-bidi-kde#189161.patch DELETED --- --- kdelibs-4.2.2-kde#180785-2.patch DELETED --- --- kdelibs-4.2.2-kde#180785.patch DELETED --- --- kdelibs-4.2.2-kio_http.patch DELETED --- --- kdelibs-4.2.2-kjob.patch DELETED --- --- kdelibs-4.2.2-plasma-focus.patch DELETED --- From ltinkl at fedoraproject.org Mon May 4 14:22:55 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 4 May 2009 14:22:55 +0000 (UTC) Subject: rpms/kdelibs/F-9 kdelibs.spec, 1.398, 1.399 sources, 1.72, 1.73 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.4, NONE kdelibs-4.2.2-bidi-kde#189161.patch, 1.1, NONE kdelibs-4.2.2-kde#180785-2.patch, 1.1, NONE kdelibs-4.2.2-kde#180785.patch, 1.1, NONE kdelibs-4.2.2-kio_http.patch, 1.1, NONE kdelibs-4.2.2-kjob.patch, 1.1, NONE kdelibs-4.2.2-plasma-focus.patch, 1.2, NONE Message-ID: <20090504142255.C208A700DB@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21787/F-9 Modified Files: kdelibs.spec sources Removed Files: kdelibs-4.2.0-kjs-gcc44-crash.patch kdelibs-4.2.2-bidi-kde#189161.patch kdelibs-4.2.2-kde#180785-2.patch kdelibs-4.2.2-kde#180785.patch kdelibs-4.2.2-kio_http.patch kdelibs-4.2.2-kjob.patch kdelibs-4.2.2-plasma-focus.patch Log Message: KDE 4.2.3 Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.398 retrieving revision 1.399 diff -u -p -r1.398 -r1.399 --- kdelibs.spec 28 Apr 2009 12:20:38 -0000 1.398 +++ kdelibs.spec 4 May 2009 14:22:25 -0000 1.399 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries -Version: 4.2.2 -Release: 13%{?dist} +Version: 4.2.3 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -80,18 +80,10 @@ Patch18: kdelibs-4.1.72-kstandarddirs.pa Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) -Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch -Patch100: kdelibs-4.2.2-kio_http.patch -Patch101: kdelibs-4.2.2-kjob.patch -Patch102: kdelibs-4.2.2-bidi-kde#189161.patch -Patch103: kdelibs-4.2.2-kde#180785.patch -Patch104: kdelibs-4.2.2-kde#180785-2.patch -Patch105: kdelibs-4.2.2-plasma-focus.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -226,17 +218,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi %patch20 -p1 -b .xxcmake %patch22 -p1 -b .kdepimlibs-cmake %patch23 -p1 -b .gcc44 -%patch24 -p1 -b .kjs-gcc44-crash %patch25 -p1 -b .gcc44-misc # upstream patches # 4.2 -%patch100 -p0 -b .kio_http -%patch101 -p0 -b .kjob -%patch102 -p4 -b .bidi-kde#189161 -%patch103 -p4 -b .kde#180785 -%patch104 -p4 -b .kde#180785-2 -%patch105 -p1 -b .kickoff-focus # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -422,6 +407,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 28 2009 Luk???? Tinkl - 4.2.2-13 - upstream patch to fix GCC4.4 crashes in kjs (kdebug:189809) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-9/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -p -r1.72 -r1.73 --- sources 1 Apr 2009 17:52:26 -0000 1.72 +++ sources 4 May 2009 14:22:25 -0000 1.73 @@ -1 +1 @@ -ff54817efef952e8812c607f5089c2e1 kdelibs-4.2.2.tar.bz2 +73f76b0521dff7d9aaf1057499624a8d kdelibs-4.2.3.tar.bz2 --- kdelibs-4.2.0-kjs-gcc44-crash.patch DELETED --- --- kdelibs-4.2.2-bidi-kde#189161.patch DELETED --- --- kdelibs-4.2.2-kde#180785-2.patch DELETED --- --- kdelibs-4.2.2-kde#180785.patch DELETED --- --- kdelibs-4.2.2-kio_http.patch DELETED --- --- kdelibs-4.2.2-kjob.patch DELETED --- --- kdelibs-4.2.2-plasma-focus.patch DELETED --- From jskala at fedoraproject.org Mon May 4 14:37:37 2009 From: jskala at fedoraproject.org (Jiri Skala) Date: Mon, 4 May 2009 14:37:37 +0000 (UTC) Subject: rpms/vsftpd/devel vsftpd-2.1.1-daemonize_plus.patch, 1.1, 1.2 vsftpd.spec, 1.89, 1.90 Message-ID: <20090504143737.654B5700DB@cvs1.fedora.phx.redhat.com> Author: jskala Update of /cvs/extras/rpms/vsftpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24436 Modified Files: vsftpd-2.1.1-daemonize_plus.patch vsftpd.spec Log Message: * Mon May 04 2009 Jiri Skala - 2.1.1-0.2 - fixes daemonize patch vsftpd-2.1.1-daemonize_plus.patch: Index: vsftpd-2.1.1-daemonize_plus.patch =================================================================== RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.1-daemonize_plus.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- vsftpd-2.1.1-daemonize_plus.patch 4 May 2009 14:09:08 -0000 1.1 +++ vsftpd-2.1.1-daemonize_plus.patch 4 May 2009 14:37:06 -0000 1.2 @@ -1,6 +1,6 @@ diff -up vsftpd-2.1.1/standalone.c.daemonize_plus vsftpd-2.1.1/standalone.c ---- vsftpd-2.1.1/standalone.c.daemonize_plus 2009-04-29 17:46:52.000000000 +0200 -+++ vsftpd-2.1.1/standalone.c 2009-04-29 17:46:52.000000000 +0200 +--- vsftpd-2.1.1/standalone.c.daemonize_plus 2009-05-04 16:18:30.000000000 +0200 ++++ vsftpd-2.1.1/standalone.c 2009-05-04 16:18:30.000000000 +0200 @@ -26,6 +26,8 @@ static unsigned int s_ipaddr_size; static void handle_sigchld(void* duff); @@ -69,8 +69,8 @@ diff -up vsftpd-2.1.1/standalone.c.daemo hash_ip(unsigned int buckets, void* p_key) { diff -up vsftpd-2.1.1/sysutil.c.daemonize_plus vsftpd-2.1.1/sysutil.c ---- vsftpd-2.1.1/sysutil.c.daemonize_plus 2009-02-26 02:44:29.000000000 +0100 -+++ vsftpd-2.1.1/sysutil.c 2009-04-29 17:46:52.000000000 +0200 +--- vsftpd-2.1.1/sysutil.c.daemonize_plus 2009-05-04 16:18:30.000000000 +0200 ++++ vsftpd-2.1.1/sysutil.c 2009-05-04 16:18:30.000000000 +0200 @@ -201,6 +201,9 @@ vsf_sysutil_translate_sig(const enum EVS case kVSFSysUtilSigHUP: realsig = SIGHUP; @@ -94,26 +94,7 @@ diff -up vsftpd-2.1.1/sysutil.c.daemoniz int vsf_sysutil_fork(void) { -@@ -1031,6 +1040,18 @@ vsf_sysutil_strdup(const char* p_str) - return strdup(p_str); - } - -+char* -+vsf_sysutil_strndup(const char* p_str, unsigned int p_len) -+{ -+ char *new = (char *)malloc(p_len+1); -+ -+ if (new == NULL) -+ return NULL; -+ -+ new[p_len]='\0'; -+ return (char *)memcpy(new, p_str, p_len); -+} -+ - void - vsf_sysutil_memclr(void* p_dest, unsigned int size) - { -@@ -2774,3 +2795,23 @@ vsf_sysutil_set_no_fds() +@@ -2786,3 +2795,23 @@ vsf_sysutil_set_no_fds() die("setrlimit NOFILE"); } } @@ -138,8 +119,8 @@ diff -up vsftpd-2.1.1/sysutil.c.daemoniz + return pause(); +} diff -up vsftpd-2.1.1/sysutil.h.daemonize_plus vsftpd-2.1.1/sysutil.h ---- vsftpd-2.1.1/sysutil.h.daemonize_plus 2009-02-26 02:47:41.000000000 +0100 -+++ vsftpd-2.1.1/sysutil.h 2009-04-29 17:46:52.000000000 +0200 +--- vsftpd-2.1.1/sysutil.h.daemonize_plus 2009-05-04 16:18:30.000000000 +0200 ++++ vsftpd-2.1.1/sysutil.h 2009-05-04 16:23:47.000000000 +0200 @@ -29,7 +29,8 @@ enum EVSFSysUtilSignal kVSFSysUtilSigCHLD, kVSFSysUtilSigPIPE, @@ -158,7 +139,7 @@ diff -up vsftpd-2.1.1/sysutil.h.daemoniz int vsf_sysutil_fork(void); int vsf_sysutil_fork_failok(void); void vsf_sysutil_exit(int exit_code); -@@ -180,10 +182,14 @@ int vsf_sysutil_wait_exited_normally( +@@ -180,6 +182,9 @@ int vsf_sysutil_wait_exited_normally( const struct vsf_sysutil_wait_retval* p_waitret); int vsf_sysutil_wait_get_exitcode( const struct vsf_sysutil_wait_retval* p_waitret); @@ -168,8 +149,3 @@ diff -up vsftpd-2.1.1/sysutil.h.daemoniz /* Various string functions */ unsigned int vsf_sysutil_strlen(const char* p_text); - char* vsf_sysutil_strdup(const char* p_str); -+char* vsf_sysutil_strndup(const char* p_str, unsigned int p_len); - void vsf_sysutil_memclr(void* p_dest, unsigned int size); - void vsf_sysutil_memcpy(void* p_dest, const void* p_src, - const unsigned int size); Index: vsftpd.spec =================================================================== RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- vsftpd.spec 4 May 2009 14:09:08 -0000 1.89 +++ vsftpd.spec 4 May 2009 14:37:06 -0000 1.90 @@ -3,7 +3,7 @@ Name: vsftpd Version: 2.1.1 -Release: 0.1.%{pretag}%{?dist} +Release: 0.2.%{pretag}%{?dist} Summary: Very Secure Ftp Daemon Group: System Environment/Daemons @@ -47,9 +47,9 @@ Patch7: vsftpd-2.1.0-filter.patch Patch8: vsftpd-2.0.5-greedy.patch Patch9: vsftpd-2.1.0-userlist_log.patch -Patch10: vsftpd-2.1.1-daemonize_plus.patch -Patch11: vsftpd-2.1.0-trim.patch -Patch12: vsftpd-2.1.0-userlistdelay.patch +Patch10: vsftpd-2.1.0-trim.patch +Patch11: vsftpd-2.1.0-userlistdelay.patch +Patch12: vsftpd-2.1.1-daemonize_plus.patch %description vsftpd is a Very Secure FTP daemon. It was written completely from @@ -71,9 +71,9 @@ cp %{SOURCE1} . %patch7 -p1 -b .filter %patch8 -p1 -b .greedy %patch9 -p1 -b .userlist_log -%patch10 -p1 -b .daemonize_plus -%patch11 -p1 -b .trim -%patch12 -p1 -b .userlistdelay +%patch10 -p1 -b .trim +%patch11 -p1 -b .userlistdelay +%patch12 -p1 -b .daemonize_plus %build @@ -139,6 +139,9 @@ fi %changelog +* Mon May 04 2009 Jiri Skala - 2.1.1-0.2 +- fixes daemonize patch + * Wed Apr 22 2009 Jiri Skala - 2.1.0-3 - updated to latest upstream version - improved daemonizing - init script gets correct return code if binding fails From pkgdb at fedoraproject.org Mon May 4 14:39:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 14:39:13 +0000 Subject: [pkgdb] kdepimlibs: ltinkl has requested watchcommits Message-ID: <20090504143913.31A1910F89C@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdepimlibs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs From pkgdb at fedoraproject.org Mon May 4 14:39:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 14:39:13 +0000 Subject: [pkgdb] kdepimlibs: ltinkl has requested commit Message-ID: <20090504143913.7101510F89E@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdepimlibs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs From pkgdb at fedoraproject.org Mon May 4 14:39:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 14:39:19 +0000 Subject: [pkgdb] kdepimlibs: ltinkl has requested watchbugzilla Message-ID: <20090504143919.7EEB210F8A3@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdepimlibs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs From rdieter at fedoraproject.org Mon May 4 14:40:55 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 14:40:55 +0000 (UTC) Subject: rpms/qt/devel qt.spec,1.275,1.276 Message-ID: <20090504144055.F19DD700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25086 Modified Files: qt.spec Log Message: * Mon May 04 2009 Rex Dieter - 4.5.1-8 - fix invalid assumptions about mysql_config --libs (bug #440673) - fix %files breakage from 4.5.1-5 Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.275 retrieving revision 1.276 diff -u -p -r1.275 -r1.276 --- qt.spec 4 May 2009 13:54:56 -0000 1.275 +++ qt.spec 4 May 2009 14:40:25 -0000 1.276 @@ -750,7 +750,7 @@ gtk-update-icon-cache -q %{_datadir}/ico #{_qt4_libdir}/libphonon.so %endif %{_qt4_libdir}/libQt*.so -%{_qt4_libdir}/libQtUiTools.a +%{_qt4_libdir}/libQtUiTools*.a %{_qt4_libdir}/libQt*.prl %{_libdir}/pkgconfig/*.pc # Qt designer @@ -825,8 +825,9 @@ gtk-update-icon-cache -q %{_datadir}/ico %changelog -* Sun May 03 2009 Rex Dieter - 4.5.1-8 +* Mon May 04 2009 Rex Dieter - 4.5.1-8 - fix invalid assumptions about mysql_config --libs (bug #440673) +- fix %%files breakage from 4.5.1-5 * Wed Apr 29 2009 Rex Dieter - 4.5.1-7 - -devel: Provides: qt4-devel%%{?_isa} ... From steved at fedoraproject.org Mon May 4 14:44:34 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Mon, 4 May 2009 14:44:34 +0000 (UTC) Subject: rpms/kernel/devel kernel-2.6-pnfs-v2.6.30-rc4.patch, NONE, 1.1.2.1 config-generic, 1.282, 1.282.4.1 kernel.spec, 1.1539, 1.1539.4.1 Message-ID: <20090504144434.0ACEC700DB@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25882 Modified Files: Tag: kernel-2_6_30-pnfs_rc4 config-generic kernel.spec Added Files: Tag: kernel-2_6_30-pnfs_rc4 kernel-2.6-pnfs-v2.6.30-rc4.patch Log Message: - Updated to latest pNFS code (v2.6.30-rc4) kernel-2.6-pnfs-v2.6.30-rc4.patch: --- NEW FILE kernel-2.6-pnfs-v2.6.30-rc4.patch --- diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index 8dd6db7..f15621e 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX @@ -66,6 +66,10 @@ mandatory-locking.txt - info on the Linux implementation of Sys V mandatory file locking. ncpfs.txt - info on Novell Netware(tm) filesystem using NCP protocol. +nfs41-server.txt + - info on the Linux server implementation of NFSv4 minor version 1. +nfs-rdma.txt + - how to install and setup the Linux NFS/RDMA client and server software. nfsroot.txt - short guide on setting up a diskless box with NFS root filesystem. nilfs2.txt diff --git a/Documentation/spnfs.txt b/Documentation/spnfs.txt new file mode 100644 index 0000000..be5815d --- /dev/null +++ b/Documentation/spnfs.txt @@ -0,0 +1,210 @@ +(c) 2007 Network Appliance Inc. + +spNFS +----- + +An spNFS system consists of a Meta Data Server (MDS), a number of Client machines (C) and a number of Data Servers (DS). + +A file system is mounted by the clients from the MDS, and all file data +is striped across the DSs. + +Identify the machines that will be filling each of these roles. + +The spnfs kernel will be installed on all machines: clients, the MDS and DSs. + + +Building and installing the spNFS kernel +---------------------------------------- + +Get the spNFS kernel from: + + git://linux-nfs.org/~dmuntz/spnfs.git + +add these options to your .config file + + CONFIG_NETWORK_FILESYSTEMS=y + CONFIG_NFS_FS=y + CONFIG_NFSD=y + CONFIG_NFS_V4_1=y + CONFIG_NFSD_V4_1=y + CONFIG_PNFS=y + CONFIG_PNFSD=y + CONFIG_SPNFS=y + +By default, spNFS uses whole-file layouts. Layout segments can be enabled +by adding: + + CONFIG_SPNFS_LAYOUTSEGMENTS=y + +to your .config file. + +Building and installation of kernel+modules is as usual. +This kernel should be installed and booted on the client, MDS and DSs. + + +Building nfs-utils +------------------ + +Get the nfs-utils package containing spnfsd from: + + git://linux-nfs.org/~dmuntz/nfs-utils.git + +Follow the standard instructions for building nfs-utils. We HIGHLY recommend +NOT doing an install of the binaries generated by this build. You will only +need the spnfsd binary generated by this build, and the spnfsd.conf template. + +After building, the spnfsd daemon will be located in utils/spnfsd. The spnfsd +daemon will only be needed on the MDS. + + +Installation +------------ + +The nfs-utils package contains a default spnfsd.conf file in +utils/spnfsd/spnfsd.conf. Copy this file to /etc/spnfsd.conf. + +By default, the DS-Mount-Directory is set to /spnfs (see spnfsd.conf). Under +this directory, mount points must be created for each DS to +be used for pNFS data stripes. These mount points are named by the ip address +of the corresponding DS. In the sample spnfsd.conf, there are two +DSs defined (172.16.28.134 and 172.16.28.141). + +Following the sample spnfsd.conf, + + mkdir /spnfs + +on the MDS (corresponding to DS-Mount-Directory). Then + + mkdir /spnfs/172.16.28.134 + mkdir /spnfs/172.16.28.141 + +to create the mount points for the DSs. + +On the DSs, chose a directory where data stripes will be created by the MDS. +For the sample file, this directory is /pnfs, so on each DS execute: + + mkdir /pnfs + +This directory is specified in the spnfsd.conf file by the DS*_ROOT option +(where * is replaced by the DS number). DS_ROOT is specified relative to +the directory being exported by the DSs. In our example, our DSs are exporting +the root directory (/) and therefore our DS_ROOT is /pnfs. On the DSs, we have +the following entry in /etc/exports: + + / *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check) + +N.B. If we had created a /exports directory and a /pnfs directory under +/exports, and if we were exporting /exports, then DS_ROOT would still be /pnfs +(not /exports/pnfs). + +It may be useful to add entries to /etc/fstab on the MDS to automatically +mount the DS_ROOT file systems. For this example, our MDS fstab would +contain: + + 172.17.84.128:/pnfs /spnfs/172.17.84.128 nfs defaults 1 2 + 172.17.84.122:/pnfs /spnfs/172.17.84.122 nfs defaults 1 2 + +The DS mounts must be performed manually or via fstab at this time (automatic +mounting, directory creation, etc. are on the todo list). To perform I/O +through the MDS, the DS mounts MUST use NFSv3 at this time (this restriction +will eventually be removed). + + +On the MDS, choose a file system to use with spNFS and export it, e.g.: + + / *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check) + +Make sure nfsd and all supporting processes are running on the MDS and DSs. + + +Running +------- + +If rpc_pipefs is not already mounted (if you're running idmapd it probably is), +you may want to add the following line to /etc/fstab: + + rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs defaults 0 0 + +to automatically mount rpc_pipefs. + +With spnfsd.conf configured for your environment and the mounts mounted as +described above, spnfsd can now be started. + +On the MDS, execute spnfsd: + + spnfsd + +The executable is located in the directory where it was built, and +may also have been installed elsewhere depending on how you built nfs-utils. +It will run in the foreground by default, and in fact will do so despite +any options suggesting the contrary (it's still a debugging build). + +On the client, make sure the nfslayoutdriver module is loaded: + + modprobe nfslayoutdriver + +Then mount the file system from the MDS: + + mount -t nfs4 mds:/ /mnt + +I/O through the MDS is now supported. To use it, do not load the +nfslayoutdriver on the client, and mount the MDS using NFSv4 or 4.1 +(NFSv2 and v3 are not yet supported). + +You may now use spNFS by performing file system activities in /mnt. +If you create files in /mnt, you should see stripe files corresponding to +new files being created on the DSs. The current implementation names the +stripe files based on the inode number of the file on the MDS. For example, +if you create a file foo in /mnt and do an 'ls -li /mnt/foo': + + # ls -li foo + 1233 -rw-r--r-- 1 root root 0 Nov 29 15:54 foo + +You should see stripe files on each under /pnfs (per the sample) named +1233. The file /pnfs/1233 on DS1 will contain the first bytes +of data written to foo, DS2 will contain the next bytes, etc. +Removing /mnt/foo will remove the corresponding stripe files on the DSs. +Other file system operations should behave (mostly :-) as expected. + + +Layout Segments +--------------- + +If the kernel is compiled to support layout segments, there will +be two files created under /proc/fs/spnfs for controlling layout +segment functionality. + +To enable layout segments, write a '1' to /proc/fs/spnfs/layoutseg, e.g.: + [...32666 lines suppressed...] + len = sock->ops->sendpage(sock, virt_to_page(xbufp->head[0].iov_base), + (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK, + xbufp->head[0].iov_len, flags); + + if (len != xbufp->head[0].iov_len) + goto out; + + /* + * send page data + * + * Check the amount of data to be sent. If it is less than the + * remaining page, then send it else send the current page + */ + + size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen; + while (pglen > 0) { + if (total_len == size) + flags = 0; + result = sock->ops->sendpage(sock, *pages, base, size, flags); + if (result > 0) + len += result; + if (result != size) + goto out; + total_len -= size; + pglen -= size; + size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen; + base = 0; + pages++; + } + /* + * send tail + */ + if (xbufp->tail[0].iov_len) { + result = sock->ops->sendpage(sock, + xbufp->tail[0].iov_base, + (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK, + xbufp->tail[0].iov_len, + 0); + + if (result > 0) + len += result; + } +out: + if (len != xbufp->len) + printk(KERN_NOTICE "Error sending entire callback!\n"); + + return len; +} + +/* + * The send routine. Borrows from svc_send + */ +static int bc_send_request(struct rpc_task *task) +{ + struct rpc_rqst *req = task->tk_rqstp; + struct rpc_xprt *bc_xprt = req->rq_xprt; + struct svc_xprt *xprt; + struct svc_sock *svsk; + u32 len; + + dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid)); + /* + * Get the server socket associated with this callback xprt + */ + svsk = bc_xprt->bc_sock; + xprt = &svsk->sk_xprt; + + mutex_lock(&xprt->xpt_mutex); + if (test_bit(XPT_DEAD, &xprt->xpt_flags)) + len = -ENOTCONN; + else + len = bc_sendto(req); + mutex_unlock(&xprt->xpt_mutex); + + return 0; + +} + +/* + * The close routine. Since this is client initiated, we do nothing + */ + +static void bc_close(struct rpc_xprt *xprt) +{ + return; +} + +/* + * The xprt destroy routine. Again, because this connection is client + * initiated, we do nothing + */ + +static void bc_destroy(struct rpc_xprt *xprt) +{ + return; +} + static struct rpc_xprt_ops xs_udp_ops = { .set_buffer_size = xs_udp_set_buffer_size, .reserve_xprt = xprt_reserve_xprt_cong, @@ -1994,11 +2359,32 @@ static struct rpc_xprt_ops xs_tcp_ops = { .buf_free = rpc_free, .send_request = xs_tcp_send_request, .set_retrans_timeout = xprt_set_retrans_timeout_def, +#if defined(CONFIG_NFS_V4_1) + .release_request = bc_release_request, +#endif /* CONFIG_NFS_V4_1 */ .close = xs_tcp_shutdown, .destroy = xs_destroy, .print_stats = xs_tcp_print_stats, }; +/* + * The rpc_xprt_ops for the server backchannel + */ + +static struct rpc_xprt_ops bc_tcp_ops = { + .reserve_xprt = xprt_reserve_xprt, + .release_xprt = xprt_release_xprt, + .set_port = bc_set_port, + .connect = bc_connect, + .buf_alloc = bc_malloc, + .buf_free = bc_free, + .send_request = bc_send_request, + .set_retrans_timeout = xprt_set_retrans_timeout_def, + .close = bc_close, + .destroy = bc_destroy, + .print_stats = xs_tcp_print_stats, +}; + static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args, unsigned int slot_table_size) { @@ -2131,13 +2517,29 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32); xprt->max_payload = RPC_MAX_FRAGMENT_SIZE; - xprt->bind_timeout = XS_BIND_TO; - xprt->connect_timeout = XS_TCP_CONN_TO; - xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; - xprt->idle_timeout = XS_IDLE_DISC_TO; + if (args->bc_sock) { + /* backchannel */ + xprt_set_bound(xprt); + INIT_DELAYED_WORK(&transport->connect_worker, + bc_connect_worker); + xprt->bind_timeout = 0; + xprt->connect_timeout = 0; + xprt->reestablish_timeout = 0; + xprt->idle_timeout = (~0); - xprt->ops = &xs_tcp_ops; - xprt->timeout = &xs_tcp_default_timeout; + /* + * The backchannel uses the same socket connection as the + * forechannel + */ + xprt->bc_sock = args->bc_sock; + xprt->bc_sock->sk_bc_xprt = xprt; + transport->sock = xprt->bc_sock->sk_sock; + transport->inet = xprt->bc_sock->sk_sk; + + xprt->ops = &bc_tcp_ops; + + goto next; + } switch (addr->sa_family) { case AF_INET: @@ -2145,13 +2547,29 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) xprt_set_bound(xprt); INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4); - xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP); break; case AF_INET6: if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0)) xprt_set_bound(xprt); INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6); + break; + } + xprt->bind_timeout = XS_BIND_TO; + xprt->connect_timeout = XS_TCP_CONN_TO; + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; + xprt->idle_timeout = XS_IDLE_DISC_TO; + + xprt->ops = &xs_tcp_ops; + +next: + xprt->timeout = &xs_tcp_default_timeout; + + switch (addr->sa_family) { + case AF_INET: + xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP); + break; + case AF_INET6: xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6); break; default: Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.282 retrieving revision 1.282.4.1 diff -u -p -r1.282 -r1.282.4.1 --- config-generic 22 Apr 2009 15:40:04 -0000 1.282 +++ config-generic 4 May 2009 14:44:03 -0000 1.282.4.1 @@ -3145,6 +3145,14 @@ CONFIG_NFSD=m CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y +CONFIG_NFS_V4_1=y +CONFIG_PNFSD=y +CONFIG_PNFS=y +CONFIG_SPNFS=y +CONFIG_PNFSD_LOCAL_EXPORT=y +CONFIG_PNFS_PANLAYOUT=y +CONFIG_PNFS_BLOCK=y +CONFIG_SPNFS_LAYOUTSEGMENTS=y CONFIG_NFSD_TCP=y CONFIG_NFS_FSCACHE=y CONFIG_LOCKD=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1539 retrieving revision 1.1539.4.1 diff -u -p -r1.1539 -r1.1539.4.1 --- kernel.spec 1 May 2009 18:29:15 -0000 1.1539 +++ kernel.spec 4 May 2009 14:44:03 -0000 1.1539.4.1 @@ -12,7 +12,7 @@ Summary: The Linux kernel # that the kernel isn't the stock distribution kernel, for example, # by setting the define to ".local" or ".bz123456" # -# % define buildid .local +%define buildid .pnfs_rc4 # fedora_build defines which build revision of this kernel version we're # building. Rather than incrementing forever, as with the prior versioning @@ -86,7 +86,7 @@ Summary: The Linux kernel # kernel-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} # kernel-firmware -%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 0} +%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 1} # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # kernel-bootwrapper (for creating zImages from kernel + initrd) @@ -681,6 +681,7 @@ Patch9100: linux-2.6-iwl3945-remove-usel #snmp fixes Patch10000: linux-2.6-missing-rfc2465-stats.patch +Patch20000: kernel-2.6-pnfs-v2.6.30-rc4.patch %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1243,6 +1244,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl ApplyPatch linux-2.6-iwl3945-remove-useless-exports.patch +ApplyPatch kernel-2.6-pnfs-v2.6.30-rc4.patch # END OF PATCH APPLICATIONS %endif @@ -1836,6 +1838,9 @@ fi # ||----w | # || || %changelog +* Mon May 4 2009 Steve Dickson +- Updated to latest pNFS code (v2.6.30-rc4) + * Fri May 01 2009 Eric Sandeen - Fix ext4 corruption on partial write into prealloc block From epienbro at fedoraproject.org Mon May 4 14:53:23 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Mon, 4 May 2009 14:53:23 +0000 (UTC) Subject: rpms/mingw32-libxml2/F-11 .cvsignore, 1.2, 1.3 mingw32-libxml2.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090504145323.D0B20700DB@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/mingw32-libxml2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28232/F-11 Modified Files: .cvsignore mingw32-libxml2.spec sources Log Message: Update to 2.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 28 Jan 2009 11:49:15 -0000 1.2 +++ .cvsignore 4 May 2009 14:52:50 -0000 1.3 @@ -1 +1 @@ -libxml2-2.7.2.tar.gz +libxml2-2.7.3.tar.gz Index: mingw32-libxml2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/mingw32-libxml2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- mingw32-libxml2.spec 14 Apr 2009 19:28:52 -0000 1.4 +++ mingw32-libxml2.spec 4 May 2009 14:52:52 -0000 1.5 @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-libxml2 -Version: 2.7.2 -Release: 9%{?dist} +Version: 2.7.3 +Release: 1%{?dist} Summary: MinGW Windows libxml2 XML processing library License: MIT @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libxml2.a %changelog +* Mon May 4 2009 Erik van Pienbroek - 2.7.3-1 +- Update to 2.7.3 + * Fri Apr 3 2009 Erik van Pienbroek - 2.7.2-9 - Fixed %%defattr line - Added -static subpackage. Applications which want to link Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 28 Jan 2009 11:49:16 -0000 1.2 +++ sources 4 May 2009 14:52:52 -0000 1.3 @@ -1 +1 @@ -dc43ff7ae6aded45f578c87b7b0c8766 libxml2-2.7.2.tar.gz +8f4fda3969237c2a33bdb1583b5d06b2 libxml2-2.7.3.tar.gz From epienbro at fedoraproject.org Mon May 4 14:53:23 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Mon, 4 May 2009 14:53:23 +0000 (UTC) Subject: rpms/mingw32-libxml2/devel .cvsignore, 1.2, 1.3 mingw32-libxml2.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090504145323.E6F8570135@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/mingw32-libxml2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28232/devel Modified Files: .cvsignore mingw32-libxml2.spec sources Log Message: Update to 2.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 28 Jan 2009 11:49:15 -0000 1.2 +++ .cvsignore 4 May 2009 14:52:53 -0000 1.3 @@ -1 +1 @@ -libxml2-2.7.2.tar.gz +libxml2-2.7.3.tar.gz Index: mingw32-libxml2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- mingw32-libxml2.spec 14 Apr 2009 19:28:52 -0000 1.4 +++ mingw32-libxml2.spec 4 May 2009 14:52:53 -0000 1.5 @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-libxml2 -Version: 2.7.2 -Release: 9%{?dist} +Version: 2.7.3 +Release: 1%{?dist} Summary: MinGW Windows libxml2 XML processing library License: MIT @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libxml2.a %changelog +* Mon May 4 2009 Erik van Pienbroek - 2.7.3-1 +- Update to 2.7.3 + * Fri Apr 3 2009 Erik van Pienbroek - 2.7.2-9 - Fixed %%defattr line - Added -static subpackage. Applications which want to link Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 28 Jan 2009 11:49:16 -0000 1.2 +++ sources 4 May 2009 14:52:53 -0000 1.3 @@ -1 +1 @@ -dc43ff7ae6aded45f578c87b7b0c8766 libxml2-2.7.2.tar.gz +8f4fda3969237c2a33bdb1583b5d06b2 libxml2-2.7.3.tar.gz From pkgdb at fedoraproject.org Mon May 4 15:04:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 15:04:27 +0000 Subject: [pkgdb] kdepimlibs had acl change status Message-ID: <20090504150427.6BC0E10F893@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdepimlibs (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs From pkgdb at fedoraproject.org Mon May 4 15:04:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 15:04:30 +0000 Subject: [pkgdb] kdepimlibs had acl change status Message-ID: <20090504150430.8266410F89E@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdepimlibs (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs From epienbro at fedoraproject.org Mon May 4 15:34:38 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Mon, 4 May 2009 15:34:38 +0000 (UTC) Subject: rpms/mingw32-gtk2/F-11 .cvsignore, 1.3, 1.4 mingw32-gtk2.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090504153439.02821700DB@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/mingw32-gtk2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3434 Modified Files: .cvsignore mingw32-gtk2.spec sources Log Message: Sync with F-12/devel branch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 8 Mar 2009 20:52:17 -0000 1.3 +++ .cvsignore 4 May 2009 15:34:06 -0000 1.4 @@ -1 +1 @@ -gtk+-2.15.5.tar.bz2 +gtk+-2.16.1.tar.bz2 Index: mingw32-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/mingw32-gtk2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- mingw32-gtk2.spec 13 Mar 2009 20:56:10 -0000 1.4 +++ mingw32-gtk2.spec 4 May 2009 15:34:06 -0000 1.5 @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-gtk2 -Version: 2.15.5 -Release: 2%{?dist} +Version: 2.16.1 +Release: 1%{?dist} Summary: MinGW Windows Gtk2 library License: LGPLv2+ @@ -318,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/gtk-2.0/modules/libgail.a %changelog +* Sat Apr 18 2009 Erik van Pienbroek - 2.16.1-1 +- Update to 2.16.1 + * Fri Mar 13 2009 Richard W.M. Jones - 2.15.5-2 - Force build against latest mingw32-filesystem. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 8 Mar 2009 20:52:18 -0000 1.3 +++ sources 4 May 2009 15:34:06 -0000 1.4 @@ -1 +1 @@ -aa010d3fa57cba96f32db352eb35754f gtk+-2.15.5.tar.bz2 +74e35ff3e6e02c960fe2117a4b6b102f gtk+-2.16.1.tar.bz2 From than at fedoraproject.org Mon May 4 15:35:47 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 4 May 2009 15:35:47 +0000 (UTC) Subject: rpms/mozplugger/F-11 mozplugger.spec,1.28,1.29 Message-ID: <20090504153547.EFE02700DB@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/mozplugger/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3689 Modified Files: mozplugger.spec Log Message: fix #469257, selinux policy and mozplugger do not get along Index: mozplugger.spec =================================================================== RCS file: /cvs/extras/rpms/mozplugger/F-11/mozplugger.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- mozplugger.spec 26 Feb 2009 02:52:28 -0000 1.28 +++ mozplugger.spec 4 May 2009 15:35:17 -0000 1.29 @@ -1,7 +1,7 @@ Summary: A generic mozilla plug-in Name: mozplugger Version: 1.10.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/Internet Url: http://mozplugger.mozdev.org/ @@ -11,10 +11,11 @@ Patch1: mozplugger-1.5.0-lib64.patch Patch2: mozplugger-1.10.1-optflags.patch Requires: sox +Requires: mozilla-filesystem BuildPrereq: libX11-devel BuildPrereq: libXt-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: plugger %description @@ -45,10 +46,13 @@ rm -rf %{buildroot} %doc README COPYING %config /etc/mozpluggerrc %{_bindir}/* -%{_libdir}/mozilla +%{_libdir}/mozilla/plugins/* %{_mandir}/man7/mozplugger.7* %changelog +* Mon May 04 2009 Than Ngo - 1.10.1-5 +- fix #469257, selinux policy and mozplugger do not get along + * Wed Feb 25 2009 Fedora Release Engineering - 1.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From scop at fedoraproject.org Mon May 4 15:38:40 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Mon, 4 May 2009 15:38:40 +0000 (UTC) Subject: rpms/ilmbase/devel ilmbase.spec,1.6,1.7 Message-ID: <20090504153840.7AD29700DB@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/ilmbase/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4348 Modified Files: ilmbase.spec Log Message: * Mon May 4 2009 Ville Skytt?? - 1.0.1-5 - Fix spelling error in summary. Index: ilmbase.spec =================================================================== RCS file: /cvs/pkgs/rpms/ilmbase/devel/ilmbase.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- ilmbase.spec 25 Feb 2009 07:01:16 -0000 1.6 +++ ilmbase.spec 4 May 2009 15:38:09 -0000 1.7 @@ -1,8 +1,8 @@ Name: ilmbase Version: 1.0.1 -Release: 4%{?dist} -Summary: Abraction/convenience libraries +Release: 5%{?dist} +Summary: Abstraction/convenience libraries Group: System Environment/Libraries License: BSD @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 4 2009 Ville Skytt?? - 1.0.1-5 +- Fix spelling error in summary. + * Tue Feb 24 2009 Fedora Release Engineering - 1.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From epienbro at fedoraproject.org Mon May 4 15:42:42 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Mon, 4 May 2009 15:42:42 +0000 (UTC) Subject: rpms/mingw32-gtk2/F-11 mingw32-gtk2.spec,1.5,1.6 Message-ID: <20090504154242.DB3D5700DB@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/mingw32-gtk2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4949 Modified Files: mingw32-gtk2.spec Log Message: Bump to workaround a mis-tag caused by the mass branching Index: mingw32-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/mingw32-gtk2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- mingw32-gtk2.spec 4 May 2009 15:34:06 -0000 1.5 +++ mingw32-gtk2.spec 4 May 2009 15:42:12 -0000 1.6 @@ -6,7 +6,7 @@ Name: mingw32-gtk2 Version: 2.16.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: MinGW Windows Gtk2 library License: LGPLv2+ From dwalsh at fedoraproject.org Mon May 4 15:56:16 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 4 May 2009 15:56:16 +0000 (UTC) Subject: rpms/setroubleshoot/devel .cvsignore, 1.96, 1.97 setroubleshoot.spec, 1.129, 1.130 sources, 1.107, 1.108 Message-ID: <20090504155616.7880C700DB@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/setroubleshoot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7433 Modified Files: .cvsignore setroubleshoot.spec sources Log Message: * Mon May 4 2009 Dan Walsh - 2.1.9-1 - Change multiple signatures from exception to warning - Update links on fedorahosted.org Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v retrieving revision 1.96 retrieving revision 1.97 diff -u -p -r1.96 -r1.97 --- .cvsignore 3 Apr 2009 20:27:40 -0000 1.96 +++ .cvsignore 4 May 2009 15:55:45 -0000 1.97 @@ -12,3 +12,4 @@ setroubleshoot-2.1.5.tar.gz setroubleshoot-2.1.6.tar.gz setroubleshoot-2.1.7.tar.gz setroubleshoot-2.1.8.tar.gz +setroubleshoot-2.1.9.tar.gz Index: setroubleshoot.spec =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -p -r1.129 -r1.130 --- setroubleshoot.spec 6 Apr 2009 13:46:37 -0000 1.129 +++ setroubleshoot.spec 4 May 2009 15:55:45 -0000 1.130 @@ -194,8 +194,9 @@ Setroubleshoot documentation package %doc %{pkgdocdir} %changelog -* Mon Apr 6 2009 Dan Walsh - 2.1.9-1 +* Mon May 4 2009 Dan Walsh - 2.1.9-1 - Change multiple signatures from exception to warning +- Update links on fedorahosted.org * Fri Apr 3 2009 Dan Walsh - 2.1.8-1 - Fix sealert segfault Index: sources =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -p -r1.107 -r1.108 --- sources 3 Apr 2009 20:27:40 -0000 1.107 +++ sources 4 May 2009 15:55:45 -0000 1.108 @@ -1 +1 @@ -9703bbdf2967967a94631785ee05cae2 setroubleshoot-2.1.8.tar.gz +808b73793ab08c3e7c402af53a67af5c setroubleshoot-2.1.9.tar.gz From cweyl at fedoraproject.org Mon May 4 15:58:45 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 4 May 2009 15:58:45 +0000 (UTC) Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.29, 1.30 perl-Class-MOP.spec, 1.34, 1.35 Message-ID: <20090504155845.8E783700DB@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7875 Modified Files: .cvsignore perl-Class-MOP.spec Log Message: * Mon May 04 2009 Chris Weyl 0.81-2 - fix .so filter to not trash the rtld (and other) symbols - bring files in line with new arch-specific model - merge _docdir filtering with the .so filtering Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- .cvsignore 19 Apr 2009 00:33:57 -0000 1.29 +++ .cvsignore 4 May 2009 15:58:14 -0000 1.30 @@ -1 +1,2 @@ Class-MOP-0.81.tar.gz +Class-MOP-* Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- perl-Class-MOP.spec 19 Apr 2009 00:33:58 -0000 1.34 +++ perl-Class-MOP.spec 4 May 2009 15:58:15 -0000 1.35 @@ -1,6 +1,6 @@ Name: perl-Class-MOP Version: 0.81 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Metaobject programming model for Perl License: GPL+ or Artistic Group: Development/Libraries @@ -34,8 +34,9 @@ Requires: perl(Devel::GlobalDestru # don't "provide" private Perl libs %global _use_internal_dependency_generator 0 -%global provfind /bin/sh -c "grep -v '%perl_vendorarch.*\\.so$' | %__find_provides" -%global __find_provides %provfind +%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u +%global __find_provides /bin/sh -c "%{__grep} -v '%_docdir' | %{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}" +%global __find_requires /bin/sh -c "%{__grep} -v '%_docdir' | %{__deploop R}" %description This module is an attempt to create a meta object protocol for the Perl 5 @@ -51,16 +52,6 @@ love. %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} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -85,12 +76,16 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README examples/ scripts/ t/ -%{perl_vendorarch}/auto/* -%{perl_vendorarch}/Class -%{perl_vendorarch}/metaclass.pm +%{perl_vendorarch}/* +%exclude %dir %{perl_vendorarch}/auto %{_mandir}/man3/* %changelog +* Mon May 04 2009 Chris Weyl 0.81-2 +- fix .so filter to not trash the rtld (and other) symbols +- bring files in line with new arch-specific model +- merge _docdir filtering with the .so filtering + * Sat Apr 18 2009 Chris Weyl 0.81-1 - update to 0.81 From dwalsh at fedoraproject.org Mon May 4 16:00:09 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 4 May 2009 16:00:09 +0000 (UTC) Subject: rpms/setroubleshoot/F-11 .cvsignore, 1.96, 1.97 setroubleshoot.spec, 1.129, 1.130 sources, 1.107, 1.108 Message-ID: <20090504160009.1D967700DB@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/setroubleshoot/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8150 Modified Files: .cvsignore setroubleshoot.spec sources Log Message: * Mon May 4 2009 Dan Walsh - 2.1.9-1 - Change multiple signatures from exception to warning - Update links on fedorahosted.org Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-11/.cvsignore,v retrieving revision 1.96 retrieving revision 1.97 diff -u -p -r1.96 -r1.97 --- .cvsignore 3 Apr 2009 20:27:40 -0000 1.96 +++ .cvsignore 4 May 2009 15:59:38 -0000 1.97 @@ -12,3 +12,4 @@ setroubleshoot-2.1.5.tar.gz setroubleshoot-2.1.6.tar.gz setroubleshoot-2.1.7.tar.gz setroubleshoot-2.1.8.tar.gz +setroubleshoot-2.1.9.tar.gz Index: setroubleshoot.spec =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-11/setroubleshoot.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -p -r1.129 -r1.130 --- setroubleshoot.spec 6 Apr 2009 13:46:37 -0000 1.129 +++ setroubleshoot.spec 4 May 2009 15:59:38 -0000 1.130 @@ -194,8 +194,9 @@ Setroubleshoot documentation package %doc %{pkgdocdir} %changelog -* Mon Apr 6 2009 Dan Walsh - 2.1.9-1 +* Mon May 4 2009 Dan Walsh - 2.1.9-1 - Change multiple signatures from exception to warning +- Update links on fedorahosted.org * Fri Apr 3 2009 Dan Walsh - 2.1.8-1 - Fix sealert segfault Index: sources =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-11/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -p -r1.107 -r1.108 --- sources 3 Apr 2009 20:27:40 -0000 1.107 +++ sources 4 May 2009 15:59:38 -0000 1.108 @@ -1 +1 @@ -9703bbdf2967967a94631785ee05cae2 setroubleshoot-2.1.8.tar.gz +1c2a21c6a524c62f46145854853341d9 setroubleshoot-2.1.9.tar.gz From dwalsh at fedoraproject.org Mon May 4 16:00:15 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 4 May 2009 16:00:15 +0000 (UTC) Subject: rpms/setroubleshoot/devel sources,1.108,1.109 Message-ID: <20090504160015.4FDD2700DB@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/setroubleshoot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8193 Modified Files: sources Log Message: * Mon May 4 2009 Dan Walsh - 2.1.9-1 - Change multiple signatures from exception to warning - Update links on fedorahosted.org Index: sources =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -p -r1.108 -r1.109 --- sources 4 May 2009 15:55:45 -0000 1.108 +++ sources 4 May 2009 15:59:45 -0000 1.109 @@ -1 +1 @@ -808b73793ab08c3e7c402af53a67af5c setroubleshoot-2.1.9.tar.gz +1c2a21c6a524c62f46145854853341d9 setroubleshoot-2.1.9.tar.gz From dwalsh at fedoraproject.org Mon May 4 16:01:49 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 4 May 2009 16:01:49 +0000 (UTC) Subject: rpms/setroubleshoot/F-11 setroubleshoot.spec,1.130,1.131 Message-ID: <20090504160149.997CB700DB@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/setroubleshoot/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8540 Modified Files: setroubleshoot.spec Log Message: * Mon May 4 2009 Dan Walsh - 2.1.9-2 - Change multiple signatures from exception to warning - Update links on fedorahosted.org Index: setroubleshoot.spec =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-11/setroubleshoot.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -p -r1.130 -r1.131 --- setroubleshoot.spec 4 May 2009 15:59:38 -0000 1.130 +++ setroubleshoot.spec 4 May 2009 16:01:19 -0000 1.131 @@ -1,7 +1,7 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot Version: 2.1.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/setroubleshoot @@ -194,7 +194,7 @@ Setroubleshoot documentation package %doc %{pkgdocdir} %changelog -* Mon May 4 2009 Dan Walsh - 2.1.9-1 +* Mon May 4 2009 Dan Walsh - 2.1.9-2 - Change multiple signatures from exception to warning - Update links on fedorahosted.org From ltinkl at fedoraproject.org Mon May 4 16:06:25 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 4 May 2009 16:06:25 +0000 (UTC) Subject: rpms/kdepimlibs/F-10 kdepimlibs.spec,1.66,1.67 sources,1.32,1.33 Message-ID: <20090504160625.43F8A700DB@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdepimlibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9135/F-10 Modified Files: kdepimlibs.spec sources Log Message: KDE 4.2.3 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/F-10/kdepimlibs.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- kdepimlibs.spec 6 Apr 2009 00:46:12 -0000 1.66 +++ kdepimlibs.spec 4 May 2009 16:05:54 -0000 1.67 @@ -12,8 +12,8 @@ %define akonadi_version 1.1.1 Name: kdepimlibs -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -209,6 +209,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Apr 06 2009 Kevin Kofler - 4.2.2-3 - fix libkcal devel symlink hack Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/F-10/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- sources 1 Apr 2009 19:57:35 -0000 1.32 +++ sources 4 May 2009 16:05:54 -0000 1.33 @@ -1 +1 @@ -62562a3025138a08ffdf08e6466b5065 kdepimlibs-4.2.2.tar.bz2 +7b5250a44291c42c5fa4110da19890bb kdepimlibs-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Mon May 4 16:06:25 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 4 May 2009 16:06:25 +0000 (UTC) Subject: rpms/kdepimlibs/F-9 kdepimlibs.spec,1.52,1.53 sources,1.26,1.27 Message-ID: <20090504160625.7EAD7700DB@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdepimlibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9135/F-9 Modified Files: kdepimlibs.spec sources Log Message: KDE 4.2.3 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/F-9/kdepimlibs.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -r1.52 -r1.53 --- kdepimlibs.spec 6 Apr 2009 00:46:13 -0000 1.52 +++ kdepimlibs.spec 4 May 2009 16:05:55 -0000 1.53 @@ -12,8 +12,8 @@ %define akonadi_version 1.1.1 Name: kdepimlibs -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -209,6 +209,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Apr 06 2009 Kevin Kofler - 4.2.2-3 - fix libkcal devel symlink hack Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/F-9/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- sources 1 Apr 2009 20:02:03 -0000 1.26 +++ sources 4 May 2009 16:05:55 -0000 1.27 @@ -1 +1 @@ -62562a3025138a08ffdf08e6466b5065 kdepimlibs-4.2.2.tar.bz2 +7b5250a44291c42c5fa4110da19890bb kdepimlibs-4.2.3.tar.bz2 From rdieter at fedoraproject.org Mon May 4 16:19:29 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 16:19:29 +0000 (UTC) Subject: rpms/phonon/devel phonon-4.3.2-kdebug#172242.patch, NONE, 1.1 phonon.spec, 1.31, 1.32 Message-ID: <20090504161929.E7815700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10720/devel Modified Files: phonon.spec Added Files: phonon-4.3.2-kdebug#172242.patch Log Message: * Mon May 04 2009 Rex Dieter - 4.3.1-4 - fix Source0 Url - xine backend will not play files with non-ascii names (kdebug#172242) phonon-4.3.2-kdebug#172242.patch: --- NEW FILE phonon-4.3.2-kdebug#172242.patch --- Index: phonon/xine/xinestream.h =================================================================== --- phonon/xine/xinestream.h (revision 924144) +++ phonon/xine/xinestream.h (revision 924145) @@ -86,7 +86,6 @@ //void needRewire(AudioPostList *postList); void useGaplessPlayback(bool); void useGapOf(int gap); - void gaplessSwitchTo(const QUrl &url); void gaplessSwitchTo(const QByteArray &mrl); void closeBlocking(); void aboutToDeleteVideoWidget(); @@ -141,7 +140,6 @@ void unload(); public slots: - void setUrl(const QUrl &url); void setMrl(const QByteArray &mrl, StateForNewMrl = StoppedState); void play(); void pause(); Index: phonon/xine/mediaobject.cpp =================================================================== --- phonon/xine/mediaobject.cpp (revision 924144) +++ phonon/xine/mediaobject.cpp (revision 924145) @@ -317,6 +317,20 @@ setSourceInternal(source, HardSwitch); } +static QByteArray mrlEncode(QByteArray mrl) +{ + for (int i = 0; i < mrl.size(); ++i) { + const unsigned char c = static_cast(mrl.at(i)); + if (c & 0x80 || c == '\\' || c < 32 || c == '%') { + char enc[4]; + qsnprintf(enc, 4, "%%%02X", c); + mrl = mrl.left(i) + QByteArray(enc, 3) + mrl.mid(i + 1); + i += 2; + } + } + return mrl; +} + void MediaObject::setSourceInternal(const MediaSource &source, HowToSetTheUrl how) { //debug() << Q_FUNC_INFO; @@ -340,13 +354,18 @@ m_stream->setError(Phonon::NormalError, tr("Cannot open media data at '%1'").arg(source.url().toString(QUrl::RemovePassword))); return; } - switch (how) { - case GaplessSwitch: - m_stream->gaplessSwitchTo(source.url()); - break; - case HardSwitch: - m_stream->setUrl(source.url()); - break; + { + const QByteArray &mrl = (source.url().scheme() == QLatin1String("file") ? + "file:/" + mrlEncode(QFile::encodeName(source.url().toLocalFile())) : + source.url().toEncoded()); + switch (how) { + case GaplessSwitch: + m_stream->gaplessSwitchTo(mrl); + break; + case HardSwitch: + m_stream->setMrl(mrl); + break; + } } break; case MediaSource::Disc: Index: phonon/xine/xinestream.cpp =================================================================== --- phonon/xine/xinestream.cpp (revision 924144) +++ phonon/xine/xinestream.cpp (revision 924145) @@ -619,12 +619,6 @@ } // called from main thread -void XineStream::gaplessSwitchTo(const QUrl &url) -{ - gaplessSwitchTo(url.toEncoded()); -} - -// called from main thread void XineStream::gaplessSwitchTo(const QByteArray &mrl) { QCoreApplication::postEvent(this, new GaplessSwitchEvent(mrl)); @@ -1707,12 +1701,6 @@ } // called from main thread -void XineStream::setUrl(const QUrl &url) -{ - setMrl(url.toEncoded()); -} - -// called from main thread void XineStream::setMrl(const QByteArray &mrl, StateForNewMrl sfnm) { debug() << Q_FUNC_INFO << mrl << ", " << sfnm; Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- phonon.spec 12 Apr 2009 00:15:21 -0000 1.31 +++ phonon.spec 4 May 2009 16:18:58 -0000 1.32 @@ -1,11 +1,12 @@ Summary: Multimedia framework api Name: phonon Version: 4.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2 +#Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2 Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,6 +22,8 @@ Patch1: phonon-4.2.96-xine-pulseaudio.p ## Upstream patches Patch100: phonon-4.3.2-gstreamer-utf8-url.patch Patch101: phonon-4.3.2-gstreamer-volumefader.patch +# fix for non-ascii filenames in xine backend +Patch102: phonon-4.3.2-kdebug#172242.patch BuildRequires: automoc4 >= 0.9.86 BuildRequires: cmake >= 2.6.0 @@ -76,6 +79,7 @@ Requires: pkgconfig %patch1 -p1 -b .xine-pulseaudio %patch100 -p0 -b .gstreamer-utf8-url %patch101 -p0 -b .gstreamer-volumefader +%patch102 -p1 -b .xine_nonascii %build @@ -168,6 +172,10 @@ fi %changelog +* Mon May 04 2009 Rex Dieter - 4.3.1-4 +- fix Source0 Url +- xine backend will not play files with non-ascii names (kdebug#172242) + * Sat Apr 11 2009 Rex Dieter - 4.3.1-3 - optimize scriptlets - Provides/Requires: phonon-backend%%{_isa} ... From rdieter at fedoraproject.org Mon May 4 16:19:30 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 16:19:30 +0000 (UTC) Subject: rpms/phonon/F-11 phonon-4.3.2-kdebug#172242.patch, NONE, 1.1 phonon.spec, 1.31, 1.32 Message-ID: <20090504161930.18ADE70135@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10720/F-11 Modified Files: phonon.spec Added Files: phonon-4.3.2-kdebug#172242.patch Log Message: * Mon May 04 2009 Rex Dieter - 4.3.1-4 - fix Source0 Url - xine backend will not play files with non-ascii names (kdebug#172242) phonon-4.3.2-kdebug#172242.patch: --- NEW FILE phonon-4.3.2-kdebug#172242.patch --- Index: phonon/xine/xinestream.h =================================================================== --- phonon/xine/xinestream.h (revision 924144) +++ phonon/xine/xinestream.h (revision 924145) @@ -86,7 +86,6 @@ //void needRewire(AudioPostList *postList); void useGaplessPlayback(bool); void useGapOf(int gap); - void gaplessSwitchTo(const QUrl &url); void gaplessSwitchTo(const QByteArray &mrl); void closeBlocking(); void aboutToDeleteVideoWidget(); @@ -141,7 +140,6 @@ void unload(); public slots: - void setUrl(const QUrl &url); void setMrl(const QByteArray &mrl, StateForNewMrl = StoppedState); void play(); void pause(); Index: phonon/xine/mediaobject.cpp =================================================================== --- phonon/xine/mediaobject.cpp (revision 924144) +++ phonon/xine/mediaobject.cpp (revision 924145) @@ -317,6 +317,20 @@ setSourceInternal(source, HardSwitch); } +static QByteArray mrlEncode(QByteArray mrl) +{ + for (int i = 0; i < mrl.size(); ++i) { + const unsigned char c = static_cast(mrl.at(i)); + if (c & 0x80 || c == '\\' || c < 32 || c == '%') { + char enc[4]; + qsnprintf(enc, 4, "%%%02X", c); + mrl = mrl.left(i) + QByteArray(enc, 3) + mrl.mid(i + 1); + i += 2; + } + } + return mrl; +} + void MediaObject::setSourceInternal(const MediaSource &source, HowToSetTheUrl how) { //debug() << Q_FUNC_INFO; @@ -340,13 +354,18 @@ m_stream->setError(Phonon::NormalError, tr("Cannot open media data at '%1'").arg(source.url().toString(QUrl::RemovePassword))); return; } - switch (how) { - case GaplessSwitch: - m_stream->gaplessSwitchTo(source.url()); - break; - case HardSwitch: - m_stream->setUrl(source.url()); - break; + { + const QByteArray &mrl = (source.url().scheme() == QLatin1String("file") ? + "file:/" + mrlEncode(QFile::encodeName(source.url().toLocalFile())) : + source.url().toEncoded()); + switch (how) { + case GaplessSwitch: + m_stream->gaplessSwitchTo(mrl); + break; + case HardSwitch: + m_stream->setMrl(mrl); + break; + } } break; case MediaSource::Disc: Index: phonon/xine/xinestream.cpp =================================================================== --- phonon/xine/xinestream.cpp (revision 924144) +++ phonon/xine/xinestream.cpp (revision 924145) @@ -619,12 +619,6 @@ } // called from main thread -void XineStream::gaplessSwitchTo(const QUrl &url) -{ - gaplessSwitchTo(url.toEncoded()); -} - -// called from main thread void XineStream::gaplessSwitchTo(const QByteArray &mrl) { QCoreApplication::postEvent(this, new GaplessSwitchEvent(mrl)); @@ -1707,12 +1701,6 @@ } // called from main thread -void XineStream::setUrl(const QUrl &url) -{ - setMrl(url.toEncoded()); -} - -// called from main thread void XineStream::setMrl(const QByteArray &mrl, StateForNewMrl sfnm) { debug() << Q_FUNC_INFO << mrl << ", " << sfnm; Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-11/phonon.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- phonon.spec 12 Apr 2009 00:15:21 -0000 1.31 +++ phonon.spec 4 May 2009 16:18:59 -0000 1.32 @@ -1,11 +1,12 @@ Summary: Multimedia framework api Name: phonon Version: 4.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2 +#Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2 Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,6 +22,8 @@ Patch1: phonon-4.2.96-xine-pulseaudio.p ## Upstream patches Patch100: phonon-4.3.2-gstreamer-utf8-url.patch Patch101: phonon-4.3.2-gstreamer-volumefader.patch +# fix for non-ascii filenames in xine backend +Patch102: phonon-4.3.2-kdebug#172242.patch BuildRequires: automoc4 >= 0.9.86 BuildRequires: cmake >= 2.6.0 @@ -76,6 +79,7 @@ Requires: pkgconfig %patch1 -p1 -b .xine-pulseaudio %patch100 -p0 -b .gstreamer-utf8-url %patch101 -p0 -b .gstreamer-volumefader +%patch102 -p1 -b .xine_nonascii %build @@ -168,6 +172,10 @@ fi %changelog +* Mon May 04 2009 Rex Dieter - 4.3.1-4 +- fix Source0 Url +- xine backend will not play files with non-ascii names (kdebug#172242) + * Sat Apr 11 2009 Rex Dieter - 4.3.1-3 - optimize scriptlets - Provides/Requires: phonon-backend%%{_isa} ... From rdieter at fedoraproject.org Mon May 4 16:26:02 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 16:26:02 +0000 (UTC) Subject: rpms/phonon/F-10 phonon-4.3.2-kdebug#172242.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 phonon.spec, 1.17, 1.18 Message-ID: <20090504162602.62A2870131@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11807 Modified Files: .cvsignore phonon.spec Added Files: phonon-4.3.2-kdebug#172242.patch Log Message: * Mon May 04 2009 Rex Dieter - 4.3.1-4 - fix Source0 Url - xine backend will not play files with non-ascii names (kdebug#172242) phonon-4.3.2-kdebug#172242.patch: --- NEW FILE phonon-4.3.2-kdebug#172242.patch --- Index: phonon/xine/xinestream.h =================================================================== --- phonon/xine/xinestream.h (revision 924144) +++ phonon/xine/xinestream.h (revision 924145) @@ -86,7 +86,6 @@ //void needRewire(AudioPostList *postList); void useGaplessPlayback(bool); void useGapOf(int gap); - void gaplessSwitchTo(const QUrl &url); void gaplessSwitchTo(const QByteArray &mrl); void closeBlocking(); void aboutToDeleteVideoWidget(); @@ -141,7 +140,6 @@ void unload(); public slots: - void setUrl(const QUrl &url); void setMrl(const QByteArray &mrl, StateForNewMrl = StoppedState); void play(); void pause(); Index: phonon/xine/mediaobject.cpp =================================================================== --- phonon/xine/mediaobject.cpp (revision 924144) +++ phonon/xine/mediaobject.cpp (revision 924145) @@ -317,6 +317,20 @@ setSourceInternal(source, HardSwitch); } +static QByteArray mrlEncode(QByteArray mrl) +{ + for (int i = 0; i < mrl.size(); ++i) { + const unsigned char c = static_cast(mrl.at(i)); + if (c & 0x80 || c == '\\' || c < 32 || c == '%') { + char enc[4]; + qsnprintf(enc, 4, "%%%02X", c); + mrl = mrl.left(i) + QByteArray(enc, 3) + mrl.mid(i + 1); + i += 2; + } + } + return mrl; +} + void MediaObject::setSourceInternal(const MediaSource &source, HowToSetTheUrl how) { //debug() << Q_FUNC_INFO; @@ -340,13 +354,18 @@ m_stream->setError(Phonon::NormalError, tr("Cannot open media data at '%1'").arg(source.url().toString(QUrl::RemovePassword))); return; } - switch (how) { - case GaplessSwitch: - m_stream->gaplessSwitchTo(source.url()); - break; - case HardSwitch: - m_stream->setUrl(source.url()); - break; + { + const QByteArray &mrl = (source.url().scheme() == QLatin1String("file") ? + "file:/" + mrlEncode(QFile::encodeName(source.url().toLocalFile())) : + source.url().toEncoded()); + switch (how) { + case GaplessSwitch: + m_stream->gaplessSwitchTo(mrl); + break; + case HardSwitch: + m_stream->setMrl(mrl); + break; + } } break; case MediaSource::Disc: Index: phonon/xine/xinestream.cpp =================================================================== --- phonon/xine/xinestream.cpp (revision 924144) +++ phonon/xine/xinestream.cpp (revision 924145) @@ -619,12 +619,6 @@ } // called from main thread -void XineStream::gaplessSwitchTo(const QUrl &url) -{ - gaplessSwitchTo(url.toEncoded()); -} - -// called from main thread void XineStream::gaplessSwitchTo(const QByteArray &mrl) { QCoreApplication::postEvent(this, new GaplessSwitchEvent(mrl)); @@ -1707,12 +1701,6 @@ } // called from main thread -void XineStream::setUrl(const QUrl &url) -{ - setMrl(url.toEncoded()); -} - -// called from main thread void XineStream::setMrl(const QByteArray &mrl, StateForNewMrl sfnm) { debug() << Q_FUNC_INFO << mrl << ", " << sfnm; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-10/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 29 Jan 2009 15:46:57 -0000 1.7 +++ .cvsignore 4 May 2009 16:25:31 -0000 1.8 @@ -1,2 +1,3 @@ gstreamer-logo.svg phonon-4.3.0.tar.bz2 +phonon-4.3.1.tar.bz2 Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-10/phonon.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- phonon.spec 3 Mar 2009 16:54:23 -0000 1.17 +++ phonon.spec 4 May 2009 16:25:31 -0000 1.18 @@ -1,12 +1,15 @@ Summary: Multimedia framework api Name: phonon Version: 4.3.1 -Release: 2%{?dist} +Release: 4%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2 +#Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2 Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + # Make PulseAudio the default again when listed by the backend. # Note that this currently only works for the Xine backend. Device selection in # the GStreamer backend is weird: there is a setting for "sink" which cannot be @@ -19,8 +22,8 @@ Patch1: phonon-4.2.96-xine-pulseaudio.p ## Upstream patches Patch100: phonon-4.3.2-gstreamer-utf8-url.patch Patch101: phonon-4.3.2-gstreamer-volumefader.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# fix for non-ascii filenames in xine backend +Patch102: phonon-4.3.2-kdebug#172242.patch BuildRequires: automoc4 >= 0.9.86 BuildRequires: cmake >= 2.6.0 @@ -35,9 +38,9 @@ BuildRequires: pkgconfig BuildRequires: qt4-devel >= 4.4.0 BuildRequires: xine-lib-devel -Requires: phonon-backend >= %{version} +Requires: phonon-backend%{?_isa} >= %{version} ## hard-code phonon-backend-xine, if yum chooses -gstreamer by default -#Requires(hint): phonon-backend-xine >= %{version} +#Requires(hint): phonon-backend-xine%{?_isa} >= %{version} %description %{summary}. @@ -46,9 +49,7 @@ Requires: phonon-backend >= %{version} Summary: Gstreamer phonon backend Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -Requires(post): xdg-utils -Requires(postun): xdg-utils -Provides: phonon-backend = %{version}-%{release} +Provides: phonon-backend%{?_isa} = %{version}-%{release} Obsoletes: %{name}-backend-gst < 4.2.0-4 Provides: %{name}-backend-gst = %{version}-%{release} %description backend-gstreamer @@ -58,9 +59,7 @@ Provides: %{name}-backend-gst = %{versi Summary: xine phonon backend Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -Requires(post): xdg-utils -Requires(postun): xdg-utils -Provides: phonon-backend = %{version}-%{release} +Provides: phonon-backend%{?_isa} = %{version}-%{release} %description backend-xine %{summary}. @@ -80,6 +79,8 @@ Requires: pkgconfig %patch1 -p1 -b .xine-pulseaudio %patch100 -p0 -b .gstreamer-utf8-url %patch101 -p0 -b .gstreamer-volumefader +%patch102 -p1 -b .xine_nonascii + %build mkdir -p %{_target_platform} @@ -87,7 +88,7 @@ pushd %{_target_platform} %{cmake} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -115,17 +116,29 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig +%post backend-gstreamer +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + %post backend-xine -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: -%postun backend-xine -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%posttrans backend-gstreamer +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -%post backend-gstreamer -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%posttrans backend-xine +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: %postun backend-gstreamer -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +fi + +%postun backend-xine +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +fi %files @@ -159,6 +172,14 @@ xdg-icon-resource forceupdate --theme hi %changelog +* Mon May 04 2009 Rex Dieter - 4.3.1-4 +- fix Source0 Url +- xine backend will not play files with non-ascii names (kdebug#172242) + +* Sat Apr 11 2009 Rex Dieter - 4.3.1-3 +- optimize scriptlets +- Provides/Requires: phonon-backend%%{_isa} ... + * Tue Mar 3 2009 Luk???? Tinkl - 4.3.1-2 - backport GStreamer backend bugfixes (UTF-8 file handling, volume fader) From mbarnes at fedoraproject.org Mon May 4 17:01:06 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 17:01:06 +0000 (UTC) Subject: rpms/evolution/devel .cvsignore,1.113,1.114 sources,1.113,1.114 Message-ID: <20090504170106.C4B2A700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17594 Modified Files: .cvsignore sources Log Message: Helps to use the right tarball... Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v retrieving revision 1.113 retrieving revision 1.114 diff -u -p -r1.113 -r1.114 --- .cvsignore 4 May 2009 12:55:41 -0000 1.113 +++ .cvsignore 4 May 2009 17:00:34 -0000 1.114 @@ -1 +1 @@ -evolution-data-server-2.27.1.tar.bz2 +evolution-2.27.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v retrieving revision 1.113 retrieving revision 1.114 diff -u -p -r1.113 -r1.114 --- sources 4 May 2009 12:55:41 -0000 1.113 +++ sources 4 May 2009 17:00:34 -0000 1.114 @@ -1 +1 @@ -aaba865951d49a337dc53a8d56f1f0ed evolution-data-server-2.27.1.tar.bz2 +4105442e30499740b493ce43a1302a70 evolution-2.27.1.tar.bz2 From manawy at fedoraproject.org Mon May 4 17:07:56 2009 From: manawy at fedoraproject.org (Fabien Georget) Date: Mon, 4 May 2009 17:07:56 +0000 (UTC) Subject: rpms/xcowsay/devel import.log, NONE, 1.1 xcowfortune.desktop, NONE, 1.1 xcowsay.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504170756.58980700DB@cvs1.fedora.phx.redhat.com> Author: manawy Update of /cvs/pkgs/rpms/xcowsay/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18461/devel Modified Files: .cvsignore sources Added Files: import.log xcowfortune.desktop xcowsay.spec Log Message: * Mon Apr 4 Fabien Georget 1.1-1 - first commit --- NEW FILE import.log --- xcowsay-1_1-1_fc11:HEAD:xcowsay-1.1-1.fc11.src.rpm:1241456648 --- NEW FILE xcowfortune.desktop --- [Desktop Entry] Encoding=UTF-8 Type=Application Categories=Game Name=xcowfortune Terminal=false Comment=Displays a cute cow saying a fortune Exec=xcowfortune --- NEW FILE xcowsay.spec --- Name: xcowsay Version: 1.1 Release: 1%{?dist} Summary: Displays a cute cow and message on your desktop Group: Amusements/Games License: GPLv3+ URL: http://www.doof.me.uk/xcowsay Source0: http://www.nickg.me.uk/files/%{name}-%{version}.tar.gz Source1: xcowfortune.desktop BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: gtk2-devel BuildRequires: gettext BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils Requires: fortune-mod %description xcowsay displays a cute cow and message on your desktop. The message can be text or images (with xcowdream) xcowsay can run in daemon mode for sending your cow message with DBus. Inspired by the original cowsay. %prep %setup -q iconv -f iso-8859-1 -t utf-8 NEWS -o NEWS %build %configure --enable-dbus make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} desktop-file-install --vendor="" \ --dir=%{buildroot}%{_datadir}/applications/ \ %{SOURCE1} # xcowfortune is the only .desktop file because the other program #(xcowsay, xcowthink and xcowdream) need an argument %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc NEWS README COPYING AUTHORS ChangeLog %{_bindir}/xcowdream %{_bindir}/xcowfortune %{_bindir}/xcowsay %{_bindir}/xcowthink %{_datadir}/man/man6/xcowsay.6.gz %{_datadir}/xcowsay/ %{_datadir}/applications/xcowfortune.desktop %changelog * Tue Apr 28 2009 Fabien Georget 1.1-1 - change license to GPLv3+ - add /usr/share/xcowsay/ in files - add dbus-glib-devel in BR for daemon mode of xcowsay - add fortune-mod in Requires for xcowfortune - add xcowfortune.desktop * Mon Mar 30 2009 Fabien Georget 1.1-0.1 - Creation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xcowsay/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:39:57 -0000 1.1 +++ .cvsignore 4 May 2009 17:07:25 -0000 1.2 @@ -0,0 +1 @@ +xcowsay-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcowsay/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:39:57 -0000 1.1 +++ sources 4 May 2009 17:07:25 -0000 1.2 @@ -0,0 +1 @@ +cf08b324b67d5761158344adcea89402 xcowsay-1.1.tar.gz From manawy at fedoraproject.org Mon May 4 17:12:11 2009 From: manawy at fedoraproject.org (Fabien Georget) Date: Mon, 4 May 2009 17:12:11 +0000 (UTC) Subject: rpms/xcowsay/F-10 import.log, NONE, 1.1 xcowfortune.desktop, NONE, 1.1 xcowsay.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504171211.C07BF700DB@cvs1.fedora.phx.redhat.com> Author: manawy Update of /cvs/pkgs/rpms/xcowsay/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19433/F-10 Modified Files: .cvsignore sources Added Files: import.log xcowfortune.desktop xcowsay.spec Log Message: * Mon Apr 4 2009 Fabien Georget 1.1-1 - first commit --- NEW FILE import.log --- xcowsay-1_1-1_fc11:F-10:xcowsay-1.1-1.fc11.src.rpm:1241456966 --- NEW FILE xcowfortune.desktop --- [Desktop Entry] Encoding=UTF-8 Type=Application Categories=Game Name=xcowfortune Terminal=false Comment=Displays a cute cow saying a fortune Exec=xcowfortune --- NEW FILE xcowsay.spec --- Name: xcowsay Version: 1.1 Release: 1%{?dist} Summary: Displays a cute cow and message on your desktop Group: Amusements/Games License: GPLv3+ URL: http://www.doof.me.uk/xcowsay Source0: http://www.nickg.me.uk/files/%{name}-%{version}.tar.gz Source1: xcowfortune.desktop BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: gtk2-devel BuildRequires: gettext BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils Requires: fortune-mod %description xcowsay displays a cute cow and message on your desktop. The message can be text or images (with xcowdream) xcowsay can run in daemon mode for sending your cow message with DBus. Inspired by the original cowsay. %prep %setup -q iconv -f iso-8859-1 -t utf-8 NEWS -o NEWS %build %configure --enable-dbus make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} desktop-file-install --vendor="" \ --dir=%{buildroot}%{_datadir}/applications/ \ %{SOURCE1} # xcowfortune is the only .desktop file because the other program #(xcowsay, xcowthink and xcowdream) need an argument %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc NEWS README COPYING AUTHORS ChangeLog %{_bindir}/xcowdream %{_bindir}/xcowfortune %{_bindir}/xcowsay %{_bindir}/xcowthink %{_datadir}/man/man6/xcowsay.6.gz %{_datadir}/xcowsay/ %{_datadir}/applications/xcowfortune.desktop %changelog * Tue Apr 28 2009 Fabien Georget 1.1-1 - change license to GPLv3+ - add /usr/share/xcowsay/ in files - add dbus-glib-devel in BR for daemon mode of xcowsay - add fortune-mod in Requires for xcowfortune - add xcowfortune.desktop * Mon Mar 30 2009 Fabien Georget 1.1-0.1 - Creation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xcowsay/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:39:57 -0000 1.1 +++ .cvsignore 4 May 2009 17:11:41 -0000 1.2 @@ -0,0 +1 @@ +xcowsay-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcowsay/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:39:57 -0000 1.1 +++ sources 4 May 2009 17:11:41 -0000 1.2 @@ -0,0 +1 @@ +cf08b324b67d5761158344adcea89402 xcowsay-1.1.tar.gz From manawy at fedoraproject.org Mon May 4 17:17:13 2009 From: manawy at fedoraproject.org (Fabien Georget) Date: Mon, 4 May 2009 17:17:13 +0000 (UTC) Subject: rpms/xcowsay/F-11 import.log, NONE, 1.1 xcowfortune.desktop, NONE, 1.1 xcowsay.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504171713.CDA15700DB@cvs1.fedora.phx.redhat.com> Author: manawy Update of /cvs/pkgs/rpms/xcowsay/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20426/F-11 Modified Files: .cvsignore sources Added Files: import.log xcowfortune.desktop xcowsay.spec Log Message: * Mon Apr 4 2009 Fabien Georget 1.1-1 - first commit --- NEW FILE import.log --- xcowsay-1_1-1_fc11:F-11:xcowsay-1.1-1.fc11.src.rpm:1241457247 --- NEW FILE xcowfortune.desktop --- [Desktop Entry] Encoding=UTF-8 Type=Application Categories=Game Name=xcowfortune Terminal=false Comment=Displays a cute cow saying a fortune Exec=xcowfortune --- NEW FILE xcowsay.spec --- Name: xcowsay Version: 1.1 Release: 1%{?dist} Summary: Displays a cute cow and message on your desktop Group: Amusements/Games License: GPLv3+ URL: http://www.doof.me.uk/xcowsay Source0: http://www.nickg.me.uk/files/%{name}-%{version}.tar.gz Source1: xcowfortune.desktop BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: gtk2-devel BuildRequires: gettext BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils Requires: fortune-mod %description xcowsay displays a cute cow and message on your desktop. The message can be text or images (with xcowdream) xcowsay can run in daemon mode for sending your cow message with DBus. Inspired by the original cowsay. %prep %setup -q iconv -f iso-8859-1 -t utf-8 NEWS -o NEWS %build %configure --enable-dbus make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} desktop-file-install --vendor="" \ --dir=%{buildroot}%{_datadir}/applications/ \ %{SOURCE1} # xcowfortune is the only .desktop file because the other program #(xcowsay, xcowthink and xcowdream) need an argument %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc NEWS README COPYING AUTHORS ChangeLog %{_bindir}/xcowdream %{_bindir}/xcowfortune %{_bindir}/xcowsay %{_bindir}/xcowthink %{_datadir}/man/man6/xcowsay.6.gz %{_datadir}/xcowsay/ %{_datadir}/applications/xcowfortune.desktop %changelog * Tue Apr 28 2009 Fabien Georget 1.1-1 - change license to GPLv3+ - add /usr/share/xcowsay/ in files - add dbus-glib-devel in BR for daemon mode of xcowsay - add fortune-mod in Requires for xcowfortune - add xcowfortune.desktop * Mon Mar 30 2009 Fabien Georget 1.1-0.1 - Creation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xcowsay/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:39:57 -0000 1.1 +++ .cvsignore 4 May 2009 17:16:43 -0000 1.2 @@ -0,0 +1 @@ +xcowsay-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcowsay/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:39:57 -0000 1.1 +++ sources 4 May 2009 17:16:43 -0000 1.2 @@ -0,0 +1 @@ +cf08b324b67d5761158344adcea89402 xcowsay-1.1.tar.gz From mhlavink at fedoraproject.org Mon May 4 17:25:22 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 4 May 2009 17:25:22 +0000 (UTC) Subject: rpms/ecryptfs-utils/devel ecryptfs-utils-74-build.patch, NONE, 1.1 ecryptfs-utils-74-group.patch, NONE, 1.1 ecryptfs-utils-75-werror.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 ecryptfs-utils.spec, 1.43, 1.44 sources, 1.25, 1.26 Message-ID: <20090504172522.61FF6700DB@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ecryptfs-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21772 Modified Files: .cvsignore ecryptfs-utils.spec sources Added Files: ecryptfs-utils-74-build.patch ecryptfs-utils-74-group.patch ecryptfs-utils-75-werror.patch Log Message: updated to 75, restrict mount.ecryptfs_private to members of ecryptfs group only ecryptfs-utils-74-build.patch: --- NEW FILE ecryptfs-utils-74-build.patch --- diff -up ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 ecryptfs-utils-74/src/libecryptfs/Makefile.am --- ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 2009-04-20 11:03:03.000000000 +0200 +++ ecryptfs-utils-74/src/libecryptfs/Makefile.am 2009-04-23 17:03:16.178703120 +0200 @@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil lib_LTLIBRARIES = libecryptfs.la +noinst_LIBRARIES = libecryptfs.a + pkgconfig_DATA = libecryptfs.pc libecryptfs_la_SOURCES = \ @@ -20,10 +22,13 @@ libecryptfs_la_SOURCES = \ ecryptfs-stat.c \ $(top_srcdir)/src/key_mod/ecryptfs_key_mod_passphrase.c +libecryptfs_a_SOURCES = $(libecryptfs_la_SOURCES) + libecryptfs_la_LDFLAGS = \ -version-info @LIBECRYPTFS_LT_CURRENT@:@LIBECRYPTFS_LT_REVISION@:@LIBECRYPTFS_LT_AGE@ \ -no-undefined libecryptfs_la_CFLAGS = $(AM_CFLAGS) $(CRYPTO_CFLAGS) $(KEYUTILS_CFLAGS) +libecryptfs_a_CFLAGS = $(libecryptfs_la_CFLAGS) libecryptfs_la_LIBADD = $(CRYPTO_LIBS) $(KEYUTILS_LIBS) splint: diff -up ecryptfs-utils-74/src/utils/Makefile.am.486139 ecryptfs-utils-74/src/utils/Makefile.am --- ecryptfs-utils-74/src/utils/Makefile.am.486139 2009-04-20 11:03:03.000000000 +0200 +++ ecryptfs-utils-74/src/utils/Makefile.am 2009-04-23 17:12:38.297756365 +0200 @@ -35,12 +35,12 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) umount_ecryptfs_SOURCES = umount.ecryptfs.c umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) -umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la +umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.a $(KEYUTILS_LIBS) $(CRYPTO_LIBS) ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS) ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) ecryptfs_wrap_passphrase_SOURCES = ecryptfs_wrap_passphrase.c -ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la +ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la ecryptfs_unwrap_passphrase_SOURCES = ecryptfs_unwrap_passphrase.c ecryptfs_unwrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la ecryptfs_insert_wrapped_passphrase_into_keyring_SOURCES = ecryptfs_insert_wrapped_passphrase_into_keyring.c ecryptfs-utils-74-group.patch: --- NEW FILE ecryptfs-utils-74-group.patch --- diff -up ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1.group ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1 --- ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1.group 2009-03-05 22:17:36.000000000 +0100 +++ ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1 2009-05-04 13:14:54.861539319 +0200 @@ -6,7 +6,7 @@ ecryptfs-mount-private \- interactive eC \fBecryptfs-mount-private\fP .SH DESCRIPTION -\fBecryptfs-mount-private\fP is a wrapper script for the \fBmount.ecryptfs_private\fP utility that will interactively prompt for the user's login password, if necessary. +\fBecryptfs-mount-private\fP is a wrapper script for the \fBmount.ecryptfs_private\fP utility that will interactively prompt for the user's login password, if necessary. You need to be a member of \fBecryptfs\fB group to use this. .SH FILES \fI~/.Private\fP - underlying directory containing encrypted data diff -up ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1.group ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1 --- ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1.group 2009-03-18 22:59:07.000000000 +0100 +++ ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1 2009-05-04 13:14:54.861539319 +0200 @@ -43,7 +43,7 @@ Setup this user such that the encrypted .SH DESCRIPTION -\fBecryptfs-setup-private\fP is a program that sets up a private cryptographic mountpoint for a non-root user. +\fBecryptfs-setup-private\fP is a program that sets up a private cryptographic mountpoint for a non-root user, who is a member of \fBecryptfs\fP group. Be sure to properly escape your parameters according to your shell's special character nuances, and also surround the parameters by double quotes, if necessary. Any of the parameters may be: diff -up ecryptfs-utils-74/doc/manpage/mount.ecryptfs.8.group ecryptfs-utils-74/doc/manpage/mount.ecryptfs.8 diff -up ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1.group ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1 --- ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1.group 2009-03-05 22:17:36.000000000 +0100 +++ ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1 2009-05-04 13:20:07.673112485 +0200 @@ -8,7 +8,7 @@ mount.ecryptfs_private \- eCryptfs priva \fBNOTE:\fP This program will \fBnot\fP dynamically load the relevant keys. For this reason, it is recommended that users use \fBecryptfs-mount-private\fP(1) instead! .SH DESCRIPTION -\fBmount.ecryptfs_private\fP is a mount helper utility for non-root users to cryptographically mount a private directory, ~/Private. +\fBmount.ecryptfs_private\fP is a mount helper utility for non-root users, who are members of \fBecryptfs\fP group, to cryptographically mount a private directory, ~/Private. If, and only if: - the private mount passphrase is in their kernel keyring, and diff -up ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1.group ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1 --- ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1.group 2009-03-05 22:17:36.000000000 +0100 +++ ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1 2009-05-04 13:14:54.862538533 +0200 @@ -14,7 +14,7 @@ Options available for the \fBumount.ecry Force the unmount, ignoring the value of the mount counter in \fI/tmp/ecryptfs-USERNAME-Private\fP .SH DESCRIPTION -\fBumount.ecryptfs_private\fP is a mount helper utility for non-root users to unmount a cryptographically mounted private directory, ~/Private. +\fBumount.ecryptfs_private\fP is a mount helper utility for non-root users, who ares members of \fBecryptfs\fP group, to unmount a cryptographically mounted private directory, ~/Private. If, and only if: - the private mount passphrase is in their kernel keyring, and diff -up ecryptfs-utils-74/src/utils/ecryptfs-setup-private.group ecryptfs-utils-74/src/utils/ecryptfs-setup-private --- ecryptfs-utils-74/src/utils/ecryptfs-setup-private.group 2009-03-24 20:32:52.000000000 +0100 +++ ecryptfs-utils-74/src/utils/ecryptfs-setup-private 2009-05-04 13:14:54.862538533 +0200 @@ -188,6 +188,11 @@ else id "$USER" >/dev/null || error "User [$USER] does not exist" fi +# Check if user is member of ecryptfs group +if ! groups "$USER" | sed -e 's| |\n|g' | grep -n 'ecryptfs$'; then + error "User needs to be a member of ecryptfs group" +fi + # Obtain the user's home directory HOME=`getent passwd "$USER" | awk -F: '{print $6}'` if [ ! -d "$HOME" ]; then ecryptfs-utils-75-werror.patch: --- NEW FILE ecryptfs-utils-75-werror.patch --- diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c --- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror 2009-05-01 00:53:13.000000000 +0200 +++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-04 17:49:49.940220924 +0200 @@ -18,6 +18,7 @@ * 02111-1307, USA. */ +#include "config.h" #include #ifdef ENABLE_NSS #include @@ -39,7 +40,6 @@ #include #include #include -#include "config.h" #include "../include/ecryptfs.h" #ifndef ENOKEY diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c --- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror 2009-05-04 17:50:33.587240171 +0200 +++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c 2009-05-04 17:50:33.615345763 +0200 @@ -42,7 +42,6 @@ int main(int argc, char *argv[]) char *wrapping_passphrase; char salt[ECRYPTFS_SALT_SIZE]; char salt_hex[ECRYPTFS_SALT_SIZE_HEX]; - struct passwd *pwd; int rc = 0; if (argc == 1) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- .cvsignore 21 Mar 2009 07:30:12 -0000 1.24 +++ .cvsignore 4 May 2009 17:24:51 -0000 1.25 @@ -1 +1 @@ -ecryptfs-utils_73.orig.tar.gz +ecryptfs-utils_75.orig.tar.gz Index: ecryptfs-utils.spec =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- ecryptfs-utils.spec 21 Mar 2009 07:21:44 -0000 1.43 +++ ecryptfs-utils.spec 4 May 2009 17:24:51 -0000 1.44 @@ -2,19 +2,29 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: ecryptfs-utils -Version: 73 +Version: 75 Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ URL: https://launchpad.net/ecryptfs -Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz -Source1: http://bazaar.launchpad.net/%7Eecryptfs/ecryptfs/ecryptfs-utils/annotate/head%3A/src/desktop/ecryptfs-mount-private.desktop +Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz + +#fix wrong Makefile for umount.ecryptfs +Patch2: ecryptfs-utils-74-build.patch + +#restrict suid mount.ecryptfs_private to ecryptfs group only +#required for ecryptfs-utils <=75 +Patch3: ecryptfs-utils-74-group.patch + +#allow building with -Werror +#required for ecryptfs-utils <= 75 +Patch4: ecryptfs-utils-75-werror.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: keyutils BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel -BuildRequires: trousers-devel python python-devel nss-devel desktop-file-utils -Conflicts: kernel < 2.6.19 +BuildRequires: trousers-devel nss-devel desktop-file-utils %description eCryptfs is a stacked cryptographic filesystem that ships in Linux @@ -28,6 +38,7 @@ Install ecryptfs-utils if you would like Summary: The eCryptfs userspace development package Group: System Environment/Base Requires: keyutils-libs-devel %{name} = %{version}-%{release} +Requires: pkgconfig %description devel Userspace development files for eCryptfs. @@ -36,6 +47,7 @@ Userspace development files for eCryptfs Summary: Python bindings for the eCryptfs utils Group: System Environment/Base Requires: ecryptfs-utils %{name} = %{version}-%{release} +BuildRequires: python python-devel swig >= 1.3.31 %description python The ecryptfs-utils-python package contains a module that permits @@ -44,23 +56,41 @@ the interface supplied by the ecryptfs-u %prep %setup -q +%patch2 -p1 -b .build +%patch3 -p1 -b .group +%patch4 -p1 -b .werror %build -%configure --disable-rpath --enable-tspi --enable-nss +export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror" +%configure --disable-rpath --enable-tspi --enable-nss --enable-static +make clean #disable rpath 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 + +#remove -Werror flag for swig temporarily (swig is nasty #496613) +sed -i 's|-Werror||' src/libecryptfs-swig/Makefile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +find $RPM_BUILD_ROOT%{_libdir}/ -name '*.a' | xargs rm -f find $RPM_BUILD_ROOT%{_libdir}/ -name '*.la' | xargs rm -f -mv $RPM_BUILD_ROOT/%{_libdir}/libecryptfs.so* $RPM_BUILD_ROOT/%{_lib} rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} -install -D -m 644 doc/ecryptfs-mount-private.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.txt -desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/%{name} %{SOURCE1} +#install files Makefile forgot install +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-setup-private.desktop +touch -r src/desktop/ecryptfs-mount-private.desktop \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +touch -r src/desktop/ecryptfs-setup-private.desktop \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-record-passphrase + +%pre +groupadd -r -f ecryptfs %post -p /sbin/ldconfig @@ -74,10 +104,10 @@ rm -rf $RPM_BUILD_ROOT %doc README COPYING AUTHORS NEWS THANKS %doc doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt %doc doc/ecryptfs-pkcs11-helper-doc.txt -%attr(4755,root,root) /sbin/mount.ecryptfs -%attr(4755,root,root) /sbin/umount.ecryptfs -%attr(4755,root,root) /sbin/mount.ecryptfs_private -%attr(4755,root,root) /sbin/umount.ecryptfs_private +/sbin/mount.ecryptfs +/sbin/umount.ecryptfs +%attr(4750,root,ecryptfs) /sbin/mount.ecryptfs_private +/sbin/umount.ecryptfs_private %{_bindir}/ecryptfs-manager %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring %{_bindir}/ecryptfs-rewrap-passphrase @@ -92,13 +122,15 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ecryptfs-umount-private %{_bindir}/ecryptfs-stat %{_bindir}/ecryptfsd -/%{_lib}/libecryptfs.so.0.0.0 -/%{_lib}/libecryptfs.so.0 +%{_bindir}/ecryptfs-dot-private %{_libdir}/ecryptfs +%{_libdir}/libecryptfs.so.0 +%{_libdir}/libecryptfs.so.0.0.0 /%{_lib}/security/pam_ecryptfs.so %dir %{_datadir}/%{name} %{_datadir}/%{name}/ecryptfs-mount-private.txt %{_datadir}/%{name}/ecryptfs-mount-private.desktop +%{_datadir}/%{name}/ecryptfs-setup-private.desktop %{_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 @@ -119,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -/%{_lib}/libecryptfs.so +%{_libdir}/libecryptfs.so %{_libdir}/pkgconfig/libecryptfs.pc %{_includedir}/ecryptfs.h @@ -135,6 +167,13 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Mon May 04 2009 Michal Hlavinka 75-1 +- updated to 75 +- restrict mount.ecryptfs_private to ecryptfs group members only + +* Thu Apr 23 2009 Michal Hlavinka 74-1 +- updated to 74 + * Sat Mar 21 2009 Michal Hlavinka 73-1 - updated to 73 - move libs from /usr/lib to /lib (#486139) Index: sources =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sources 21 Mar 2009 07:30:12 -0000 1.25 +++ sources 4 May 2009 17:24:51 -0000 1.26 @@ -1 +1 @@ -8e651749b9d75ee9a4d4894483022857 ecryptfs-utils_73.orig.tar.gz +2c4e8be38d1ea8cadd9f870f15430f07 ecryptfs-utils_75.orig.tar.gz From mbarnes at fedoraproject.org Mon May 4 17:32:01 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 17:32:01 +0000 (UTC) Subject: rpms/evolution/devel evolution-2.27.1-build-break.patch, NONE, 1.1 evolution.spec, 1.384, 1.385 Message-ID: <20090504173201.7233F700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23354 Modified Files: evolution.spec Added Files: evolution-2.27.1-build-break.patch Log Message: Fix a build break in 2.27.1. evolution-2.27.1-build-break.patch: --- NEW FILE evolution-2.27.1-build-break.patch --- diff -up evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c.build-break evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c --- evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c.build-break 2009-05-04 13:27:14.000000000 -0400 +++ evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c 2009-05-04 13:27:37.000000000 -0400 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.384 retrieving revision 1.385 diff -u -p -r1.384 -r1.385 --- evolution.spec 4 May 2009 12:55:41 -0000 1.384 +++ evolution.spec 4 May 2009 17:31:30 -0000 1.385 @@ -68,6 +68,8 @@ Patch11: evolution-2.5.4-fix-conduit-dir # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +Patch13: evolution-2.27.1-build-break.patch + ## Dependencies ### Requires(post): GConf2 @@ -225,6 +227,7 @@ This package contains supplemental utili %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .build-break mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From lkundrak at fedoraproject.org Mon May 4 17:33:18 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Mon, 4 May 2009 17:33:18 +0000 (UTC) Subject: rpms/NetworkManager-vpnc/EL-5 NetworkManager-vpnc-0.7.0.99-desc.patch, NONE, 1.1 NetworkManager-vpnc.spec, 1.26, 1.27 Message-ID: <20090504173318.1A0D1700DB@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23801 Modified Files: NetworkManager-vpnc.spec Added Files: NetworkManager-vpnc-0.7.0.99-desc.patch Log Message: * Mon May 4 2009 Lubomir Rintel 1:0.7.0.99-1.4 - Accept Description-less PCF files (#497992) NetworkManager-vpnc-0.7.0.99-desc.patch: --- NEW FILE NetworkManager-vpnc-0.7.0.99-desc.patch --- Tolerate PCF file with no Description. Lubomir Rintel diff -urp NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c NetworkManager-vpnc-0.7.0.99.desc/properties/nm-vpnc.c --- NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c 2009-04-30 20:23:58.000000000 +0200 +++ NetworkManager-vpnc-0.7.0.99.desc/properties/nm-vpnc.c 2009-04-30 20:19:05.000000000 +0200 @@ -986,7 +986,7 @@ import (NMVpnPluginUiInterface *iface, c pcf = pcf_file_load (path); if (!pcf) { - g_set_error (error, 0, 0, "does not look like a %s VPN connection", + g_set_error (error, 0, 0, "does not look like a %s VPN connection (parse failed)", VPNC_PLUGIN_NAME); return NULL; } @@ -1002,16 +1002,6 @@ import (NMVpnPluginUiInterface *iface, c s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); nm_connection_add_setting (connection, NM_SETTING (s_ip4)); - /* Connection name */ - if (pcf_file_lookup_string (pcf, "main", "Description", &buf)) - g_object_set (s_con, NM_SETTING_CONNECTION_ID, buf, NULL); - else { - g_set_error (error, 0, 0, "does not look like a %s VPN connection (parse failed)", - VPNC_PLUGIN_NAME); - g_object_unref (connection); - return NULL; - } - /* Gateway */ if (pcf_file_lookup_string (pcf, "main", "Host", &buf)) nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_GATEWAY, buf); @@ -1034,6 +1024,10 @@ import (NMVpnPluginUiInterface *iface, c /* Optional settings */ + /* Connection name */ + if (pcf_file_lookup_string (pcf, "main", "Description", &buf)) + g_object_set (s_con, NM_SETTING_CONNECTION_ID, buf, NULL); + if (pcf_file_lookup_string (pcf, "main", "UserName", &buf)) nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER, buf); diff -urp NetworkManager-vpnc-0.7.0.99/properties/pcf-file.c NetworkManager-vpnc-0.7.0.99.desc/properties/pcf-file.c --- NetworkManager-vpnc-0.7.0.99/properties/pcf-file.c 2009-02-06 01:00:18.000000000 +0100 +++ NetworkManager-vpnc-0.7.0.99.desc/properties/pcf-file.c 2009-04-30 20:23:27.000000000 +0200 @@ -125,6 +125,10 @@ pcf_file_load (const char *fname) g_hash_table_insert (group, entry->key, entry); } } + + /* Contains a main section? */ + if (!g_hash_table_lookup (pcf, "main")) + goto fail; fclose (fo); Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5/NetworkManager-vpnc.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- NetworkManager-vpnc.spec 10 Apr 2009 12:28:36 -0000 1.26 +++ NetworkManager-vpnc.spec 4 May 2009 17:32:47 -0000 1.27 @@ -10,13 +10,14 @@ Summary: NetworkManager VPN plugin for Name: NetworkManager-vpnc Epoch: 1 Version: 0.7.0.99 -Release: 1%{svn_snapshot}%{?dist}.3 +Release: 1%{svn_snapshot}%{?dist}.4 License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}%{svn_snapshot}.tar.gz Patch0: NetworkManager-vpnc-0.7.0.99-keyring.patch Patch1: NetworkManager-vpnc-0.7.0.99-null.patch +Patch2: NetworkManager-vpnc-0.7.0.99-desc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -49,6 +50,7 @@ with NetworkManager and the GNOME deskto %setup -q %patch0 -p1 -b .keyring %patch1 -p1 -b .null +%patch2 -p1 -b .desc %build @@ -103,6 +105,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/vpnc %changelog +* Mon May 4 2009 Lubomir Rintel 1:0.7.0.99-1.4 +- Accept Description-less PCF files (#497992) + * Fri Apr 10 2009 Lubomir Rintel 1:0.7.0.99-1.3 - Fix keyring NULL dereference From pkgdb at fedoraproject.org Mon May 4 17:40:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 17:40:58 +0000 Subject: [pkgdb] aircrack-ng: erboho has requested watchcommits Message-ID: <20090504174058.2FAC810F890@bastion2.fedora.phx.redhat.com> erboho has requested the watchcommits acl on aircrack-ng (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng From pkgdb at fedoraproject.org Mon May 4 17:41:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 17:41:31 +0000 Subject: [pkgdb] aircrack-ng: erboho has given up watchcommits Message-ID: <20090504174131.8029A10F893@bastion2.fedora.phx.redhat.com> erboho has given up the watchcommits acl on aircrack-ng (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng From ajax at fedoraproject.org Mon May 4 18:01:15 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Mon, 4 May 2009 18:01:15 +0000 (UTC) Subject: rpms/xorg-x11-server/F-11 xserver-1.6.1-nouveau.patch, NONE, 1.1 xorg-x11-server.spec, 1.441, 1.442 xserver-1.5.99.902-nouveau.patch, 1.1, NONE Message-ID: <20090504180116.4CFEF700DB@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27439 Modified Files: xorg-x11-server.spec Added Files: xserver-1.6.1-nouveau.patch Removed Files: xserver-1.5.99.902-nouveau.patch Log Message: * Mon May 04 2009 Adam Jackson 1.6.1-10 - xserver-1.6.1-nouveau.patch: Update the autoconfig logic for nv3 and other historical oddities. xserver-1.6.1-nouveau.patch: --- NEW FILE xserver-1.6.1-nouveau.patch --- >From 10a3e677aa00d1fbeb4ec8cd5c77d609bc7091a7 Mon Sep 17 00:00:00 2001 From: Fedora X Ninjas Date: Mon, 16 Feb 2009 15:50:14 +1000 Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs --- hw/xfree86/common/xf86AutoConfig.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 19c06c8..e40551e 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -181,7 +181,26 @@ videoPtrToDriverList(struct pci_device *dev, case 0x102b: driverList[0] = "mga"; break; case 0x10c8: driverList[0] = "neomagic"; break; case 0x105d: driverList[0] = "i128"; break; - case 0x10de: case 0x12d2: driverList[0] = "nv"; break; + case 0x10de: case 0x12d2: + switch (dev->device_id & 0xfff0) { + /* NV1 */ + case 0x0008: + case 0x0009: + /* Non-functional with both nouveau and nv */ + case 0x0840: + case 0x0860: + driverList[0] = "vesa"; + break; + /* NV3 */ + case 0x0018: + case 0x0019: + driverList[0] = "nv"; + break; + default: + driverList[0] = "nouveau"; + break; + } + break; case 0x1163: driverList[0] = "rendition"; break; case 0x5333: switch (dev->device_id) -- 1.6.2.2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v retrieving revision 1.441 retrieving revision 1.442 diff -u -p -r1.441 -r1.442 --- xorg-x11-server.spec 23 Apr 2009 18:39:19 -0000 1.441 +++ xorg-x11-server.spec 4 May 2009 18:00:44 -0000 1.442 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.1 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -89,7 +89,7 @@ Patch6013: xserver-1.6.0-selinux-less.pa Patch6015: xserver-1.5.99.902-vnc.patch # Make autoconfiguration chose nouveau driver for NVIDIA GPUs -Patch6016: xserver-1.5.99.902-nouveau.patch +Patch6016: xserver-1.6.1-nouveau.patch Patch6022: xserver-1.6.0-primary.patch @@ -544,6 +544,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 04 2009 Adam Jackson 1.6.1-10 +- xserver-1.6.1-nouveau.patch: Update the autoconfig logic for nv3 and other + historical oddities. + * Thu Apr 23 2009 Adam Jackson 1.6.1-9 - xserver-1.6.1-avoid-malloc-for-logging.patch: Don't malloc when logging, since that makes it unsafe to do from a signal handler. --- xserver-1.5.99.902-nouveau.patch DELETED --- From rdieter at fedoraproject.org Mon May 4 18:10:47 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 18:10:47 +0000 (UTC) Subject: rpms/libvncserver/devel libvncserver-0.9.7-system_minilzo.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libvncserver.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090504181047.994B4700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libvncserver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29355 Modified Files: .cvsignore libvncserver.spec sources Added Files: libvncserver-0.9.7-system_minilzo.patch Log Message: * Mon May 04 2009 Rex Dieter - 0.9.7-1 - LibVNCServer-0.9.7 libvncserver-0.9.7-system_minilzo.patch: --- NEW FILE libvncserver-0.9.7-system_minilzo.patch --- diff -up LibVNCServer-0.9.7/libvncclient/Makefile.in.orig LibVNCServer-0.9.7/libvncclient/Makefile.in --- LibVNCServer-0.9.7/libvncclient/Makefile.in.orig 2009-01-11 20:53:13.000000000 -0600 +++ LibVNCServer-0.9.7/libvncclient/Makefile.in 2009-05-04 12:33:14.513826561 -0500 @@ -61,7 +61,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libvncclient_la_LIBADD = am_libvncclient_la_OBJECTS = cursor.lo listen.lo rfbproto.lo \ - sockets.lo vncviewer.lo minilzo.lo + sockets.lo vncviewer.lo libvncclient_la_OBJECTS = $(am_libvncclient_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -222,8 +222,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ with_ffmpeg = @with_ffmpeg@ AM_CFLAGS = -g -I $(top_srcdir) -I. -Wall -libvncclient_la_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c minilzo.c -noinst_HEADERS = lzoconf.h minilzo.h +libvncclient_la_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c +noinst_HEADERS = lzoconf.h EXTRA_DIST = corre.c hextile.c rre.c tight.c zlib.c zrle.c ultra.c lib_LTLIBRARIES = libvncclient.la all: all-am @@ -297,7 +297,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cursor.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/listen.Plo at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/minilzo.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfbproto.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sockets.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vncviewer.Plo at am__quote@ diff -up LibVNCServer-0.9.7/libvncclient/rfbproto.c.orig LibVNCServer-0.9.7/libvncclient/rfbproto.c --- LibVNCServer-0.9.7/libvncclient/rfbproto.c.orig 2008-02-04 11:58:11.000000000 -0600 +++ LibVNCServer-0.9.7/libvncclient/rfbproto.c 2009-05-04 12:33:14.514826549 -0500 @@ -50,7 +50,7 @@ #include #include -#include "minilzo.h" +#include /* * rfbClientLog prints a time-stamped message to the log file (stderr). diff -up LibVNCServer-0.9.7/libvncserver/Makefile.in.orig LibVNCServer-0.9.7/libvncserver/Makefile.in --- LibVNCServer-0.9.7/libvncserver/Makefile.in.orig 2009-01-11 20:53:13.000000000 -0600 +++ LibVNCServer-0.9.7/libvncserver/Makefile.in 2009-05-04 12:40:31.533854737 -0500 @@ -63,7 +63,7 @@ libvncserver_la_LIBADD = am__libvncserver_la_SOURCES_DIST = main.c rfbserver.c rfbregion.c \ auth.c sockets.c stats.c corre.c hextile.c rre.c translate.c \ cutpaste.c httpd.c cursor.c font.c draw.c selbox.c d3des.c \ - vncauth.c cargs.c minilzo.c ultra.c scale.c zlib.c zrle.c \ + vncauth.c cargs.c ultra.c scale.c zlib.c zrle.c \ zrleoutstream.c zrlepalettehelper.c zywrletemplate.c tight.c \ tightvnc-filetransfer/rfbtightserver.c \ tightvnc-filetransfer/handlefiletransferrequest.c \ @@ -79,7 +79,7 @@ am__libvncserver_la_SOURCES_DIST = main. am__objects_4 = main.lo rfbserver.lo rfbregion.lo auth.lo sockets.lo \ stats.lo corre.lo hextile.lo rre.lo translate.lo cutpaste.lo \ httpd.lo cursor.lo font.lo draw.lo selbox.lo d3des.lo \ - vncauth.lo cargs.lo minilzo.lo ultra.lo scale.lo \ + vncauth.lo cargs.lo ultra.lo scale.lo \ $(am__objects_1) $(am__objects_2) $(am__objects_3) am_libvncserver_la_OBJECTS = $(am__objects_4) libvncserver_la_OBJECTS = $(am_libvncserver_la_OBJECTS) @@ -98,7 +98,7 @@ SOURCES = $(libvncserver_la_SOURCES) DIST_SOURCES = $(am__libvncserver_la_SOURCES_DIST) includeHEADERS_INSTALL = $(INSTALL_HEADER) am__noinst_HEADERS_DIST = d3des.h ../rfb/default8x16.h zrleoutstream.h \ - zrlepalettehelper.h zrletypes.h private.h minilzo.h lzoconf.h \ + zrlepalettehelper.h zrletypes.h private.h lzoconf.h \ scale.h tightvnc-filetransfer/filelistinfo.h \ tightvnc-filetransfer/filetransfermsg.h \ tightvnc-filetransfer/handlefiletransferrequest.h \ @@ -264,7 +264,7 @@ include_HEADERS = ../rfb/rfb.h ../rfb/rf ../rfb/rfbproto.h ../rfb/keysym.h ../rfb/rfbregion.h ../rfb/rfbclient.h noinst_HEADERS = d3des.h ../rfb/default8x16.h zrleoutstream.h \ - zrlepalettehelper.h zrletypes.h private.h minilzo.h lzoconf.h scale.h \ + zrlepalettehelper.h zrletypes.h private.h lzoconf.h scale.h \ $(TIGHTVNCFILETRANSFERHDRS) EXTRA_DIST = tableinit24.c tableinittctemplate.c tabletranstemplate.c \ @@ -276,7 +276,7 @@ EXTRA_DIST = tableinit24.c tableinittcte LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \ stats.c corre.c hextile.c rre.c translate.c cutpaste.c \ httpd.c cursor.c font.c \ - draw.c selbox.c d3des.c vncauth.c cargs.c minilzo.c ultra.c scale.c \ + draw.c selbox.c d3des.c vncauth.c cargs.c ultra.c scale.c \ $(ZLIBSRCS) $(JPEGSRCS) $(TIGHTVNCFILETRANSFERSRCS) libvncserver_la_SOURCES = $(LIB_SRCS) @@ -364,7 +364,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hextile.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/httpd.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Plo at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/minilzo.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfbregion.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfbserver.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfbtightserver.Plo at am__quote@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 14 Apr 2008 20:40:24 -0000 1.3 +++ .cvsignore 4 May 2009 18:10:16 -0000 1.4 @@ -1,2 +1 @@ -LibVNCServer-0.9.1.tar.gz -libvnc-minilzo.patch +LibVNCServer-0.9.7.tar.gz Index: libvncserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/devel/libvncserver.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- libvncserver.spec 25 Feb 2009 19:51:06 -0000 1.4 +++ libvncserver.spec 4 May 2009 18:10:17 -0000 1.5 @@ -3,29 +3,24 @@ Summary: Library to make writing a vnc server easy Name: libvncserver -Version: 0.9.1 -Release: 4%{?dist} +Version: 0.9.7 +Release: 1%{?dist} # NOTE: --with-tightvnc-filetransfer => GPLv2 License: GPLv2+ Group: System Environment/Libraries URL: http://libvncserver.sourceforge.net/ Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz -Patch0: libvnc-minilzo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# FIXME/TODO -#Patch1: libvncserver-0.9.1-pkgconfig.patch -# until patch1 works, this will do +Patch1: libvncserver-0.9.7-system_minilzo.patch Patch2: libvncserver-0.9.1-multilib.patch # upstream name Obsoletes: LibVNCServer < %{version}-%{release} Provides: LibVNCServer = %{version}-%{release} -#BuildRequires: automake libtool BuildRequires: findutils BuildRequires: libjpeg-devel -#BuildRequires: libICE-devel libXdamage-devel libXfixes-devel libXinerama-devel libXrandr-devel BuildRequires: zlib-devel BuildRequires: lzo-minilzo lzo-devel @@ -43,7 +38,7 @@ Requires: %{name} = %{version}-%{release # libvncserver-config deps Requires: coreutils # upstream name -Obsoletes: LibVNCServer-devel < %{version}-%{release} +#Obsoletes: LibVNCServer-devel < %{version}-%{release} Provides: LibVNCServer-devel = %{version}-%{release} %description devel %{summary}. @@ -51,14 +46,11 @@ Provides: LibVNCServer-devel = %{versio %prep %setup -q -n LibVNCServer-%{version} + +%patch1 -p1 -b .system_minilzo #nuke bundled minilzo -%patch0 -p1 find . -name minilzo\* -exec rm -f {} \; -#patch1 -p1 -b .pkgconfig -#aclocal -#automake - %patch2 -p1 -b .multilib # fix encoding @@ -70,11 +62,11 @@ touch --reference AUTHORS.OLD AUTHORS find -name "*.c" -o -name "*.h" | xargs chmod 644 - %build %configure \ --disable-static \ --without-tightvnc-filetransfer + # hack to omit unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool @@ -104,16 +96,21 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{_libdir}/lib*.so.* +%{_libdir}/libvncclient.so.0* +%{_libdir}/libvncserver.so.0* %files devel %defattr(-,root,root,-) %{_bindir}/*-config %{_includedir}/rfb/ -%{_libdir}/lib*.so +%{_libdir}/libvncclient.so +%{_libdir}/libvncserver.so %changelog +* Mon May 04 2009 Rex Dieter - 0.9.7-1 +- LibVNCServer-0.9.7 + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 14 Apr 2008 20:40:24 -0000 1.3 +++ sources 4 May 2009 18:10:17 -0000 1.4 @@ -1,2 +1 @@ -aa00efc3dabde82fde9509bfbab0aba4 LibVNCServer-0.9.1.tar.gz -0e0db2560a08d993306442294121c3b7 libvnc-minilzo.patch +14af5bdae461df4666c18e5f83c150c4 LibVNCServer-0.9.7.tar.gz From mschwendt at fedoraproject.org Mon May 4 18:11:05 2009 From: mschwendt at fedoraproject.org (Michael Schwendt) Date: Mon, 4 May 2009 18:11:05 +0000 (UTC) Subject: rpms/uuid/devel uuid.spec,1.13,1.14 Message-ID: <20090504181105.701D5700DB@cvs1.fedora.phx.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/uuid/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29407 Modified Files: uuid.spec Log Message: * Mon May 4 2009 Michael Schwendt - 1.6.1-5 - Replace expensive %{_libdir}/pkgconfig dependency in uuid-devel with pkgconfig%{_isa} for Fedora >= 11 (#484849). Index: uuid.spec =================================================================== RCS file: /cvs/pkgs/rpms/uuid/devel/uuid.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- uuid.spec 25 Feb 2009 23:40:53 -0000 1.13 +++ uuid.spec 4 May 2009 18:10:35 -0000 1.14 @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -24,7 +24,11 @@ and Perl Data::UUID APIs. %package devel Summary: Development support for Universally Unique Identifier library Group: Development/Libraries +%if 0%{?fedora} > 10 +Requires: pkgconfig%{_isa} +%else Requires: %{_libdir}/pkgconfig +%endif Requires: %{name} = %{version}-%{release} %description devel @@ -235,11 +239,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Mon May 4 2009 Michael Schwendt - 1.6.1-5 +- Replace expensive %%{_libdir}/pkgconfig dependency in uuid-devel + with pkgconfig%%{_isa} for Fedora >= 11 (#484849). + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu Mar 06 2008 Tom "spot" Callaway - 1.6.1-3 -Rebuild for new perl +- Rebuild for new perl * Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-2 - forgot to cvs add patch From rdieter at fedoraproject.org Mon May 4 18:18:56 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 18:18:56 +0000 (UTC) Subject: rpms/libvncserver/EL-5 libvncserver-0.9.7-system_minilzo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libvncserver.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090504181856.DF9AD700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libvncserver/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30519 Modified Files: .cvsignore libvncserver.spec sources Added Files: libvncserver-0.9.7-system_minilzo.patch Log Message: * Mon May 04 2009 Rex Dieter - 0.9.7-1 - LibVNCServer-0.9.7 libvncserver-0.9.7-system_minilzo.patch: --- NEW FILE libvncserver-0.9.7-system_minilzo.patch --- diff -up LibVNCServer-0.9.7/libvncclient/Makefile.in.orig LibVNCServer-0.9.7/libvncclient/Makefile.in --- LibVNCServer-0.9.7/libvncclient/Makefile.in.orig 2009-01-11 20:53:13.000000000 -0600 +++ LibVNCServer-0.9.7/libvncclient/Makefile.in 2009-05-04 12:33:14.513826561 -0500 @@ -61,7 +61,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libvncclient_la_LIBADD = am_libvncclient_la_OBJECTS = cursor.lo listen.lo rfbproto.lo \ - sockets.lo vncviewer.lo minilzo.lo + sockets.lo vncviewer.lo libvncclient_la_OBJECTS = $(am_libvncclient_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -222,8 +222,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ with_ffmpeg = @with_ffmpeg@ AM_CFLAGS = -g -I $(top_srcdir) -I. -Wall -libvncclient_la_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c minilzo.c -noinst_HEADERS = lzoconf.h minilzo.h +libvncclient_la_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c +noinst_HEADERS = lzoconf.h EXTRA_DIST = corre.c hextile.c rre.c tight.c zlib.c zrle.c ultra.c lib_LTLIBRARIES = libvncclient.la all: all-am @@ -297,7 +297,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cursor.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/listen.Plo at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/minilzo.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfbproto.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sockets.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vncviewer.Plo at am__quote@ diff -up LibVNCServer-0.9.7/libvncclient/rfbproto.c.orig LibVNCServer-0.9.7/libvncclient/rfbproto.c --- LibVNCServer-0.9.7/libvncclient/rfbproto.c.orig 2008-02-04 11:58:11.000000000 -0600 +++ LibVNCServer-0.9.7/libvncclient/rfbproto.c 2009-05-04 12:33:14.514826549 -0500 @@ -50,7 +50,7 @@ #include #include -#include "minilzo.h" +#include /* * rfbClientLog prints a time-stamped message to the log file (stderr). diff -up LibVNCServer-0.9.7/libvncserver/Makefile.in.orig LibVNCServer-0.9.7/libvncserver/Makefile.in --- LibVNCServer-0.9.7/libvncserver/Makefile.in.orig 2009-01-11 20:53:13.000000000 -0600 +++ LibVNCServer-0.9.7/libvncserver/Makefile.in 2009-05-04 12:40:31.533854737 -0500 @@ -63,7 +63,7 @@ libvncserver_la_LIBADD = am__libvncserver_la_SOURCES_DIST = main.c rfbserver.c rfbregion.c \ auth.c sockets.c stats.c corre.c hextile.c rre.c translate.c \ cutpaste.c httpd.c cursor.c font.c draw.c selbox.c d3des.c \ - vncauth.c cargs.c minilzo.c ultra.c scale.c zlib.c zrle.c \ + vncauth.c cargs.c ultra.c scale.c zlib.c zrle.c \ zrleoutstream.c zrlepalettehelper.c zywrletemplate.c tight.c \ tightvnc-filetransfer/rfbtightserver.c \ tightvnc-filetransfer/handlefiletransferrequest.c \ @@ -79,7 +79,7 @@ am__libvncserver_la_SOURCES_DIST = main. am__objects_4 = main.lo rfbserver.lo rfbregion.lo auth.lo sockets.lo \ stats.lo corre.lo hextile.lo rre.lo translate.lo cutpaste.lo \ httpd.lo cursor.lo font.lo draw.lo selbox.lo d3des.lo \ - vncauth.lo cargs.lo minilzo.lo ultra.lo scale.lo \ + vncauth.lo cargs.lo ultra.lo scale.lo \ $(am__objects_1) $(am__objects_2) $(am__objects_3) am_libvncserver_la_OBJECTS = $(am__objects_4) libvncserver_la_OBJECTS = $(am_libvncserver_la_OBJECTS) @@ -98,7 +98,7 @@ SOURCES = $(libvncserver_la_SOURCES) DIST_SOURCES = $(am__libvncserver_la_SOURCES_DIST) includeHEADERS_INSTALL = $(INSTALL_HEADER) am__noinst_HEADERS_DIST = d3des.h ../rfb/default8x16.h zrleoutstream.h \ - zrlepalettehelper.h zrletypes.h private.h minilzo.h lzoconf.h \ + zrlepalettehelper.h zrletypes.h private.h lzoconf.h \ scale.h tightvnc-filetransfer/filelistinfo.h \ tightvnc-filetransfer/filetransfermsg.h \ tightvnc-filetransfer/handlefiletransferrequest.h \ @@ -264,7 +264,7 @@ include_HEADERS = ../rfb/rfb.h ../rfb/rf ../rfb/rfbproto.h ../rfb/keysym.h ../rfb/rfbregion.h ../rfb/rfbclient.h noinst_HEADERS = d3des.h ../rfb/default8x16.h zrleoutstream.h \ - zrlepalettehelper.h zrletypes.h private.h minilzo.h lzoconf.h scale.h \ + zrlepalettehelper.h zrletypes.h private.h lzoconf.h scale.h \ $(TIGHTVNCFILETRANSFERHDRS) EXTRA_DIST = tableinit24.c tableinittctemplate.c tabletranstemplate.c \ @@ -276,7 +276,7 @@ EXTRA_DIST = tableinit24.c tableinittcte LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \ stats.c corre.c hextile.c rre.c translate.c cutpaste.c \ httpd.c cursor.c font.c \ - draw.c selbox.c d3des.c vncauth.c cargs.c minilzo.c ultra.c scale.c \ + draw.c selbox.c d3des.c vncauth.c cargs.c ultra.c scale.c \ $(ZLIBSRCS) $(JPEGSRCS) $(TIGHTVNCFILETRANSFERSRCS) libvncserver_la_SOURCES = $(LIB_SRCS) @@ -364,7 +364,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hextile.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/httpd.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Plo at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/minilzo.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfbregion.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfbserver.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfbtightserver.Plo at am__quote@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 1 Feb 2008 13:32:23 -0000 1.2 +++ .cvsignore 4 May 2009 18:18:26 -0000 1.3 @@ -1 +1 @@ -LibVNCServer-0.9.1.tar.gz +LibVNCServer-0.9.7.tar.gz Index: libvncserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/EL-5/libvncserver.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- libvncserver.spec 1 Feb 2008 13:32:23 -0000 1.1 +++ libvncserver.spec 4 May 2009 18:18:26 -0000 1.2 @@ -1,8 +1,10 @@ +# Fedora pkg review: http://bugzilla.redhat.com/429749 + Summary: Library to make writing a vnc server easy Name: libvncserver -Version: 0.9.1 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} # NOTE: --with-tightvnc-filetransfer => GPLv2 License: GPLv2+ Group: System Environment/Libraries @@ -10,20 +12,17 @@ URL: http://libvncserver.sourceforge Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# FIXME/TODO -#Patch1: libvncserver-0.9.1-pkgconfig.patch -# until patch1 works, this will do +Patch1: libvncserver-0.9.7-system_minilzo.patch Patch2: libvncserver-0.9.1-multilib.patch # upstream name Obsoletes: LibVNCServer < %{version}-%{release} Provides: LibVNCServer = %{version}-%{release} -#BuildRequires: automake libtool BuildRequires: findutils BuildRequires: libjpeg-devel -#BuildRequires: libICE-devel libXdamage-devel libXfixes-devel libXinerama-devel libXrandr-devel BuildRequires: zlib-devel +BuildRequires: lzo-minilzo lzo-devel %description LibVNCServer makes writing a VNC server (or more correctly, a program @@ -39,7 +38,7 @@ Requires: %{name} = %{version}-%{release # libvncserver-config deps Requires: coreutils # upstream name -Obsoletes: LibVNCServer-devel < %{version}-%{release} +#Obsoletes: LibVNCServer-devel < %{version}-%{release} Provides: LibVNCServer-devel = %{version}-%{release} %description devel %{summary}. @@ -48,9 +47,9 @@ Provides: LibVNCServer-devel = %{versio %prep %setup -q -n LibVNCServer-%{version} -#patch1 -p1 -b .pkgconfig -#aclocal -#automake +%patch1 -p1 -b .system_minilzo +#nuke bundled minilzo +find . -name minilzo\* -exec rm -f {} \; %patch2 -p1 -b .multilib @@ -63,7 +62,6 @@ touch --reference AUTHORS.OLD AUTHORS find -name "*.c" -o -name "*.h" | xargs chmod 644 - %build %configure \ --disable-static \ @@ -72,7 +70,7 @@ find -name "*.c" -o -name "*.h" | xargs # hack to omit unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo" %install @@ -98,16 +96,27 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{_libdir}/lib*.so.* +%{_libdir}/libvncclient.so.0* +%{_libdir}/libvncserver.so.0* %files devel %defattr(-,root,root,-) %{_bindir}/*-config %{_includedir}/rfb/ -%{_libdir}/lib*.so +%{_libdir}/libvncclient.so +%{_libdir}/libvncserver.so %changelog +* Mon May 04 2009 Rex Dieter - 0.9.7-1 +- LibVNCServer-0.9.7 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Apr 10 2008 Manuel Wolfshant 0.9.1-3 +- do not use bundled copy of minilzo + * Sun Jan 27 2008 Rex Dieter 0.9.1-2 - hack libtool to omit unused shlib dependencies - fix AUTHORS encoding Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 1 Feb 2008 13:32:23 -0000 1.2 +++ sources 4 May 2009 18:18:26 -0000 1.3 @@ -1 +1 @@ -aa00efc3dabde82fde9509bfbab0aba4 LibVNCServer-0.9.1.tar.gz +14af5bdae461df4666c18e5f83c150c4 LibVNCServer-0.9.7.tar.gz From dwalsh at fedoraproject.org Mon May 4 18:20:30 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 4 May 2009 18:20:30 +0000 (UTC) Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.107, 1.108 selinux-policy.spec, 1.844, 1.845 Message-ID: <20090504182030.0D942700DB@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30909 Modified Files: policy-20090105.patch selinux-policy.spec Log Message: * Fri May 1 2009 Dan Walsh 3.6.12-27 - Fix /sbin/ip6tables-save context - Allod udev to transition to mount - Fix loading of mls policy file policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.107 retrieving revision 1.108 diff -u -p -r1.107 -r1.108 --- policy-20090105.patch 2 May 2009 11:52:11 -0000 1.107 +++ policy-20090105.patch 4 May 2009 18:20:27 -0000 1.108 @@ -655,7 +655,16 @@ diff -b -B --ignore-all-space --exclude- corenet_udp_sendrecv_lo_if(mrtg_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.12/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2009-03-12 11:16:47.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/admin/netutils.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/admin/netutils.te 2009-05-04 11:25:11.000000000 -0400 +@@ -50,7 +50,7 @@ + files_tmp_filetrans(netutils_t, netutils_tmp_t, { file dir }) + + kernel_search_proc(netutils_t) +-kernel_read_sysctl(netutils_t) ++kernel_read_all_sysctls(netutils_t) + + corenet_all_recvfrom_unlabeled(netutils_t) + corenet_all_recvfrom_netlabel(netutils_t) @@ -152,6 +152,10 @@ ') @@ -4489,8 +4498,8 @@ diff -b -B --ignore-all-space --exclude- +/var/run/screen(/.*)? gen_context(system_u:object_r:screen_var_run_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.6.12/policy/modules/apps/screen.if --- nsaserefpolicy/policy/modules/apps/screen.if 2009-01-19 11:03:28.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/apps/screen.if 2009-05-02 07:49:38.000000000 -0400 -@@ -165,3 +165,23 @@ ++++ serefpolicy-3.6.12/policy/modules/apps/screen.if 2009-05-04 11:30:29.000000000 -0400 +@@ -165,3 +165,24 @@ nscd_socket_use($1_screen_t) ') ') @@ -4513,6 +4522,7 @@ diff -b -B --ignore-all-space --exclude- + manage_dirs_pattern($1,screen_var_run_t,screen_var_run_t) + manage_files_pattern($1,screen_var_run_t,screen_var_run_t) + manage_lnk_files_pattern($1,screen_var_run_t,screen_var_run_t) ++ manage_fifo_files_pattern($1,screen_var_run_t,screen_var_run_t) +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.te serefpolicy-3.6.12/policy/modules/apps/uml.te --- nsaserefpolicy/policy/modules/apps/uml.te 2009-01-19 11:03:28.000000000 -0500 @@ -5948,7 +5958,7 @@ diff -b -B --ignore-all-space --exclude- # diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.12/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2009-01-05 15:39:38.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if 2009-05-04 11:25:35.000000000 -0400 @@ -1197,6 +1197,26 @@ ') @@ -20507,7 +20517,7 @@ diff -b -B --ignore-all-space --exclude- diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.12/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2009-03-20 12:39:39.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/services/rpc.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/rpc.te 2009-05-04 12:28:35.000000000 -0400 @@ -23,7 +23,7 @@ gen_tunable(allow_nfsd_anon_write, false) @@ -20517,7 +20527,7 @@ diff -b -B --ignore-all-space --exclude- rpc_domain_template(gssd) -@@ -74,21 +74,31 @@ +@@ -74,21 +74,33 @@ files_manage_mounttab(rpcd_t) @@ -20527,6 +20537,8 @@ diff -b -B --ignore-all-space --exclude- fs_read_rpc_symlinks(rpcd_t) fs_rw_rpc_sockets(rpcd_t) ++storage_getattr_fixed_disk_dev(rpcd_t) ++ +kernel_signal(rpcd_t) + selinux_dontaudit_read_fs(rpcd_t) @@ -20549,7 +20561,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # NFSD local policy -@@ -116,8 +126,9 @@ +@@ -116,8 +128,9 @@ # for exportfs and rpc.mountd files_getattr_tmp_dirs(nfsd_t) # cjp: this should really have its own type @@ -20560,7 +20572,7 @@ diff -b -B --ignore-all-space --exclude- fs_mount_nfsd_fs(nfsd_t) fs_search_nfsd_fs(nfsd_t) fs_getattr_all_fs(nfsd_t) -@@ -125,6 +136,7 @@ +@@ -125,6 +138,7 @@ fs_rw_nfsd_fs(nfsd_t) storage_dontaudit_read_fixed_disk(nfsd_t) @@ -20568,7 +20580,7 @@ diff -b -B --ignore-all-space --exclude- # Read access to public_content_t and public_content_rw_t miscfiles_read_public_files(nfsd_t) -@@ -141,6 +153,7 @@ +@@ -141,6 +155,7 @@ fs_read_noxattr_fs_files(nfsd_t) auth_manage_all_files_except_shadow(nfsd_t) ') @@ -20576,7 +20588,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`nfs_export_all_ro',` dev_getattr_all_blk_files(nfsd_t) -@@ -175,6 +188,7 @@ +@@ -175,6 +190,7 @@ corecmd_exec_bin(gssd_t) @@ -20584,7 +20596,7 @@ diff -b -B --ignore-all-space --exclude- fs_list_rpc(gssd_t) fs_rw_rpc_sockets(gssd_t) fs_read_rpc_files(gssd_t) -@@ -183,9 +197,12 @@ +@@ -183,9 +199,12 @@ files_read_usr_symlinks(gssd_t) auth_use_nsswitch(gssd_t) @@ -29601,7 +29613,7 @@ diff -b -B --ignore-all-space --exclude- xen_append_log(ifconfig_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2009-04-07 15:53:36.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/system/udev.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/udev.te 2009-05-04 14:15:06.000000000 -0400 @@ -50,6 +50,7 @@ allow udev_t self:unix_stream_socket connectto; allow udev_t self:netlink_kobject_uevent_socket create_socket_perms; @@ -29638,7 +29650,18 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -242,6 +250,10 @@ +@@ -228,6 +236,10 @@ + ') + + optional_policy(` ++ mount_domtrans(udev_t) ++') ++ ++optional_policy(` + openct_read_pid_files(udev_t) + openct_domtrans(udev_t) + ') +@@ -242,6 +254,10 @@ ') optional_policy(` Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.844 retrieving revision 1.845 diff -u -p -r1.844 -r1.845 --- selinux-policy.spec 2 May 2009 11:52:13 -0000 1.844 +++ selinux-policy.spec 4 May 2009 18:20:29 -0000 1.845 @@ -165,11 +165,6 @@ if [ -s /etc/selinux/config ]; then \ fi \ fi -%define loadminpolicy() \ -( cd /usr/share/selinux/%1; \ -semodule -b base.pp.bz2 -i unconfined.pp.bz2 unconfineduser.pp.bz2 -s %1; \ -); \ - %define loadpolicy() \ ( cd /usr/share/selinux/%1; \ semodule -b base.pp.bz2 -i %{expand:%%moduleList %1} %2 -s %1; \ @@ -351,12 +346,12 @@ echo $packages } if [ $1 -eq 1 ]; then - packages="unconfined.pp.bz2 unconfineduser.pp.bz2" + packages="%{expand:%%moduleList targeted} unconfined.pp.bz2 unconfineduser.pp.bz2" %loadpolicy targeted $packages restorecon -R /root /var/log /var/run 2> /dev/null else semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null - packages=`get_unconfined $(semodule -l)` + packages="%{expand:%%moduleList targeted} `get_unconfined $(semodule -l)`" %loadpolicy targeted $packages %relabel targeted fi @@ -402,7 +397,8 @@ SELinux Reference policy minimum base mo %post minimum if [ $1 -eq 1 ]; then -%loadminpolicy minimum +packages="unconfined.pp.bz2 unconfineduser.pp.bz2" +%loadpolicy minimum $packages semanage -S minimum -i - << __eof login -m -s unconfined_u -r s0-s0:c0.c1023 __default__ login -m -s unconfined_u -r s0-s0:c0.c1023 root @@ -435,7 +431,8 @@ SELinux Reference policy olpc base modul %saveFileContext olpc %post olpc -%loadpolicy olpc "" +packages="%{expand:%%moduleList olpc} unconfined.pp.bz2 unconfineduser.pp.bz2" +%loadpolicy olpc $packages if [ $1 -ne 1 ]; then %relabel olpc @@ -466,7 +463,8 @@ SELinux Reference policy mls base module %post mls semodule -n -s mls -r mailscanner 2>/dev/null -%loadpolicy mls "" +packages="%{expand:%%moduleList mls}" +%loadpolicy mls $packages if [ $1 != 1 ]; then %relabel mls @@ -482,6 +480,8 @@ exit 0 %changelog * Fri May 1 2009 Dan Walsh 3.6.12-27 - Fix /sbin/ip6tables-save context +- Allod udev to transition to mount +- Fix loading of mls policy file * Thu Apr 30 2009 Dan Walsh 3.6.12-26 - Add shorewall policy From ajax at fedoraproject.org Mon May 4 18:20:35 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Mon, 4 May 2009 18:20:35 +0000 (UTC) Subject: rpms/xorg-x11-server/F-11 xserver-1.6.1-document-fontpath-correctly.patch, NONE, 1.1 xorg-x11-server.spec, 1.442, 1.443 xserver-1.4.99-document-fontpath-correctly.patch, 1.1, NONE Message-ID: <20090504182035.2E2F1700DB@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30820 Modified Files: xorg-x11-server.spec Added Files: xserver-1.6.1-document-fontpath-correctly.patch Removed Files: xserver-1.4.99-document-fontpath-correctly.patch Log Message: * Mon May 04 2009 Adam Jackson 1.6.1-11 - xserver-1.6.1-document-fontpath-correctly.patch: Typo fixes. xserver-1.6.1-document-fontpath-correctly.patch: --- NEW FILE xserver-1.6.1-document-fontpath-correctly.patch --- >From 98c7481338e3167058382f27a3e002662553131a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 27 Nov 2007 16:09:43 -0500 Subject: [PATCH] Document default font path correctly. --- hw/xfree86/doc/man/xorg.conf.man.pre | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index 3c657d0..4b562bd 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -356,11 +356,11 @@ font path elements (which can be set inside a catalogue directory): .PP .RS 4 .nf -.I __projectroot__/lib/X11/fonts/misc/ -.I __projectroot__/lib/X11/fonts/TTF/ -.I __projectroot__/lib/X11/fonts/Type1/ -.I __projectroot__/lib/X11/fonts/75dpi/ -.I __projectroot__/lib/X11/fonts/100dpi/ +.I __projectroot__/share/X11/fonts/misc/ +.I __projectroot__/share/X11/fonts/TTF/ +.I __projectroot__/share/X11/fonts/Type1/ +.I __projectroot__/share/X11/fonts/75dpi/ +.I __projectroot__/share/X11/fonts/100dpi/ .fi .RE .PP @@ -368,13 +368,13 @@ The recommended font path contains the following font path elements: .PP .RS 4 .nf -.I __projectroot__/lib/X11/fonts/local/ -.I __projectroot__/lib/X11/fonts/misc/ -.I __projectroot__/lib/X11/fonts/75dpi/:unscaled -.I __projectroot__/lib/X11/fonts/100dpi/:unscaled -.I __projectroot__/lib/X11/fonts/Type1/ -.I __projectroot__/lib/X11/fonts/75dpi/ -.I __projectroot__/lib/X11/fonts/100dpi/ +.I __projectroot__/share/X11/fonts/local/ +.I __projectroot__/share/X11/fonts/misc/ +.I __projectroot__/share/X11/fonts/75dpi/:unscaled +.I __projectroot__/share/X11/fonts/100dpi/:unscaled +.I __projectroot__/share/X11/fonts/Type1/ +.I __projectroot__/share/X11/fonts/75dpi/ +.I __projectroot__/share/X11/fonts/100dpi/ .fi .RE .PP -- 1.5.3.4 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v retrieving revision 1.442 retrieving revision 1.443 diff -u -p -r1.442 -r1.443 --- xorg-x11-server.spec 4 May 2009 18:00:44 -0000 1.442 +++ xorg-x11-server.spec 4 May 2009 18:20:04 -0000 1.443 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.1 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -53,7 +53,7 @@ Patch103: xserver-1.5.0-bg-none-root.pa # XXX move these to the end of the list Patch1003: xserver-1.4.99-pic-libxf86config.patch -Patch2013: xserver-1.4.99-document-fontpath-correctly.patch +Patch2013: xserver-1.6.1-document-fontpath-correctly.patch Patch2014: xserver-1.5.0-projector-fb-size.patch # Trivial things to never merge upstream ever: @@ -544,6 +544,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 04 2009 Adam Jackson 1.6.1-11 +- xserver-1.6.1-document-fontpath-correctly.patch: Typo fixes. + * Mon May 04 2009 Adam Jackson 1.6.1-10 - xserver-1.6.1-nouveau.patch: Update the autoconfig logic for nv3 and other historical oddities. --- xserver-1.4.99-document-fontpath-correctly.patch DELETED --- From dwalsh at fedoraproject.org Mon May 4 18:20:52 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 4 May 2009 18:20:52 +0000 (UTC) Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.112, 1.113 selinux-policy.spec, 1.849, 1.850 Message-ID: <20090504182052.DD58F700DB@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30878 Modified Files: policy-20090105.patch selinux-policy.spec Log Message: * Fri May 1 2009 Dan Walsh 3.6.12-27 - Fix /sbin/ip6tables-save context - Allod udev to transition to mount - Fix loading of mls policy file policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v retrieving revision 1.112 retrieving revision 1.113 diff -u -p -r1.112 -r1.113 --- policy-20090105.patch 30 Apr 2009 22:21:52 -0000 1.112 +++ policy-20090105.patch 4 May 2009 18:20:20 -0000 1.113 @@ -655,7 +655,16 @@ diff -b -B --ignore-all-space --exclude- corenet_udp_sendrecv_lo_if(mrtg_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.12/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2009-03-12 11:16:47.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/admin/netutils.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/admin/netutils.te 2009-05-04 11:25:11.000000000 -0400 +@@ -50,7 +50,7 @@ + files_tmp_filetrans(netutils_t, netutils_tmp_t, { file dir }) + + kernel_search_proc(netutils_t) +-kernel_read_sysctl(netutils_t) ++kernel_read_all_sysctls(netutils_t) + + corenet_all_recvfrom_unlabeled(netutils_t) + corenet_all_recvfrom_netlabel(netutils_t) @@ -152,6 +152,10 @@ ') @@ -4479,6 +4488,42 @@ diff -b -B --ignore-all-space --exclude- +') + +permissive sambagui_t; +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.6.12/policy/modules/apps/screen.fc +--- nsaserefpolicy/policy/modules/apps/screen.fc 2008-11-11 16:13:42.000000000 -0500 ++++ serefpolicy-3.6.12/policy/modules/apps/screen.fc 2009-05-02 07:46:25.000000000 -0400 +@@ -13,3 +13,4 @@ + # + /var/run/screens?/S-[^/]+ -d gen_context(system_u:object_r:screen_dir_t,s0) + /var/run/screens?/S-[^/]+/.* <> ++/var/run/screen(/.*)? gen_context(system_u:object_r:screen_var_run_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.6.12/policy/modules/apps/screen.if +--- nsaserefpolicy/policy/modules/apps/screen.if 2009-01-19 11:03:28.000000000 -0500 ++++ serefpolicy-3.6.12/policy/modules/apps/screen.if 2009-05-04 11:30:29.000000000 -0400 +@@ -165,3 +165,24 @@ + nscd_socket_use($1_screen_t) + ') + ') ++ ++######################################## ++## ++## Manage screen var_run files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`screen_manage_var_run',` ++ gen_require(` ++ type screen_var_run_t; ++ ') ++ ++ manage_dirs_pattern($1,screen_var_run_t,screen_var_run_t) ++ manage_files_pattern($1,screen_var_run_t,screen_var_run_t) ++ manage_lnk_files_pattern($1,screen_var_run_t,screen_var_run_t) ++ manage_fifo_files_pattern($1,screen_var_run_t,screen_var_run_t) ++') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.te serefpolicy-3.6.12/policy/modules/apps/uml.te --- nsaserefpolicy/policy/modules/apps/uml.te 2009-01-19 11:03:28.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/apps/uml.te 2009-04-28 11:42:33.000000000 -0400 @@ -5913,7 +5958,7 @@ diff -b -B --ignore-all-space --exclude- # diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.12/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2009-01-05 15:39:38.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if 2009-05-04 11:25:35.000000000 -0400 @@ -1197,6 +1197,26 @@ ') @@ -6039,7 +6084,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.6.12/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2009-02-03 22:50:50.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/kernel.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/kernel.te 2009-05-01 13:41:10.000000000 -0400 @@ -63,6 +63,15 @@ genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0) @@ -6056,7 +6101,15 @@ diff -b -B --ignore-all-space --exclude- # kvmFS # -@@ -120,6 +129,10 @@ +@@ -100,6 +109,7 @@ + genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) + + type proc_xen_t, proc_type; ++files_mountpoint(proc_xen_t) + genfscon proc /xen gen_context(system_u:object_r:proc_xen_t,s0) + + # +@@ -120,6 +130,10 @@ type sysctl_rpc_t, sysctl_type; genfscon proc /net/rpc gen_context(system_u:object_r:sysctl_rpc_t,s0) @@ -6067,7 +6120,7 @@ diff -b -B --ignore-all-space --exclude- # /proc/sys/fs directory and files type sysctl_fs_t, sysctl_type; files_mountpoint(sysctl_fs_t) -@@ -160,6 +173,7 @@ +@@ -160,6 +174,7 @@ # type unlabeled_t; sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) @@ -6075,7 +6128,7 @@ diff -b -B --ignore-all-space --exclude- # These initial sids are no longer used, and can be removed: sid any_socket gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) -@@ -198,6 +212,8 @@ +@@ -198,6 +213,8 @@ allow kernel_t self:sock_file read_sock_file_perms; allow kernel_t self:fd use; @@ -6084,7 +6137,7 @@ diff -b -B --ignore-all-space --exclude- allow kernel_t proc_t:dir list_dir_perms; allow kernel_t proc_t:file read_file_perms; allow kernel_t proc_t:lnk_file read_lnk_file_perms; -@@ -248,7 +264,8 @@ +@@ -248,7 +265,8 @@ selinux_load_policy(kernel_t) @@ -6094,7 +6147,7 @@ diff -b -B --ignore-all-space --exclude- corecmd_exec_shell(kernel_t) corecmd_list_bin(kernel_t) -@@ -262,6 +279,8 @@ +@@ -262,6 +280,8 @@ files_list_etc(kernel_t) files_list_home(kernel_t) files_read_usr_files(kernel_t) @@ -6103,7 +6156,7 @@ diff -b -B --ignore-all-space --exclude- mcs_process_set_categories(kernel_t) -@@ -269,12 +288,18 @@ +@@ -269,12 +289,18 @@ mls_process_write_down(kernel_t) mls_file_write_all_levels(kernel_t) mls_file_read_all_levels(kernel_t) @@ -6122,7 +6175,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`read_default_t',` files_list_default(kernel_t) files_read_default_files(kernel_t) -@@ -356,7 +381,11 @@ +@@ -356,7 +382,11 @@ ') optional_policy(` @@ -6135,7 +6188,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -388,3 +417,7 @@ +@@ -388,3 +418,7 @@ allow kern_unconfined unlabeled_t:association *; allow kern_unconfined unlabeled_t:packet *; allow kern_unconfined unlabeled_t:process ~{ transition dyntransition execmem execstack execheap }; @@ -6257,48 +6310,46 @@ diff -b -B --ignore-all-space --exclude- +gen_user(guest_u, user, guest_r, s0, s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.6.12/policy/modules/roles/staff.te --- nsaserefpolicy/policy/modules/roles/staff.te 2008-11-11 16:13:47.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/roles/staff.te 2009-04-23 09:44:57.000000000 -0400 -@@ -15,156 +15,90 @@ ++++ serefpolicy-3.6.12/policy/modules/roles/staff.te 2009-05-02 07:50:07.000000000 -0400 +@@ -15,156 +15,95 @@ # Local policy # -optional_policy(` - apache_role(staff_r, staff_t) -') -- --optional_policy(` -- auth_role(staff_r, staff_t) --') -- --optional_policy(` -- auditadm_role_change(staff_r) --') +kernel_read_ring_buffer(staff_t) +kernel_getattr_core_if(staff_t) +kernel_getattr_message_if(staff_t) +kernel_read_software_raid_state(staff_t) -optional_policy(` -- bluetooth_role(staff_r, staff_t) +- auth_role(staff_r, staff_t) -') +auth_domtrans_pam_console(staff_t) -optional_policy(` -- cdrecord_role(staff_r, staff_t) +- auditadm_role_change(staff_r) -') +libs_manage_shared_libs(staff_t) -optional_policy(` +- bluetooth_role(staff_r, staff_t) +-') +- +-optional_policy(` +- cdrecord_role(staff_r, staff_t) +-') +- +-optional_policy(` - cron_role(staff_r, staff_t) -') - -optional_policy(` - dbus_role_template(staff, staff_r, staff_t) -') -+seutil_run_newrole(staff_t, staff_r) -+netutils_run_ping(staff_t, staff_r) - - optional_policy(` +- +-optional_policy(` - ethereal_role(staff_r, staff_t) -') - @@ -6317,8 +6368,10 @@ diff -b -B --ignore-all-space --exclude- -optional_policy(` - gnome_role(staff_r, staff_t) -') -- --optional_policy(` ++seutil_run_newrole(staff_t, staff_r) ++netutils_run_ping(staff_t, staff_r) + + optional_policy(` - gpg_role(staff_r, staff_t) -') - @@ -6332,122 +6385,123 @@ diff -b -B --ignore-all-space --exclude- - -optional_policy(` - lockdev_role(staff_r, staff_t) --') -- --optional_policy(` -- lpd_role(staff_r, staff_t) --') -- --optional_policy(` -- mozilla_role(staff_r, staff_t) + sudo_role_template(staff, staff_r, staff_t) ') optional_policy(` -- mplayer_role(staff_r, staff_t) +- lpd_role(staff_r, staff_t) + auditadm_role_change(staff_r) ') optional_policy(` -- mta_role(staff_r, staff_t) +- mozilla_role(staff_r, staff_t) + kerneloops_manage_tmp_files(staff_t) ') optional_policy(` -- oident_manage_user_content(staff_t) -- oident_relabel_user_content(staff_t) +- mplayer_role(staff_r, staff_t) + logadm_role_change(staff_r) ') optional_policy(` -- pyzor_role(staff_r, staff_t) +- mta_role(staff_r, staff_t) + secadm_role_change(staff_r) ') optional_policy(` -- razor_role(staff_r, staff_t) +- oident_manage_user_content(staff_t) +- oident_relabel_user_content(staff_t) + ssh_role_template(staff, staff_r, staff_t) ') optional_policy(` -- rssh_role(staff_r, staff_t) +- pyzor_role(staff_r, staff_t) + sysadm_role_change(staff_r) ') optional_policy(` -- screen_role_template(staff, staff_r, staff_t) +- razor_role(staff_r, staff_t) + usernetctl_run(staff_t, staff_r) ') optional_policy(` -- secadm_role_change(staff_r) +- rssh_role(staff_r, staff_t) + unconfined_role_change(staff_r) ') optional_policy(` -- spamassassin_role(staff_r, staff_t) +- screen_role_template(staff, staff_r, staff_t) + webadm_role_change(staff_r) ') -optional_policy(` -- ssh_role_template(staff, staff_r, staff_t) +- secadm_role_change(staff_r) -') +domain_read_all_domains_state(staff_t) +domain_getattr_all_domains(staff_t) +domain_obj_id_change_exemption(staff_t) -optional_policy(` -- su_role_template(staff, staff_r, staff_t) +- spamassassin_role(staff_r, staff_t) -') +files_read_kernel_modules(staff_t) -optional_policy(` -- sudo_role_template(staff, staff_r, staff_t) +- ssh_role_template(staff, staff_r, staff_t) -') +kernel_read_fs_sysctls(staff_t) -optional_policy(` -- sysadm_role_change(staff_r) -- userdom_dontaudit_use_user_terminals(staff_t) +- su_role_template(staff, staff_r, staff_t) -') +modutils_read_module_config(staff_t) +modutils_read_module_deps(staff_t) -optional_policy(` -- thunderbird_role(staff_r, staff_t) +- sudo_role_template(staff, staff_r, staff_t) -') +miscfiles_read_hwdata(staff_t) -optional_policy(` -- tvtime_role(staff_r, staff_t) +- sysadm_role_change(staff_r) +- userdom_dontaudit_use_user_terminals(staff_t) -') +term_use_unallocated_ttys(staff_t) optional_policy(` -- uml_role(staff_r, staff_t) +- thunderbird_role(staff_r, staff_t) + gnomeclock_dbus_chat(staff_t) ') optional_policy(` -- userhelper_role_template(staff, staff_r, staff_t) +- tvtime_role(staff_r, staff_t) + kerneloops_dbus_chat(staff_t) ') optional_policy(` -- vmware_role(staff_r, staff_t) +- uml_role(staff_r, staff_t) + rpm_dbus_chat(staff_usertype) ') optional_policy(` -- wireshark_role(staff_r, staff_t) +- userhelper_role_template(staff, staff_r, staff_t) ++ screen_manage_var_run(staff_t) + ') + + optional_policy(` +- vmware_role(staff_r, staff_t) + setroubleshoot_stream_connect(staff_t) + setroubleshoot_dbus_chat(staff_t) ') optional_policy(` -- xserver_role(staff_r, staff_t) +- wireshark_role(staff_r, staff_t) + virt_stream_connect(staff_t) ') + +-optional_policy(` +- xserver_role(staff_r, staff_t) +-') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.if serefpolicy-3.6.12/policy/modules/roles/sysadm.if --- nsaserefpolicy/policy/modules/roles/sysadm.if 2009-01-19 11:07:34.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/roles/sysadm.if 2009-04-23 09:44:57.000000000 -0400 @@ -12280,7 +12334,7 @@ diff -b -B --ignore-all-space --exclude- +/var/run/DeviceKit-disk(/.*)? gen_context(system_u:object_r:devicekit_var_run_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.6.12/policy/modules/services/devicekit.if --- nsaserefpolicy/policy/modules/services/devicekit.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/devicekit.if 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/devicekit.if 2009-05-02 07:48:49.000000000 -0400 @@ -0,0 +1,197 @@ + +## policy for devicekit @@ -13432,8 +13486,8 @@ diff -b -B --ignore-all-space --exclude- +/usr/libexec/fprintd -- gen_context(system_u:object_r:fprintd_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.if serefpolicy-3.6.12/policy/modules/services/fprintd.if --- nsaserefpolicy/policy/modules/services/fprintd.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/fprintd.if 2009-04-28 15:26:38.000000000 -0400 -@@ -0,0 +1,22 @@ ++++ serefpolicy-3.6.12/policy/modules/services/fprintd.if 2009-05-01 09:45:48.000000000 -0400 +@@ -0,0 +1,42 @@ + +## policy for fprintd + @@ -13456,6 +13510,26 @@ diff -b -B --ignore-all-space --exclude- + domtrans_pattern($1,fprintd_exec_t,fprintd_t) +') + ++######################################## ++## ++## Send and receive messages from ++## fprintd over dbus. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fprintd_dbus_chat',` ++ gen_require(` ++ type fprintd_t; ++ class dbus send_msg; ++ ') ++ ++ allow $1 fprintd_t:dbus send_msg; ++ allow fprintd_t $1:dbus send_msg; ++') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.12/policy/modules/services/fprintd.te --- nsaserefpolicy/policy/modules/services/fprintd.te 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/services/fprintd.te 2009-04-29 10:10:42.000000000 -0400 @@ -14625,7 +14699,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.6.12/policy/modules/services/kerneloops.te --- nsaserefpolicy/policy/modules/services/kerneloops.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/kerneloops.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/kerneloops.te 2009-05-01 13:21:26.000000000 -0400 @@ -13,6 +13,9 @@ type kerneloops_initrc_exec_t; init_script_file(kerneloops_initrc_exec_t) @@ -14636,13 +14710,15 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # kerneloops local policy -@@ -23,8 +26,13 @@ +@@ -21,10 +24,14 @@ + allow kerneloops_t self:capability sys_nice; + allow kerneloops_t self:process { setsched getsched signal }; allow kerneloops_t self:fifo_file rw_file_perms; - allow kerneloops_t self:netlink_route_socket r_netlink_socket_perms; - +-allow kerneloops_t self:netlink_route_socket r_netlink_socket_perms; ++ +manage_files_pattern(kerneloops_t, kerneloops_tmp_t, kerneloops_tmp_t) +files_tmp_filetrans(kerneloops_t,kerneloops_tmp_t,file) -+ + kernel_read_ring_buffer(kerneloops_t) +fs_list_inotifyfs(kerneloops_t) @@ -14650,9 +14726,19 @@ diff -b -B --ignore-all-space --exclude- # Init script handling domain_use_interactive_fds(kerneloops_t) -@@ -46,6 +54,5 @@ - sysnet_dns_name_resolve(kerneloops_t) +@@ -38,14 +45,13 @@ + + files_read_etc_files(kerneloops_t) + ++auth_use_nsswitch(kerneloops_t) ++ + logging_send_syslog_msg(kerneloops_t) + logging_read_generic_logs(kerneloops_t) + + miscfiles_read_localization(kerneloops_t) +-sysnet_dns_name_resolve(kerneloops_t) +- optional_policy(` - dbus_system_bus_client(kerneloops_t) - dbus_connect_system_bus(kerneloops_t) @@ -20431,7 +20517,7 @@ diff -b -B --ignore-all-space --exclude- diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.12/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2009-03-20 12:39:39.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/services/rpc.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/rpc.te 2009-05-04 12:28:35.000000000 -0400 @@ -23,7 +23,7 @@ gen_tunable(allow_nfsd_anon_write, false) @@ -20441,7 +20527,7 @@ diff -b -B --ignore-all-space --exclude- rpc_domain_template(gssd) -@@ -74,21 +74,31 @@ +@@ -74,21 +74,33 @@ files_manage_mounttab(rpcd_t) @@ -20451,6 +20537,8 @@ diff -b -B --ignore-all-space --exclude- fs_read_rpc_symlinks(rpcd_t) fs_rw_rpc_sockets(rpcd_t) ++storage_getattr_fixed_disk_dev(rpcd_t) ++ +kernel_signal(rpcd_t) + selinux_dontaudit_read_fs(rpcd_t) @@ -20473,7 +20561,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # NFSD local policy -@@ -116,8 +126,9 @@ +@@ -116,8 +128,9 @@ # for exportfs and rpc.mountd files_getattr_tmp_dirs(nfsd_t) # cjp: this should really have its own type @@ -20484,7 +20572,7 @@ diff -b -B --ignore-all-space --exclude- fs_mount_nfsd_fs(nfsd_t) fs_search_nfsd_fs(nfsd_t) fs_getattr_all_fs(nfsd_t) -@@ -125,6 +136,7 @@ +@@ -125,6 +138,7 @@ fs_rw_nfsd_fs(nfsd_t) storage_dontaudit_read_fixed_disk(nfsd_t) @@ -20492,7 +20580,7 @@ diff -b -B --ignore-all-space --exclude- # Read access to public_content_t and public_content_rw_t miscfiles_read_public_files(nfsd_t) -@@ -141,6 +153,7 @@ +@@ -141,6 +155,7 @@ fs_read_noxattr_fs_files(nfsd_t) auth_manage_all_files_except_shadow(nfsd_t) ') @@ -20500,7 +20588,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`nfs_export_all_ro',` dev_getattr_all_blk_files(nfsd_t) -@@ -175,6 +188,7 @@ +@@ -175,6 +190,7 @@ corecmd_exec_bin(gssd_t) @@ -20508,7 +20596,7 @@ diff -b -B --ignore-all-space --exclude- fs_list_rpc(gssd_t) fs_rw_rpc_sockets(gssd_t) fs_read_rpc_files(gssd_t) -@@ -183,9 +197,12 @@ +@@ -183,9 +199,12 @@ files_read_usr_symlinks(gssd_t) auth_use_nsswitch(gssd_t) @@ -25914,7 +26002,7 @@ diff -b -B --ignore-all-space --exclude- +/var/cache/coolkey(/.*)? gen_context(system_u:object_r:auth_cache_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.12/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/authlogin.if 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/authlogin.if 2009-05-01 09:46:46.000000000 -0400 @@ -43,20 +43,38 @@ interface(`auth_login_pgm_domain',` gen_require(` @@ -25962,7 +26050,7 @@ diff -b -B --ignore-all-space --exclude- init_rw_utmp($1) -@@ -100,11 +119,40 @@ +@@ -100,9 +119,42 @@ seutil_read_config($1) seutil_read_default_contexts($1) @@ -25975,16 +26063,16 @@ diff -b -B --ignore-all-space --exclude- + + optional_policy(` + afs_rw_udp_sockets($1) -+ ') + ') + + optional_policy(` + dbus_system_bus_client($1) + optional_policy(` + oddjob_dbus_chat($1) + oddjob_domtrans_mkhomedir($1) - ') - ') - ++ ') ++') ++ + optional_policy(` + corecmd_exec_bin($1) + storage_getattr_fixed_disk_dev($1) @@ -25992,6 +26080,10 @@ diff -b -B --ignore-all-space --exclude- + ') + + optional_policy(` ++ fprintd_dbus_chat($1) ++ ') ++ ++ optional_policy(` + nis_authenticate($1) + ') + @@ -26000,12 +26092,10 @@ diff -b -B --ignore-all-space --exclude- + userdom_read_user_home_content_files($1) + ') + -+') -+ + ') + ######################################## - ## - ## Use the login program as an entry point program. -@@ -197,8 +245,11 @@ +@@ -197,8 +249,11 @@ interface(`auth_domtrans_chk_passwd',` gen_require(` type chkpwd_t, chkpwd_exec_t, shadow_t; @@ -26017,7 +26107,7 @@ diff -b -B --ignore-all-space --exclude- corecmd_search_bin($1) domtrans_pattern($1, chkpwd_exec_t, chkpwd_t) -@@ -207,19 +258,16 @@ +@@ -207,19 +262,16 @@ dev_read_rand($1) dev_read_urand($1) @@ -26042,7 +26132,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -230,6 +278,29 @@ +@@ -230,6 +282,29 @@ optional_policy(` samba_stream_connect_winbind($1) ') @@ -26072,7 +26162,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -254,6 +325,7 @@ +@@ -254,6 +329,7 @@ auth_domtrans_chk_passwd($1) role $2 types chkpwd_t; @@ -26080,7 +26170,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -650,7 +722,7 @@ +@@ -650,7 +726,7 @@ ######################################## ## @@ -26089,7 +26179,7 @@ diff -b -B --ignore-all-space --exclude- ## ## ## -@@ -1031,6 +1103,32 @@ +@@ -1031,6 +1107,32 @@ ######################################## ## @@ -26122,7 +26212,7 @@ diff -b -B --ignore-all-space --exclude- ## Manage all files on the filesystem, except ## the shadow passwords and listed exceptions. ## -@@ -1297,6 +1395,14 @@ +@@ -1297,6 +1399,14 @@ ') optional_policy(` @@ -26137,7 +26227,7 @@ diff -b -B --ignore-all-space --exclude- nis_use_ypbind($1) ') -@@ -1305,8 +1411,13 @@ +@@ -1305,8 +1415,13 @@ ') optional_policy(` @@ -26151,7 +26241,7 @@ diff -b -B --ignore-all-space --exclude- ') ') -@@ -1341,3 +1452,99 @@ +@@ -1341,3 +1456,99 @@ typeattribute $1 can_write_shadow_passwords; typeattribute $1 can_relabelto_shadow_passwords; ') @@ -27102,9 +27192,9 @@ diff -b -B --ignore-all-space --exclude- dev_read_urand(racoon_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.6.12/policy/modules/system/iptables.fc --- nsaserefpolicy/policy/modules/system/iptables.fc 2009-04-06 12:42:08.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/system/iptables.fc 2009-04-30 08:29:56.000000000 -0400 -@@ -1,9 +1,11 @@ - /sbin/ip6tables.* -- gen_context(system_u:object_r:iptables_exec_t,s0) ++++ serefpolicy-3.6.12/policy/modules/system/iptables.fc 2009-04-30 18:57:54.000000000 -0400 +@@ -1,9 +1,10 @@ +-/sbin/ip6tables.* -- gen_context(system_u:object_r:iptables_exec_t,s0) /sbin/ipchains.* -- gen_context(system_u:object_r:iptables_exec_t,s0) -/sbin/iptables.* -- gen_context(system_u:object_r:iptables_exec_t,s0) +/sbin/ip6?tables -- gen_context(system_u:object_r:iptables_exec_t,s0) @@ -29523,7 +29613,7 @@ diff -b -B --ignore-all-space --exclude- xen_append_log(ifconfig_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2009-04-07 15:53:36.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/system/udev.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/udev.te 2009-05-04 14:18:49.000000000 -0400 @@ -50,6 +50,7 @@ allow udev_t self:unix_stream_socket connectto; allow udev_t self:netlink_kobject_uevent_socket create_socket_perms; @@ -29560,7 +29650,18 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -242,6 +250,10 @@ +@@ -228,6 +236,10 @@ + ') + + optional_policy(` ++ mount_domtrans(udev_t) ++') ++ ++optional_policy(` + openct_read_pid_files(udev_t) + openct_domtrans(udev_t) + ') +@@ -242,6 +254,10 @@ ') optional_policy(` Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v retrieving revision 1.849 retrieving revision 1.850 diff -u -p -r1.849 -r1.850 --- selinux-policy.spec 30 Apr 2009 22:21:53 -0000 1.849 +++ selinux-policy.spec 4 May 2009 18:20:22 -0000 1.850 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.12 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -165,11 +165,6 @@ if [ -s /etc/selinux/config ]; then \ fi \ fi -%define loadminpolicy() \ -( cd /usr/share/selinux/%1; \ -semodule -b base.pp.bz2 -i unconfined.pp.bz2 unconfineduser.pp.bz2 -s %1; \ -); \ - %define loadpolicy() \ ( cd /usr/share/selinux/%1; \ semodule -b base.pp.bz2 -i %{expand:%%moduleList %1} %2 -s %1; \ @@ -351,12 +346,12 @@ echo $packages } if [ $1 -eq 1 ]; then - packages="unconfined.pp.bz2 unconfineduser.pp.bz2" + packages="%{expand:%%moduleList targeted} unconfined.pp.bz2 unconfineduser.pp.bz2" %loadpolicy targeted $packages restorecon -R /root /var/log /var/run 2> /dev/null else semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null - packages=`get_unconfined $(semodule -l)` + packages="%{expand:%%moduleList targeted} `get_unconfined $(semodule -l)`" %loadpolicy targeted $packages %relabel targeted fi @@ -402,7 +397,8 @@ SELinux Reference policy minimum base mo %post minimum if [ $1 -eq 1 ]; then -%loadminpolicy minimum +packages="unconfined.pp.bz2 unconfineduser.pp.bz2" +%loadpolicy minimum $packages semanage -S minimum -i - << __eof login -m -s unconfined_u -r s0-s0:c0.c1023 __default__ login -m -s unconfined_u -r s0-s0:c0.c1023 root @@ -435,7 +431,8 @@ SELinux Reference policy olpc base modul %saveFileContext olpc %post olpc -%loadpolicy olpc "" +packages="%{expand:%%moduleList olpc} unconfined.pp.bz2 unconfineduser.pp.bz2" +%loadpolicy olpc $packages if [ $1 -ne 1 ]; then %relabel olpc @@ -466,7 +463,8 @@ SELinux Reference policy mls base module %post mls semodule -n -s mls -r mailscanner 2>/dev/null -%loadpolicy mls "" +packages="%{expand:%%moduleList mls}" +%loadpolicy mls $packages if [ $1 != 1 ]; then %relabel mls @@ -480,6 +478,11 @@ exit 0 %endif %changelog +* Fri May 1 2009 Dan Walsh 3.6.12-27 +- Fix /sbin/ip6tables-save context +- Allod udev to transition to mount +- Fix loading of mls policy file + * Thu Apr 30 2009 Dan Walsh 3.6.12-26 - Add shorewall policy From rdieter at fedoraproject.org Mon May 4 18:28:23 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 18:28:23 +0000 (UTC) Subject: rpms/libvncserver/EL-5 libvncserver.spec,1.2,1.3 Message-ID: <20090504182823.778AF700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libvncserver/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32063 Modified Files: libvncserver.spec Log Message: no minilzo in epel yet, don't use it Index: libvncserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/EL-5/libvncserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- libvncserver.spec 4 May 2009 18:18:26 -0000 1.2 +++ libvncserver.spec 4 May 2009 18:27:52 -0000 1.3 @@ -1,6 +1,10 @@ # Fedora pkg review: http://bugzilla.redhat.com/429749 +%if 0%{?fedora} +%define system_minilzo 1 +%endif + Summary: Library to make writing a vnc server easy Name: libvncserver Version: 0.9.7 @@ -22,7 +26,7 @@ Provides: LibVNCServer = %{version}-%{r BuildRequires: findutils BuildRequires: libjpeg-devel BuildRequires: zlib-devel -BuildRequires: lzo-minilzo lzo-devel +%{?system_minilzo:BuildRequires: lzo-minilzo lzo-devel} %description LibVNCServer makes writing a VNC server (or more correctly, a program @@ -47,9 +51,11 @@ Provides: LibVNCServer-devel = %{versio %prep %setup -q -n LibVNCServer-%{version} +%if 0%{?system_minilzo} %patch1 -p1 -b .system_minilzo #nuke bundled minilzo find . -name minilzo\* -exec rm -f {} \; +%endif %patch2 -p1 -b .multilib @@ -70,7 +76,7 @@ find -name "*.c" -o -name "*.h" | xargs # hack to omit unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo" +make %{?_smp_mflags} %{?system_minilzo:CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo"} %install From rdieter at fedoraproject.org Mon May 4 18:47:18 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 18:47:18 +0000 (UTC) Subject: rpms/libvncserver/devel libvncserver-LINUX.patch, NONE, 1.1 libvncserver.spec, 1.5, 1.6 Message-ID: <20090504184719.222DE700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libvncserver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4044 Modified Files: libvncserver.spec Added Files: libvncserver-LINUX.patch Log Message: * Mon May 04 2009 Rex Dieter - 0.9.7-2 - fix detection of LINUX platform/define libvncserver-LINUX.patch: --- NEW FILE libvncserver-LINUX.patch --- Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac @@ -636,9 +636,10 @@ fi AC_CHECK_LIB(cygipc,shmget) AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true") # Check if /dev/vcsa1 exists, if so, define LINUX -AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) +dnl AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) +AM_CONDITIONAL(LINUX, test `uname` = Linux) # Check for OS X specific header AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true") AM_CONDITIONAL(OSX, test "$HAVE_OSX" = "true") Index: libvncserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/devel/libvncserver.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- libvncserver.spec 4 May 2009 18:10:17 -0000 1.5 +++ libvncserver.spec 4 May 2009 18:46:46 -0000 1.6 @@ -1,10 +1,14 @@ # Fedora pkg review: http://bugzilla.redhat.com/429749 +%if 0%{?fedora} +%define system_minilzo 1 +%endif + Summary: Library to make writing a vnc server easy Name: libvncserver Version: 0.9.7 -Release: 1%{?dist} +Release: 2%{?dist} # NOTE: --with-tightvnc-filetransfer => GPLv2 License: GPLv2+ Group: System Environment/Libraries @@ -15,6 +19,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version Patch1: libvncserver-0.9.7-system_minilzo.patch Patch2: libvncserver-0.9.1-multilib.patch +# safer LINUX platform detection (from opensuse) +Patch50: libvncserver-LINUX.patch + # upstream name Obsoletes: LibVNCServer < %{version}-%{release} Provides: LibVNCServer = %{version}-%{release} @@ -22,7 +29,7 @@ Provides: LibVNCServer = %{version}-%{r BuildRequires: findutils BuildRequires: libjpeg-devel BuildRequires: zlib-devel -BuildRequires: lzo-minilzo lzo-devel +%{?system_minilzo:BuildRequires: lzo-minilzo lzo-devel} %description LibVNCServer makes writing a VNC server (or more correctly, a program @@ -47,11 +54,14 @@ Provides: LibVNCServer-devel = %{versio %prep %setup -q -n LibVNCServer-%{version} +%if 0%{?system_minilzo} %patch1 -p1 -b .system_minilzo #nuke bundled minilzo find . -name minilzo\* -exec rm -f {} \; +%endif %patch2 -p1 -b .multilib +%patch50 -p0 -b .LINUX # fix encoding mv AUTHORS AUTHORS.OLD && \ @@ -70,7 +80,7 @@ find -name "*.c" -o -name "*.h" | xargs # hack to omit unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo" +make %{?_smp_mflags} %{?system_minilzo:CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo"} %install @@ -108,6 +118,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Rex Dieter - 0.9.7-2 +- fix detection of LINUX platform/define + * Mon May 04 2009 Rex Dieter - 0.9.7-1 - LibVNCServer-0.9.7 From rdieter at fedoraproject.org Mon May 4 18:49:26 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 18:49:26 +0000 (UTC) Subject: rpms/libvncserver/EL-5 libvncserver-LINUX.patch, NONE, 1.1 libvncserver.spec, 1.3, 1.4 Message-ID: <20090504184926.9C37D700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libvncserver/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4461 Modified Files: libvncserver.spec Added Files: libvncserver-LINUX.patch Log Message: * Mon May 04 2009 Rex Dieter - 0.9.7-2 - fix detection of LINUX platform/define libvncserver-LINUX.patch: --- NEW FILE libvncserver-LINUX.patch --- Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac @@ -636,9 +636,10 @@ fi AC_CHECK_LIB(cygipc,shmget) AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true") # Check if /dev/vcsa1 exists, if so, define LINUX -AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) +dnl AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) +AM_CONDITIONAL(LINUX, test `uname` = Linux) # Check for OS X specific header AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true") AM_CONDITIONAL(OSX, test "$HAVE_OSX" = "true") Index: libvncserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvncserver/EL-5/libvncserver.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- libvncserver.spec 4 May 2009 18:27:52 -0000 1.3 +++ libvncserver.spec 4 May 2009 18:48:56 -0000 1.4 @@ -8,7 +8,7 @@ Summary: Library to make writing a vnc server easy Name: libvncserver Version: 0.9.7 -Release: 1%{?dist} +Release: 2%{?dist} # NOTE: --with-tightvnc-filetransfer => GPLv2 License: GPLv2+ Group: System Environment/Libraries @@ -19,6 +19,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version Patch1: libvncserver-0.9.7-system_minilzo.patch Patch2: libvncserver-0.9.1-multilib.patch +# safer LINUX platform detection (from opensuse) +Patch50: libvncserver-LINUX.patch + # upstream name Obsoletes: LibVNCServer < %{version}-%{release} Provides: LibVNCServer = %{version}-%{release} @@ -58,6 +61,7 @@ find . -name minilzo\* -exec rm -f {} \; %endif %patch2 -p1 -b .multilib +%patch50 -p0 -b .LINUX # fix encoding mv AUTHORS AUTHORS.OLD && \ @@ -114,6 +118,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Rex Dieter - 0.9.7-2 +- fix detection of LINUX platform/define + * Mon May 04 2009 Rex Dieter - 0.9.7-1 - LibVNCServer-0.9.7 From lkundrak at fedoraproject.org Mon May 4 19:01:26 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Mon, 4 May 2009 19:01:26 +0000 (UTC) Subject: rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk-lcms.patch, NONE, 1.1 java-1.6.0-openjdk-securitypatches.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.34, 1.35 Message-ID: <20090504190126.E30E5700DB@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5990 Modified Files: java-1.6.0-openjdk.spec Added Files: java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk-securitypatches.patch Log Message: * Mon May 4 2009 Lubomir Rintel - 1:1.6.0.0-1.0.b12.3 - Post-mortem update with security patches work around RHEL packaging bug java-1.6.0-openjdk-lcms.patch: --- NEW FILE java-1.6.0-openjdk-lcms.patch --- diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c --- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2008-11-25 04:06:03.000000000 -0500 +++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2009-04-03 13:42:46.000000000 -0400 @@ -29,7 +29,7 @@ // // // Little cms -// Copyright (C) 1998-2006 Marti Maria +// Copyright (C) 1998-2007 Marti Maria // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -51,7 +51,7 @@ -// CIECAM 02 appearance model +// CIECAM 02 appearance model. Many thanks to Jordi Vilar for the debugging. #include "lcms.h" @@ -196,6 +196,10 @@ clr.RGBpa[i] = (400.0 * temp) / (temp + 27.13) + 0.1; } } + + clr.A = (((2.0 * clr.RGBpa[0]) + clr.RGBpa[1] + + (clr.RGBpa[2] / 20.0)) - 0.305) * pMod->Nbb; + return clr; } @@ -249,9 +253,6 @@ clr.H = 300 + ((100*((clr.h - 237.53)/1.2)) / temp); } - clr.A = (((2.0 * clr.RGBpa[0]) + clr.RGBpa[1] + - (clr.RGBpa[2] / 20.0)) - 0.305) * pMod->Nbb; - clr.J = 100.0 * pow((clr.A / pMod->adoptedWhite.A), (pMod->c * pMod->z)); @@ -395,7 +396,7 @@ LPcmsCIECAM02 lpMod; - if((lpMod = (LPcmsCIECAM02) malloc(sizeof(cmsCIECAM02))) == NULL) { + if((lpMod = (LPcmsCIECAM02) _cmsMalloc(sizeof(cmsCIECAM02))) == NULL) { return (LCMSHANDLE) NULL; } @@ -449,14 +450,19 @@ lpMod -> z = compute_z(lpMod); lpMod -> Nbb = computeNbb(lpMod); lpMod -> FL = computeFL(lpMod); + + if (lpMod -> D == D_CALCULATE || + lpMod -> D == D_CALCULATE_DISCOUNT) { + lpMod -> D = computeD(lpMod); + } + lpMod -> Ncb = lpMod -> Nbb; lpMod -> adoptedWhite = XYZtoCAT02(lpMod -> adoptedWhite); lpMod -> adoptedWhite = ChromaticAdaptation(lpMod -> adoptedWhite, lpMod); lpMod -> adoptedWhite = CAT02toHPE(lpMod -> adoptedWhite); lpMod -> adoptedWhite = NonlinearCompression(lpMod -> adoptedWhite, lpMod); - lpMod -> adoptedWhite = ComputeCorrelates(lpMod -> adoptedWhite, lpMod); return (LCMSHANDLE) lpMod; @@ -465,7 +471,7 @@ void LCMSEXPORT cmsCIECAM02Done(LCMSHANDLE hModel) { LPcmsCIECAM02 lpMod = (LPcmsCIECAM02) (LPSTR) hModel; - if (lpMod) free(lpMod); + if (lpMod) _cmsFree(lpMod); } diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c --- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2008-11-25 04:06:03.000000000 -0500 +++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2009-04-03 13:42:46.000000000 -0400 @@ -29,7 +29,7 @@ // // // Little cms -// Copyright (C) 1998-2006 Marti Maria +// Copyright (C) 1998-2007 Marti Maria // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -174,7 +174,7 @@ LCMSAPI void LCMSEXPORT cmsCIECAM97sDone(LCMSHANDLE hModel) { LPcmsCIECAM97s lpMod = (LPcmsCIECAM97s) (LPSTR) hModel; - if (lpMod) free(lpMod); + if (lpMod) _cmsFree(lpMod); } // Partial discounting for adaptation degree computation @@ -331,7 +331,7 @@ LPcmsCIECAM97s lpMod; VEC3 tmp; - if((lpMod = (LPcmsCIECAM97s) malloc(sizeof(cmsCIECAM97s))) == NULL) { + if((lpMod = (LPcmsCIECAM97s) _cmsMalloc(sizeof(cmsCIECAM97s))) == NULL) { return (LCMSHANDLE) NULL; } @@ -449,7 +449,7 @@ // RGB_subw = [MlamRigg][WP/YWp] #ifdef USE_CIECAM97s2 - MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, (LPVEC3) &lpMod -> WP); + MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &lpMod -> WP); #else VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y); MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp); diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c --- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2008-11-25 04:06:03.000000000 -0500 +++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2009-04-03 13:42:46.000000000 -0400 @@ -29,7 +29,7 @@ // // // Little cms -// Copyright (C) 1998-2006 Marti Maria +// Copyright (C) 1998-2007 Marti Maria // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -65,22 +65,25 @@ // Persistence LCMSAPI LCMSHANDLE LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName); LCMSAPI LCMSHANDLE LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len); -LCMSAPI BOOL LCMSEXPORT cmsIT8SaveToFile(LCMSHANDLE IT8, const char* cFileName); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SaveToFile(LCMSHANDLE IT8, const char* cFileName); // Properties LCMSAPI const char* LCMSEXPORT cmsIT8GetSheetType(LCMSHANDLE hIT8); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char* cSubProp, const char *Val); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer); LCMSAPI const char* LCMSEXPORT cmsIT8GetProperty(LCMSHANDLE hIT8, const char* cProp); LCMSAPI double LCMSEXPORT cmsIT8GetPropertyDbl(LCMSHANDLE hIT8, const char* cProp); -LCMSAPI int LCMSEXPORT cmsIT8EnumProperties(LCMSHANDLE IT8, char ***PropertyNames); +LCMSAPI const char* LCMSEXPORT cmsIT8GetPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char *cSubProp); +LCMSAPI int LCMSEXPORT cmsIT8EnumProperties(LCMSHANDLE IT8, const char ***PropertyNames); +LCMSAPI int LCMSEXPORT cmsIT8EnumPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char*** SubpropertyNames); // Datasets @@ -89,10 +92,10 @@ LCMSAPI const char* LCMSEXPORT cmsIT8GetDataRowCol(LCMSHANDLE IT8, int row, int col); LCMSAPI double LCMSEXPORT cmsIT8GetDataRowColDbl(LCMSHANDLE IT8, int col, int row); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetDataRowCol(LCMSHANDLE hIT8, int row, int col, +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetDataRowCol(LCMSHANDLE hIT8, int row, int col, const char* Val); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetDataRowColDbl(LCMSHANDLE hIT8, int row, int col, +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetDataRowColDbl(LCMSHANDLE hIT8, int row, int col, double Val); LCMSAPI const char* LCMSEXPORT cmsIT8GetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample); @@ -100,15 +103,15 @@ LCMSAPI double LCMSEXPORT cmsIT8GetDataDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetData(LCMSHANDLE IT8, const char* cPatch, +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample, const char *Val); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetDataDbl(LCMSHANDLE hIT8, const char* cPatch, +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetDataDbl(LCMSHANDLE hIT8, const char* cPatch, const char* cSample, double Val); -LCMSAPI BOOL LCMSEXPORT cmsIT8SetDataFormat(LCMSHANDLE IT8, int n, const char *Sample); +LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetDataFormat(LCMSHANDLE IT8, int n, const char *Sample); LCMSAPI int LCMSEXPORT cmsIT8EnumDataFormat(LCMSHANDLE IT8, char ***SampleNames); LCMSAPI void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE IT8, const char* Formatter); @@ -126,7 +129,7 @@ [...6088 lines suppressed...] +{ + size_t alloc = nmemb * size; + if (alloc < nmemb || alloc < size) { + return NULL; + } + return _cmsMalloc(alloc); +} + +LCMS_INLINE void _cmsFree(void *Ptr) +{ + if (Ptr) free(Ptr); +} + +#endif + // ------------------------------------------------------------------------------------------- end of inline functions // Signal error from inside lcms code @@ -1542,8 +1556,8 @@ void cdecl VEC3perK(LPVEC3 r, LPVEC3 v, double d); void cdecl VEC3minus(LPVEC3 r, LPVEC3 a, LPVEC3 b); void cdecl VEC3perComp(LPVEC3 r, LPVEC3 a, LPVEC3 b); -BOOL cdecl VEC3equal(LPWVEC3 a, LPWVEC3 b, double Tolerance); -BOOL cdecl VEC3equalF(LPVEC3 a, LPVEC3 b, double Tolerance); +LCMSBOOL cdecl VEC3equal(LPWVEC3 a, LPWVEC3 b, double Tolerance); +LCMSBOOL cdecl VEC3equalF(LPVEC3 a, LPVEC3 b, double Tolerance); void cdecl VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d); void cdecl VEC3cross(LPVEC3 r, LPVEC3 u, LPVEC3 v); void cdecl VEC3saturate(LPVEC3 v); @@ -1554,13 +1568,13 @@ void cdecl MAT3per(LPMAT3 r, LPMAT3 a, LPMAT3 b); void cdecl MAT3perK(LPMAT3 r, LPMAT3 v, double d); int cdecl MAT3inverse(LPMAT3 a, LPMAT3 b); -BOOL cdecl MAT3solve(LPVEC3 x, LPMAT3 a, LPVEC3 b); +LCMSBOOL cdecl MAT3solve(LPVEC3 x, LPMAT3 a, LPVEC3 b); double cdecl MAT3det(LPMAT3 m); void cdecl MAT3eval(LPVEC3 r, LPMAT3 a, LPVEC3 v); void cdecl MAT3toFix(LPWMAT3 r, LPMAT3 v); void cdecl MAT3fromFix(LPMAT3 r, LPWMAT3 v); void cdecl MAT3evalW(LPWVEC3 r, LPWMAT3 a, LPWVEC3 v); -BOOL cdecl MAT3isIdentity(LPWMAT3 a, double Tolerance); +LCMSBOOL cdecl MAT3isIdentity(LPWMAT3 a, double Tolerance); void cdecl MAT3scaleAndCut(LPWMAT3 r, LPMAT3 v, double d); // Is a table linear? @@ -1609,7 +1623,7 @@ void cdecl cmsCalcL16Params(int nSamples, LPL16PARAMS p); void cdecl cmsCalcCLUT16Params(int nSamples, int InputChan, int OutputChan, LPL16PARAMS p); void cdecl cmsCalcCLUT16ParamsEx(int nSamples, int InputChan, int OutputChan, - BOOL lUseTetrahedral, LPL16PARAMS p); + LCMSBOOL lUseTetrahedral, LPL16PARAMS p); WORD cdecl cmsLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p); Fixed32 cdecl cmsLinearInterpFixed(WORD Value1, WORD LutTable[], LPL16PARAMS p); @@ -1693,7 +1707,7 @@ // Gray axes fixup. Only on v2 8-bit Lab LUT - BOOL FixGrayAxes; + LCMSBOOL FixGrayAxes; // Parameters used for curve creation @@ -1704,7 +1718,7 @@ }; // LUT, FAR* LPLUT; -BOOL cdecl _cmsSmoothEndpoints(LPWORD Table, int nEntries); +LCMSBOOL cdecl _cmsSmoothEndpoints(LPWORD Table, int nEntries); // CRC of gamma tables @@ -1722,7 +1736,7 @@ void cdecl cmsEndpointsOfSampledCurve(LPSAMPLEDCURVE p, double* Min, double* Max); void cdecl cmsClampSampledCurve(LPSAMPLEDCURVE p, double Min, double Max); -BOOL cdecl cmsSmoothSampledCurve(LPSAMPLEDCURVE Tab, double SmoothingLambda); +LCMSBOOL cdecl cmsSmoothSampledCurve(LPSAMPLEDCURVE Tab, double SmoothingLambda); void cdecl cmsRescaleSampledCurve(LPSAMPLEDCURVE p, double Min, double Max, int nPoints); LPSAMPLEDCURVE cdecl cmsJoinSampledCurves(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints); @@ -1756,7 +1770,7 @@ void cdecl cmsFreeMatShaper(LPMATSHAPER MatShaper); void cdecl cmsEvalMatShaper(LPMATSHAPER MatShaper, WORD In[], WORD Out[]); -BOOL cdecl cmsReadICCMatrixRGB2XYZ(LPMAT3 r, cmsHPROFILE hProfile); +LCMSBOOL cdecl cmsReadICCMatrixRGB2XYZ(LPMAT3 r, cmsHPROFILE hProfile); LPMATSHAPER cdecl cmsBuildInputMatrixShaper(cmsHPROFILE InputProfile); LPMATSHAPER cdecl cmsBuildOutputMatrixShaper(cmsHPROFILE OutputProfile); @@ -1764,11 +1778,11 @@ // White Point & Primary chromas handling -BOOL cdecl cmsAdaptationMatrix(LPMAT3 r, LPMAT3 ConeMatrix, LPcmsCIEXYZ FromIll, LPcmsCIEXYZ ToIll); -BOOL cdecl cmsAdaptMatrixToD50(LPMAT3 r, LPcmsCIExyY SourceWhitePt); -BOOL cdecl cmsAdaptMatrixFromD50(LPMAT3 r, LPcmsCIExyY DestWhitePt); +LCMSBOOL cdecl cmsAdaptationMatrix(LPMAT3 r, LPMAT3 ConeMatrix, LPcmsCIEXYZ FromIll, LPcmsCIEXYZ ToIll); +LCMSBOOL cdecl cmsAdaptMatrixToD50(LPMAT3 r, LPcmsCIExyY SourceWhitePt); +LCMSBOOL cdecl cmsAdaptMatrixFromD50(LPMAT3 r, LPcmsCIExyY DestWhitePt); -BOOL cdecl cmsReadChromaticAdaptationMatrix(LPMAT3 r, cmsHPROFILE hProfile); +LCMSBOOL cdecl cmsReadChromaticAdaptationMatrix(LPMAT3 r, cmsHPROFILE hProfile); // Inter-PCS conversion routines. They assume D50 as white point. void cdecl cmsXYZ2LabEncoded(WORD XYZ[3], WORD Lab[3]); @@ -1783,7 +1797,7 @@ LPcmsNAMEDCOLORLIST cdecl cmsAllocNamedColorList(int n); int cdecl cmsReadICCnamedColorList(cmsHTRANSFORM xform, cmsHPROFILE hProfile, icTagSignature sig); void cdecl cmsFreeNamedColorList(LPcmsNAMEDCOLORLIST List); -BOOL cdecl cmsAppendNamedColor(cmsHTRANSFORM xform, const char* Name, WORD PCS[3], WORD Colorant[MAXCHANNELS]); +LCMSBOOL cdecl cmsAppendNamedColor(cmsHTRANSFORM xform, const char* Name, WORD PCS[3], WORD Colorant[MAXCHANNELS]); // I/O @@ -1827,8 +1841,8 @@ char PhysicalFile[MAX_PATH]; - BOOL IsWrite; - BOOL SaveAs8Bits; + LCMSBOOL IsWrite; + LCMSBOOL SaveAs8Bits; struct tm Created; @@ -1836,14 +1850,13 @@ size_t (* Read)(void *buffer, size_t size, size_t count, struct _lcms_iccprofile_struct* Icc); - BOOL (* Seek)(struct _lcms_iccprofile_struct* Icc, size_t offset); - BOOL (* Close)(struct _lcms_iccprofile_struct* Icc); + LCMSBOOL (* Seek)(struct _lcms_iccprofile_struct* Icc, size_t offset); + LCMSBOOL (* Close)(struct _lcms_iccprofile_struct* Icc); size_t (* Tell)(struct _lcms_iccprofile_struct* Icc); - BOOL (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount); - + LCMSBOOL (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount); // Writting - BOOL (* Write)(struct _lcms_iccprofile_struct* Icc, size_t size, LPVOID Ptr); + LCMSBOOL (* Write)(struct _lcms_iccprofile_struct* Icc, size_t size, LPVOID Ptr); size_t UsedSpace; @@ -1855,7 +1868,7 @@ cmsHPROFILE cdecl _cmsCreateProfilePlaceholder(void); // Search into tag dictionary -icInt32Number cdecl _cmsSearchTag(LPLCMSICCPROFILE Profile, icTagSignature sig, BOOL lSignalError); +icInt32Number cdecl _cmsSearchTag(LPLCMSICCPROFILE Profile, icTagSignature sig, LCMSBOOL lSignalError); // Search for a particular tag, replace if found or add new one else LPVOID _cmsInitTag(LPLCMSICCPROFILE Icc, icTagSignature sig, size_t size, const void* Init); @@ -1871,6 +1884,7 @@ // These macros unpack format specifiers into integers +#define T_DITHER(s) (((s)>>22)&1) #define T_COLORSPACE(s) (((s)>>16)&31) #define T_SWAPFIRST(s) (((s)>>14)&1) #define T_FLAVOR(s) (((s)>>13)&1) @@ -1967,7 +1981,7 @@ // Flag for transform involving v4 profiles - BOOL lInputV4Lab, lOutputV4Lab; + LCMSBOOL lInputV4Lab, lOutputV4Lab; // 1-pixel cache @@ -2014,7 +2028,7 @@ // Clamping & Gamut handling -BOOL cdecl _cmsEndPointsBySpace(icColorSpaceSignature Space, +LCMSBOOL cdecl _cmsEndPointsBySpace(icColorSpaceSignature Space, WORD **White, WORD **Black, int *nOutputs); WORD * cdecl _cmsWhiteBySpace(icColorSpaceSignature Space); @@ -2043,7 +2057,7 @@ LPLUT cdecl _cmsPrecalculateGamutCheck(cmsHTRANSFORM h); // Hot fixes bad profiles -BOOL cdecl _cmsFixWhiteMisalignment(_LPcmsTRANSFORM p); +LCMSBOOL cdecl _cmsFixWhiteMisalignment(_LPcmsTRANSFORM p); // Marks LUT as 8 bit on input LPLUT cdecl _cmsBlessLUT8(LPLUT Lut); @@ -2061,6 +2075,10 @@ // Build a tone curve for K->K' if possible (only works on CMYK) LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints); +// Validates a LUT +LCMSBOOL cdecl _cmsValidateLUT(LPLUT NewLUT); + + // These are two VITAL macros, from converting between 8 and 16 bit // representation. java-1.6.0-openjdk-securitypatches.patch: --- NEW FILE java-1.6.0-openjdk-securitypatches.patch --- diff -Nurp icedtea6-1.3.1/Makefile.am icedtea6-1.3.1.patched/Makefile.am --- icedtea6-1.3.1/Makefile.am 2009-05-04 19:32:12.493212829 +0200 +++ icedtea6-1.3.1.patched/Makefile.am 2009-05-04 19:01:57.000000000 +0200 @@ -483,6 +483,34 @@ ICEDTEA_PATCHES = \ patches/icedtea-hotspot-use-idx_t.patch \ patches/icedtea-hotspot-params-cast-size_t.patch \ patches/icedtea-clean-crypto.patch \ + patches/icedtea-4486841.patch \ + patches/icedtea-6484091.patch \ + patches/icedtea-6497740.patch \ + patches/icedtea-6536193.patch \ + patches/icedtea-6588160.patch \ + patches/icedtea-6592792.patch \ + patches/icedtea-6610888.patch \ + patches/icedtea-6610896.patch \ + patches/icedtea-6630639.patch \ + patches/icedtea-6632886.patch \ + patches/icedtea-6636360.patch \ + patches/icedtea-6652463.patch \ + patches/icedtea-6656633.patch \ + patches/icedtea-6658158.patch \ + patches/icedtea-6691246.patch \ + patches/icedtea-6717680.patch \ + patches/icedtea-6721651.patch \ + patches/icedtea-6721753.patch \ + patches/icedtea-6726779.patch \ + patches/icedtea-6733959.patch \ + patches/icedtea-6734167.patch \ + patches/icedtea-6737315.patch \ + patches/icedtea-6755943.patch \ + patches/icedtea-6766136.patch \ + patches/icedtea-6792554.patch \ + patches/icedtea-6804996.patch \ + patches/icedtea-6804997.patch \ + patches/icedtea-6804998.patch \ $(SHARK_PATCH) \ $(GCC_PATCH) \ patches/icedtea-arch.patch \ @@ -575,7 +603,7 @@ stamps/patch.stamp: stamps/extract.stamp if test x$${all_patches_ok} = "xyes" \ && echo Checking $$p \ && $(PATCH) -l -p0 --dry-run -s -t -f \ - -F 0 < $(abs_top_srcdir)/$$p ; \ + < $(abs_top_srcdir)/$$p ; \ then \ echo Applying $$p ; \ $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ @@ -643,7 +671,7 @@ stamps/patch-fsg.stamp: stamps/extract.s if test x$${all_patches_ok} = "xyes" \ && echo Checking $$p \ && $(PATCH) -l -p0 --dry-run -s -t -f \ - -F 0 < $(abs_top_srcdir)/$$p ; \ + < $(abs_top_srcdir)/$$p ; \ then \ echo Applying $$p ; \ $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ @@ -737,7 +765,7 @@ stamps/patch-ecj.stamp: stamps/extract-e if test x$${all_patches_ok} = "xyes" \ && echo Checking $$p \ && $(PATCH) -l -p0 --dry-run -s -t -f \ - -F 0 < $(abs_top_srcdir)/$$p ; \ + < $(abs_top_srcdir)/$$p ; \ then \ echo Applying $$p ; \ $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ diff -Nurp icedtea6-1.3.1/Makefile.am.orig icedtea6-1.3.1.patched/Makefile.am.orig --- icedtea6-1.3.1/Makefile.am.orig 2008-10-22 19:20:45.000000000 +0200 +++ icedtea6-1.3.1.patched/Makefile.am.orig 2009-05-04 18:49:16.000000000 +0200 @@ -349,46 +349,6 @@ else endif endif endif -if WITH_VISUALVM -if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP -else - if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \ - then \ - mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \ - -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \ - fi -endif -if USE_ALT_NETBEANS_PROFILER_SRC_ZIP -else - if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \ - then \ - mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \ - -O $(NETBEANS_PROFILER_SRC_ZIP) ; \ - fi -endif -if USE_ALT_VISUALVM_SRC_ZIP -else - if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(VISUALVM_SRC_ZIP) ] ; \ - then \ - mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \ - fi -endif -endif mkdir -p stamps touch stamps/download.stamp @@ -561,7 +521,6 @@ stamps/extract.stamp: stamps/download.st mkdir openjdk ; \ $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ - sh $(abs_top_srcdir)/fsg.sh ; \ fi if WITH_CACAO if !USE_SYSTEM_CACAO @@ -606,7 +565,7 @@ endif clean-extract: rm -f stamps/extract.stamp -stamps/patch.stamp: stamps/patch-fsg.stamp +stamps/patch.stamp: stamps/extract.stamp mkdir -p stamps ; \ rm -f stamps/patch.stamp.tmp ; \ touch stamps/patch.stamp.tmp ; \ diff -Nurp icedtea6-1.3.1/Makefile.in icedtea6-1.3.1.patched/Makefile.in --- icedtea6-1.3.1/Makefile.in 2008-10-22 19:54:12.000000000 +0200 +++ icedtea6-1.3.1.patched/Makefile.in 2009-05-04 19:31:33.572209706 +0200 @@ -102,6 +102,7 @@ ALT_JAR_CMD = @ALT_JAR_CMD@ ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP = @ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP@ ALT_NETBEANS_PROFILER_SRC_ZIP = @ALT_NETBEANS_PROFILER_SRC_ZIP@ ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@ +ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@ ALT_VISUALVM_SRC_ZIP = @ALT_VISUALVM_SRC_ZIP@ AMTAR = @AMTAR@ ANT = @ANT@ @@ -283,6 +284,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ OPENJDK_DATE = 28_aug_2008 @@ -536,8 +538,23 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-jdk-use-ssize_t.patch \ patches/icedtea-hotspot-use-idx_t.patch \ patches/icedtea-hotspot-params-cast-size_t.patch \ - patches/icedtea-clean-crypto.patch $(SHARK_PATCH) $(GCC_PATCH) \ - patches/icedtea-arch.patch patches/icedtea-lc_ctype.patch \ + patches/icedtea-clean-crypto.patch \ + patches/icedtea-4486841.patch patches/icedtea-6484091.patch \ + patches/icedtea-6497740.patch patches/icedtea-6536193.patch \ + patches/icedtea-6588160.patch patches/icedtea-6592792.patch \ + patches/icedtea-6610888.patch patches/icedtea-6610896.patch \ + patches/icedtea-6630639.patch patches/icedtea-6632886.patch \ + patches/icedtea-6636360.patch patches/icedtea-6652463.patch \ + patches/icedtea-6656633.patch patches/icedtea-6658158.patch \ + patches/icedtea-6691246.patch patches/icedtea-6717680.patch \ + patches/icedtea-6721651.patch patches/icedtea-6721753.patch \ + patches/icedtea-6726779.patch patches/icedtea-6733959.patch \ + patches/icedtea-6734167.patch patches/icedtea-6737315.patch \ + patches/icedtea-6755943.patch patches/icedtea-6766136.patch \ + patches/icedtea-6792554.patch patches/icedtea-6804996.patch \ + patches/icedtea-6804997.patch patches/icedtea-6804998.patch \ + $(SHARK_PATCH) $(GCC_PATCH) patches/icedtea-arch.patch \ + patches/icedtea-lc_ctype.patch \ patches/icedtea-messageutils.patch \ patches/icedtea-6open-6616825.patch \ patches/icedtea-6open-6651382.patch \ @@ -953,35 +970,6 @@ stamps/download.stamp: @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi ; \ @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \ @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ | $(MD5SUM) --check ; \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi ; \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ $(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \ - at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi - at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ - at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ | $(MD5SUM) --check ; \ - at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ - at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \ - at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ - at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \ - at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi ; \ - at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \ [...6004 lines suppressed...] + { + int fat_frame_count = 0; +@@ -2293,18 +2356,23 @@ + // deal completely with fat frames: + offset_count += fat_frame_count; + code_StackMapTable_local_N.readData(fat_frame_count); ++ CHECK; + type_count += code_StackMapTable_local_N.getIntTotal(); + code_StackMapTable_stack_N.readData(fat_frame_count); + type_count += code_StackMapTable_stack_N.getIntTotal(); ++ CHECK; + // read the rest: + code_StackMapTable_offset.readData(offset_count); + code_StackMapTable_T.readData(type_count); ++ CHECK; + // (7) [RCH] + count = code_StackMapTable_T.getIntCount(7); + code_StackMapTable_RC.readData(count); ++ CHECK; + // (8) [PH] + count = code_StackMapTable_T.getIntCount(8); + code_StackMapTable_P.readData(count); ++ CHECK; + } + + count = ad.predefCount(CODE_ATTR_LineNumberTable); +@@ -2626,7 +2694,9 @@ + code_max_na_locals.readData(); + code_handler_count.readData(); + totalHandlerCount += code_handler_count.getIntTotal(); ++ CHECK; + ++ + // Read handler specifications. + // Cf. PackageReader.readCodeHandlers. + code_handler_start_P.readData(totalHandlerCount); +@@ -2633,8 +2703,10 @@ + code_handler_end_PO.readData(totalHandlerCount); + code_handler_catch_PO.readData(totalHandlerCount); + code_handler_class_RCN.readData(totalHandlerCount); ++ CHECK; + + read_attrs(ATTR_CONTEXT_CODE, totalFlagsCount); ++ CHECK; + } + + static inline bool is_in_range(uint n, uint min, uint max) { diff -Nurp icedtea6-1.3.1/patches/icedtea-6804996.patch icedtea6-1.3.1.patched/patches/icedtea-6804996.patch --- icedtea6-1.3.1/patches/icedtea-6804996.patch 1970-01-01 01:00:00.000000000 +0100 +++ icedtea6-1.3.1.patched/patches/icedtea-6804996.patch 2009-05-04 18:59:01.000000000 +0200 @@ -0,0 +1,75 @@ +--- old/src/share/native/sun/awt/splashscreen/splashscreen_gif.c Thu Mar 5 16:18:35 2009 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c Thu Mar 5 16:18:34 2009 +@@ -53,10 +53,6 @@ + // convert libungif samples to our ones + #define MAKE_QUAD_GIF(c,a) MAKE_QUAD((c).Red, (c).Green, (c).Blue, (a)) + +-#define SAFE_TO_ALLOC(c, sz) \ +- (((c) > 0) && ((sz) > 0) && \ +- ((0xffffffffu / ((unsigned int)(c))) > (unsigned int)(sz))) +- + /* stdio FILE* and memory input functions for libungif */ + int + SplashStreamGifInputFunc(GifFileType * gif, GifByteType * buf, int n) +--- old/src/share/native/sun/awt/splashscreen/splashscreen_impl.h Thu Mar 5 16:18:38 2009 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h Thu Mar 5 16:18:37 2009 +@@ -155,6 +155,10 @@ + + void SplashInitFrameShape(Splash * splash, int imageIndex); + ++#define SAFE_TO_ALLOC(c, sz) \ ++ (((c) > 0) && ((sz) > 0) && \ ++ ((0xffffffffu / ((unsigned int)(c))) > (unsigned int)(sz))) ++ + #define dbgprintf printf + + #endif +--- old/src/share/native/sun/awt/splashscreen/splashscreen_png.c Thu Mar 5 16:18:41 2009 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c Thu Mar 5 16:18:40 2009 +@@ -103,9 +103,17 @@ + + rowbytes = png_get_rowbytes(png_ptr, info_ptr); + ++ if (!SAFE_TO_ALLOC(rowbytes, height)) { ++ goto done; ++ } ++ + if ((image_data = (unsigned char *) malloc(rowbytes * height)) == NULL) { + goto done; + } ++ ++ if (!SAFE_TO_ALLOC(height, sizeof(png_bytep))) { ++ goto done; ++ } + if ((row_pointers = (png_bytepp) malloc(height * sizeof(png_bytep))) + == NULL) { + goto done; +@@ -121,13 +129,28 @@ + splash->width = width; + splash->height = height; + ++ if (!SAFE_TO_ALLOC(splash->width, splash->imageFormat.depthBytes)) { ++ goto done; ++ } + stride = splash->width * splash->imageFormat.depthBytes; + ++ if (!SAFE_TO_ALLOC(splash->height, stride)) { ++ goto done; ++ } + splash->frameCount = 1; + splash->frames = (SplashImage *) + malloc(sizeof(SplashImage) * splash->frameCount); ++ ++ if (splash->frames == NULL) { ++ goto done; ++ } ++ + splash->loopCount = 1; + splash->frames[0].bitmapBits = malloc(stride * splash->height); ++ if (splash->frames[0].bitmapBits == NULL) { ++ free(splash->frames); ++ goto done; ++ } + splash->frames[0].delay = 0; + + /* FIXME: sort out the real format */ diff -Nurp icedtea6-1.3.1/patches/icedtea-6804997.patch icedtea6-1.3.1.patched/patches/icedtea-6804997.patch --- icedtea6-1.3.1/patches/icedtea-6804997.patch 1970-01-01 01:00:00.000000000 +0100 +++ icedtea6-1.3.1.patched/patches/icedtea-6804997.patch 2009-05-04 18:59:01.000000000 +0200 @@ -0,0 +1,31 @@ +--- old/src/share/native/sun/awt/giflib/dgif_lib.c Thu Mar 5 16:33:17 2009 ++++ openjdk/jdk/src/share/native/sun/awt/giflib/dgif_lib.c Thu Mar 5 16:33:16 2009 +@@ -722,6 +722,10 @@ + GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private; + + READ(GifFile, &CodeSize, 1); /* Read Code size from file. */ ++ if (CodeSize >= 12) { ++ /* Invalid initial code size: report failure */ ++ return GIF_ERROR; ++ } + BitsPerPixel = CodeSize; + + Private->Buf[0] = 0; /* Input Buffer empty. */ +@@ -964,10 +968,13 @@ + + /* If code cannot fit into RunningBits bits, must raise its size. Note + * however that codes above 4095 are used for special signaling. */ +- if (++Private->RunningCode > Private->MaxCode1 && +- Private->RunningBits < LZ_BITS) { +- Private->MaxCode1 <<= 1; +- Private->RunningBits++; ++ if (++Private->RunningCode > Private->MaxCode1) { ++ if (Private->RunningBits < LZ_BITS) { ++ Private->MaxCode1 <<= 1; ++ Private->RunningBits++; ++ } else { ++ Private->RunningCode = Private->MaxCode1; ++ } + } + return GIF_OK; + } diff -Nurp icedtea6-1.3.1/patches/icedtea-6804998.patch icedtea6-1.3.1.patched/patches/icedtea-6804998.patch --- icedtea6-1.3.1/patches/icedtea-6804998.patch 1970-01-01 01:00:00.000000000 +0100 +++ icedtea6-1.3.1.patched/patches/icedtea-6804998.patch 2009-05-04 18:59:01.000000000 +0200 @@ -0,0 +1,35 @@ +--- old/src/share/classes/sun/awt/image/GifImageDecoder.java Thu Mar 5 17:00:25 2009 ++++ openjdk/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java Thu Mar 5 17:00:24 2009 +@@ -585,9 +585,16 @@ + System.out.print("Reading a " + width + " by " + height + " " + + (interlace ? "" : "non-") + "interlaced image..."); + } +- ++ int initCodeSize = ExtractByte(block, 9); ++ if (initCodeSize >= 12) { ++ if (verbose) { ++ System.out.println("Invalid initial code size: " + ++ initCodeSize); ++ } ++ return false; ++ } + boolean ret = parseImage(x, y, width, height, +- interlace, ExtractByte(block, 9), ++ interlace, initCodeSize, + block, rasline, model); + + if (!ret) { +--- old/src/share/native/sun/awt/image/gif/gifdecoder.c Thu Mar 5 17:00:28 2009 ++++ openjdk/jdk/src/share/native/sun/awt/image/gif/gifdecoder.c Thu Mar 5 17:00:27 2009 +@@ -191,6 +191,11 @@ + int passht = passinc; + int len; + ++ /* We have verified the initial code size on the java layer. ++ * Here we just check bounds for particular indexes. */ ++ if (freeCode >= 4096 || maxCode >= 4096) { ++ return 0; ++ } + if (blockh == 0 || raslineh == 0 + || prefixh == 0 || suffixh == 0 + || outCodeh == 0) 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.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- java-1.6.0-openjdk.spec 29 Oct 2008 20:14:51 -0000 1.34 +++ java-1.6.0-openjdk.spec 4 May 2009 19:00:53 -0000 1.35 @@ -111,7 +111,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 1.0.%{openjdkver}%{?dist}.2 +Release: 1.0.%{openjdkver}%{?dist}.3 # 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 @@ -144,6 +144,8 @@ Patch2: java-1.6.0-openjdk-makefile.pa Patch3: java-1.6.0-openjdk-java-access-bridge-idlj.patch Patch10: java-1.6.0-openjdk-freetype.patch Patch11: java-1.6.0-openjdk-netxtmp.patch +Patch12: java-1.6.0-openjdk-securitypatches.patch +Patch13: java-1.6.0-openjdk-lcms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -349,6 +351,7 @@ The OpenJDK web browser plugin. %patch0 %patch2 %patch11 -p1 +%patch12 -p1 cp %{SOURCE4} . cp %{SOURCE5} . cp %{SOURCE7} . @@ -372,6 +375,7 @@ popd %endif make stamps/patch.stamp patch -l -p1 < %{PATCH10} +patch -l -p0 < %{PATCH13} make @@ -900,6 +904,9 @@ exit 0 %{_jvmdir}/%{jredir}/lib/%{archinstall}/%{browser_plugin} %changelog +* Mon May 4 2009 Lubomir Rintel - 1:1.6.0.0-1.0.b12.3 +- Post-mortem update with security patches work around RHEL packaging bug + * Mon Oct 27 2008 Lubomir Rintel - 1:1.6.0.0-1.0.b12.2 - Remove the annoying JNLP tmp dir dialog - Merge from devel From transif at fedoraproject.org Mon May 4 19:05:41 2009 From: transif at fedoraproject.org (Transifex System User) Date: Mon, 4 May 2009 19:05:41 +0000 (UTC) Subject: comps/po fi.po,1.24,1.25 Message-ID: <20090504190541.55460700DB@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7285/po Modified Files: fi.po Log Message: Sending translation for Finnish Index: fi.po =================================================================== RCS file: /cvs/pkgs/comps/po/fi.po,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- fi.po 29 Apr 2009 20:00:19 -0000 1.24 +++ fi.po 4 May 2009 19:05:10 -0000 1.25 @@ -1,8 +1,6 @@ # This file is distributed under the same license as the comps-po package. -# # Sanoja: # cluster = ryp??s, node = kone??? -# # Lauri Nurmi , 2003-2006. # Mikko Ikola , 2004, 2005. # Ville-Pekka Vainio , 2006-2009. @@ -10,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-03-23 12:39+0200\n" +"POT-Creation-Date: 2009-05-04 14:09+0000\n" +"PO-Revision-Date: 2009-05-04 22:04+0300\n" "Last-Translator: Ville-Pekka Vainio \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -1297,19 +1295,16 @@ msgid "Amazigh Support" msgstr "Amazighin kielituki" #: ../comps-f11.xml.in.h:13 -#, fuzzy msgid "Azerbaijani Support" -msgstr "Serbian kielituki" +msgstr "Azerin kielituki" #: ../comps-f11.xml.in.h:27 -#, fuzzy msgid "Chichewa Support" -msgstr "Kiinan kielituki" +msgstr "Njand??an kielituki" #: ../comps-f11.xml.in.h:31 -#, fuzzy msgid "Coptic Support" -msgstr "Kroatian kielituki" +msgstr "Koptin kielituki" #: ../comps-f11.xml.in.h:37 msgid "Design and Simulation tools for hardware engineers" @@ -1320,9 +1315,8 @@ msgid "Electronic Lab" msgstr "Elektroniikkalaboratorio" #: ../comps-f11.xml.in.h:58 -#, fuzzy msgid "Fijian Support" -msgstr "Friisin kielituki" +msgstr "Fid??in kielituki" #: ../comps-f11.xml.in.h:61 msgid "Font design and packaging" @@ -1337,47 +1331,40 @@ msgid "Friulian Support" msgstr "Friulin kielituki" #: ../comps-f11.xml.in.h:83 -#, fuzzy msgid "Hiligaynon Support" -msgstr "Filipinon kielituki" +msgstr "Hiligainon kielituki" #: ../comps-f11.xml.in.h:96 -#, fuzzy msgid "Interlingua Support" -msgstr "Italian kielituki" +msgstr "Interlinguan kielituki" #: ../comps-f11.xml.in.h:109 -#, fuzzy msgid "Kazakh Support" -msgstr "Kannadan kielituki" +msgstr "Kazakin kielituki" #: ../comps-f11.xml.in.h:111 msgid "Kinyarwanda Support" msgstr "Ruandan kielituki" #: ../comps-f11.xml.in.h:118 -#, fuzzy msgid "Latin Support" -msgstr "Latvian kielituki" +msgstr "Latinan kielituki" #: ../comps-f11.xml.in.h:126 -#, fuzzy msgid "Luxembourgish Support" -msgstr "Turkin kielituki" +msgstr "Luxemburgin kielituki" #: ../comps-f11.xml.in.h:130 msgid "Malagasy Support" msgstr "Malagasin kielituki" #: ../comps-f11.xml.in.h:133 -#, fuzzy msgid "Maltese Support" -msgstr "Malaijin kielituki" +msgstr "Maltan kielituki" #: ../comps-f11.xml.in.h:134 -#, fuzzy msgid "Manx Support" -msgstr "Malaijin kielituki" +msgstr "Manksin kielituki" #: ../comps-f11.xml.in.h:137 msgid "MinGW cross-compiler" @@ -1396,14 +1383,12 @@ msgid "Online Help and Documentation" msgstr "Verkossa olevat ohjeet ja dokumentaatio" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "Espanjan kielituki" +msgstr "Sanskritin kielituki" #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "Ukrainan kielituki" +msgstr "Sardin kielituki" #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" @@ -1426,14 +1411,12 @@ msgstr "" "kirjastoja." #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "Siswatin kielituki" +msgstr "Swahilin kielituki" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "Telugun kielituki" +msgstr "Tetumin kielituki" #: ../comps-f11.xml.in.h:223 msgid "" From mbarnes at fedoraproject.org Mon May 4 19:10:41 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 19:10:41 +0000 (UTC) Subject: rpms/evolution/devel evolution.spec, 1.385, 1.386 evolution-2.27.1-build-break.patch, 1.1, NONE Message-ID: <20090504191041.4DB23700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8247 Modified Files: evolution.spec Removed Files: evolution-2.27.1-build-break.patch Log Message: * Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - Bump evo_major to 2.28. - Temporarily disable EDS_DISABLE_DEPRECATED due to GNOME bug #569652. Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.385 retrieving revision 1.386 diff -u -p -r1.385 -r1.386 --- evolution.spec 4 May 2009 17:31:30 -0000 1.385 +++ evolution.spec 4 May 2009 19:10:10 -0000 1.386 @@ -68,8 +68,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -Patch13: evolution-2.27.1-build-break.patch - ## Dependencies ### Requires(post): GConf2 @@ -227,7 +225,6 @@ This package contains supplemental utili %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .build-break mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -305,10 +302,10 @@ CFLAGS="$CFLAGS \ -DPANGO_DISABLE_DEPRECATED=1 \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \ - -DEDS_DISABLE_DEPRECATED=1 \ -Wdeclaration-after-statement \ -Werror-implicit-function-declaration" # TODO: Make -DCAMEL_DISABLE_DEPRECATED work. +# TODO: Make -DEDS_DISABLE_DEPRECATED work again. %endif %configure \ @@ -697,6 +694,7 @@ rm -rf $RPM_BUILD_ROOT * Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - Bump evo_major to 2.28. +- Temporarily disable EDS_DISABLE_DEPRECATED due to GNOME bug #569652. * Mon Apr 27 2009 Matthias Clasen - 2.26.1-2.fc11 - Don't drop schemas translations from po files --- evolution-2.27.1-build-break.patch DELETED --- From maxamillion at fedoraproject.org Mon May 4 19:25:38 2009 From: maxamillion at fedoraproject.org (Adam Miller) Date: Mon, 4 May 2009 19:25:38 +0000 (UTC) Subject: rpms/fail2ban/EL-5 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch, NONE, 1.1 fail2ban-0.8.1-sshd.patch, NONE, 1.1 fail2ban-0.8.2-fd_cloexec.patch, NONE, 1.1 fail2ban-0.8.3-init.patch, NONE, 1.1 fail2ban-logrotate, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 fail2ban.spec, 1.2, 1.3 sources, 1.2, 1.3 fail2ban-0.6.2-init.patch, 1.1, NONE Message-ID: <20090504192538.A560A700DB@cvs1.fedora.phx.redhat.com> Author: maxamillion Update of /cvs/extras/rpms/fail2ban/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11373/EL-5 Modified Files: .cvsignore fail2ban.spec sources Added Files: 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch fail2ban-0.8.1-sshd.patch fail2ban-0.8.2-fd_cloexec.patch fail2ban-0.8.3-init.patch fail2ban-logrotate import.log Removed Files: fail2ban-0.6.2-init.patch Log Message: Fail2Ban 0.8.3-18 rebuild for EPEL 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch: --- NEW FILE 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch --- >From a8f963a2803acef984c66cd1910631eb06363ac1 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 4 Feb 2009 15:38:11 -0500 Subject: [PATCH] BF: anchoring regex for IP with " *$" at the end to forbid matching IP encoded in the hostname prior doing actual DNS lookup. It is quite important and actually security hazard: DoS is easy to perform... --- server/filter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/filter.py b/server/filter.py index 457bb03..77042ad 100644 --- a/server/filter.py +++ b/server/filter.py @@ -492,7 +492,7 @@ import socket, struct class DNSUtils: - IP_CRE = re.compile("(?:\d{1,3}\.){3}\d{1,3}") + IP_CRE = re.compile("(?:\d{1,3}\.){3}\d{1,3} *$") #@staticmethod def dnsToIp(dns): -- 1.5.6.5 fail2ban-0.8.1-sshd.patch: --- NEW FILE fail2ban-0.8.1-sshd.patch --- --- fail2ban-0.8.1/config/jail.conf.sshd 2007-08-09 00:49:59.000000000 +0200 +++ fail2ban-0.8.1/config/jail.conf 2007-08-15 21:41:33.000000000 +0200 @@ -42,11 +42,11 @@ [ssh-iptables] -enabled = false +enabled = true filter = sshd action = iptables[name=SSH, port=ssh, protocol=tcp] - sendmail-whois[name=SSH, dest=you at mail.com, sender=fail2ban at mail.com] -logpath = /var/log/sshd.log + sendmail-whois[name=SSH, dest=root, sender=fail2ban at mail.com] +logpath = /var/log/secure maxretry = 5 [proftpd-iptables] fail2ban-0.8.2-fd_cloexec.patch: --- NEW FILE fail2ban-0.8.2-fd_cloexec.patch --- --- fail2ban-0.8.2/server/filter.py.orig 2008-03-27 16:26:59.000000000 +0000 +++ fail2ban-0.8.2/server/filter.py 2008-03-27 15:29:48.000000000 +0000 @@ -428,6 +428,7 @@ # is computed and compared to the previous hash of this line. import md5 +import fcntl class FileContainer: @@ -455,6 +456,11 @@ def open(self): self.__handler = open(self.__filename) + + # Set the file descriptor to be FD_CLOEXEC + fd = self.__handler.fileno() + fcntl.fcntl (self.__handler.fileno(), fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC) + firstLine = self.__handler.readline() # Computes the MD5 of the first line. myHash = md5.new(firstLine).digest() fail2ban-0.8.3-init.patch: --- NEW FILE fail2ban-0.8.3-init.patch --- --- fail2ban-0.8.3/files/redhat-initd.init 2008-03-10 23:36:22.000000000 +0100 +++ fail2ban-0.8.3/files/redhat-initd 2008-08-24 20:46:01.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash # -# chkconfig: 345 92 08 +# chkconfig: - 92 08 # description: Fail2ban daemon # http://fail2ban.sourceforge.net/wiki/index.php/Main_Page # process name: fail2ban-server @@ -27,8 +27,7 @@ echo -n $"Starting fail2ban: " getpid if [ -z "$pid" ]; then - rm -rf /var/run/fail2ban/fail2ban.sock # in case of unclean shutdown - $FAIL2BAN start > /dev/null + $FAIL2BAN -x start > /dev/null RETVAL=$? fi if [ $RETVAL -eq 0 ]; then --- NEW FILE fail2ban-logrotate --- /var/log/fail2ban.log { missingok notifempty size 30k create 0600 root root postrotate /usr/bin/fail2ban-client reload 2> /dev/null || true endscript } --- NEW FILE import.log --- fail2ban-0_8_3-18:EL-5:fail2ban-0.8.3-18.src.rpm:1241465071 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fail2ban/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Dec 2006 19:12:03 -0000 1.2 +++ .cvsignore 4 May 2009 19:25:05 -0000 1.3 @@ -1 +1 @@ -fail2ban-0.6.2.tar.bz2 +fail2ban-0.8.3.tar.bz2 Index: fail2ban.spec =================================================================== RCS file: /cvs/extras/rpms/fail2ban/EL-5/fail2ban.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- fail2ban.spec 29 Jan 2009 14:12:28 -0000 1.2 +++ fail2ban.spec 4 May 2009 19:25:06 -0000 1.3 @@ -1,16 +1,24 @@ +# Not defined in Fedora's buildsystem +%global _initdir %{_sysconfdir}/rc.d/init.d + Summary: Ban IPs that make too many password failures Name: fail2ban -Version: 0.6.2 -Release: 3%{?dist} -License: GPL +Version: 0.8.3 +Release: 18%{?dist} +License: GPLv2+ Group: System Environment/Daemons URL: http://fail2ban.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: fail2ban-0.6.2-init.patch +Source1: fail2ban-logrotate +Patch0: fail2ban-0.8.3-init.patch +Patch1: fail2ban-0.8.1-sshd.patch +#Patch2: fail2ban-0.8.1-sock.patch +Patch3: fail2ban-0.8.2-fd_cloexec.patch +Patch4: 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel >= 2.3, dos2unix +BuildRequires: python-devel >= 2.3 BuildArch: noarch -Requires: iptables, tcp_wrappers, shorewall +Requires: iptables, tcp_wrappers, shorewall, gamin-python Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -22,10 +30,11 @@ failures. It updates firewall rules to r %prep %setup -q -grep -rl /usr/lib/fail2ban . \ - | xargs sed -i -e's,/usr/lib/fail2ban,%{_datadir}/fail2ban,g' -dos2unix config/redhat-initd %patch0 -p1 -b .init +%patch1 -p1 -b .sshd +#patch2 -p1 -b .sock +%patch3 -p1 -b .fd_cloexec +%patch4 -p1 -b .CVE-2009-0362 %build python setup.py build @@ -33,13 +42,14 @@ python setup.py build %install rm -rf %{buildroot} python setup.py install -O1 --root %{buildroot} -mkdir -p %{buildroot}%{_initrddir} -install -p -m 755 config/redhat-initd %{buildroot}%{_initrddir}/fail2ban -mkdir -p %{buildroot}%{_sysconfdir} -install -p -m 644 config/fail2ban.conf.iptables %{buildroot}%{_sysconfdir}/fail2ban.conf -mkdir -p %{buildroot}%{_mandir}/man{8,5} -install -p -m 644 man/fail2ban.8 %{buildroot}%{_mandir}/man8 -install -p -m 644 man/fail2ban.conf.5 %{buildroot}%{_mandir}/man5 +mkdir -p %{buildroot}%{_initdir} +install -p -m 755 files/redhat-initd %{buildroot}%{_initdir}/fail2ban +mkdir -p %{buildroot}%{_mandir}/man1 +install -p -m 644 man/fail2ban*.1 %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/fail2ban +mkdir -p %{buildroot}%{_localstatedir}/run/fail2ban +chmod 0755 %{buildroot}%{_localstatedir}/run/fail2ban %clean rm -rf %{buildroot} @@ -55,18 +65,77 @@ fi %files %defattr(-,root,root,-) -%doc README TODO CHANGELOG -%doc config/fail2ban.conf* -%config(noreplace) %{_sysconfdir}/fail2ban.conf -%{_bindir}/fail2ban +%doc README TODO ChangeLog COPYING +#doc config/fail2ban.conf* +%{_bindir}/fail2ban-server +%{_bindir}/fail2ban-client +%{_bindir}/fail2ban-regex %{_datadir}/fail2ban -%{_initrddir}/fail2ban -%{_mandir}/man8/fail2ban.8* -%{_mandir}/man5/fail2ban.conf.5* +%{_initdir}/fail2ban +%{_mandir}/man1/fail2ban-*.1* +%dir %{_sysconfdir}/fail2ban +%dir %{_sysconfdir}/fail2ban/action.d +%dir %{_sysconfdir}/fail2ban/filter.d +%config(noreplace) %{_sysconfdir}/fail2ban/fail2ban.conf +%config(noreplace) %{_sysconfdir}/fail2ban/jail.conf +%config(noreplace) %{_sysconfdir}/fail2ban/action.d/*.conf +%config(noreplace) %{_sysconfdir}/fail2ban/filter.d/*.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/fail2ban +%dir %{_localstatedir}/run/fail2ban %changelog -* Thu Jan 29 2009 Adam Miller - 0.8.3-18 +- Rebuild For EPEL + +* Sat Feb 14 2009 Axel Thimm - 0.8.3-18 +- Fix CVE-2009-0362 (Fedora bugs #485461, #485464, #485465, #485466). + +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.8.3-17 +- Rebuild for Python 2.6 + +* Sun Aug 24 2008 Axel Thimm - 0.8.3-16 +- Update to 0.8.3. + +* Wed May 21 2008 Tom "spot" Callaway - 0.8.2-15 +- fix license tag + +* Thu Mar 27 2008 Axel Thimm - 0.8.2-14 +- Close on exec fixes by Jonathan Underwood. + +* Sun Mar 16 2008 Axel Thimm - 0.8.2-13 +- Add %%{_localstatedir}/run/fail2ban (David Rees). + +* Fri Mar 14 2008 Axel Thimm - 0.8.2-12 +- Update to 0.8.2. + +* Thu Jan 31 2008 Jonathan G. Underwood - 0.8.1-11 +- Move socket file from /tmp to /var/run to prevent SElinux from stopping + fail2ban from starting (BZ #429281) +- Change logic in init file to start with -x to remove the socket file in case + of unclean shutdown + +* Wed Aug 15 2007 Axel Thimm - 0.8.1-10 +- Update to 0.8.1. +- Remove patch fixing CVE-2007-4321 (upstream). +- Remove AllowUsers patch (upstream). +- Add dependency to gamin-python. + +* Thu Jun 21 2007 Axel Thimm - 0.8.0-9 +- Fix remote log injection (no CVE assignment yet). + +* Sun Jun 3 2007 Axel Thimm - 0.8.0-8 +- Also trigger on non-AllowUsers failures (Jonathan Underwood + ). + +* Wed May 23 2007 Axel Thimm - 0.8.0-7 +- logrotate should restart fail2ban (Zing ). +- send mail to root; logrotate (Jonathan Underwood + ) + +* Sat May 19 2007 Axel Thimm - 0.8.0-4 +- Update to 0.8.0. +- enable ssh by default, fix log file for ssh scanning, adjust python + dependency (Jonathan Underwood ) * Sat Dec 30 2006 Axel Thimm - 0.6.2-3 - Remove forgotten condrestart. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fail2ban/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Dec 2006 19:12:03 -0000 1.2 +++ sources 4 May 2009 19:25:06 -0000 1.3 @@ -1 +1 @@ -7c686e610f0ad7678688a1bb2cd913da fail2ban-0.6.2.tar.bz2 +b438d7e2ce77a469fb0cca2a5cc0b81c fail2ban-0.8.3.tar.bz2 --- fail2ban-0.6.2-init.patch DELETED --- From maxamillion at fedoraproject.org Mon May 4 19:31:34 2009 From: maxamillion at fedoraproject.org (Adam Miller) Date: Mon, 4 May 2009 19:31:34 +0000 (UTC) Subject: rpms/fail2ban/EL-4 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch, NONE, 1.1 fail2ban-0.8.1-sshd.patch, NONE, 1.1 fail2ban-0.8.2-fd_cloexec.patch, NONE, 1.1 fail2ban-0.8.3-init.patch, NONE, 1.1 fail2ban-logrotate, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 fail2ban.spec, 1.2, 1.3 sources, 1.2, 1.3 fail2ban-0.6.2-init.patch, 1.1, NONE Message-ID: <20090504193134.C3F18700DB@cvs1.fedora.phx.redhat.com> Author: maxamillion Update of /cvs/extras/rpms/fail2ban/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12609/EL-4 Modified Files: .cvsignore fail2ban.spec sources Added Files: 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch fail2ban-0.8.1-sshd.patch fail2ban-0.8.2-fd_cloexec.patch fail2ban-0.8.3-init.patch fail2ban-logrotate import.log Removed Files: fail2ban-0.6.2-init.patch Log Message: Fail2Ban 0.8.3-18 rebuild for EPEL 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch: --- NEW FILE 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch --- >From a8f963a2803acef984c66cd1910631eb06363ac1 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 4 Feb 2009 15:38:11 -0500 Subject: [PATCH] BF: anchoring regex for IP with " *$" at the end to forbid matching IP encoded in the hostname prior doing actual DNS lookup. It is quite important and actually security hazard: DoS is easy to perform... --- server/filter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/filter.py b/server/filter.py index 457bb03..77042ad 100644 --- a/server/filter.py +++ b/server/filter.py @@ -492,7 +492,7 @@ import socket, struct class DNSUtils: - IP_CRE = re.compile("(?:\d{1,3}\.){3}\d{1,3}") + IP_CRE = re.compile("(?:\d{1,3}\.){3}\d{1,3} *$") #@staticmethod def dnsToIp(dns): -- 1.5.6.5 fail2ban-0.8.1-sshd.patch: --- NEW FILE fail2ban-0.8.1-sshd.patch --- --- fail2ban-0.8.1/config/jail.conf.sshd 2007-08-09 00:49:59.000000000 +0200 +++ fail2ban-0.8.1/config/jail.conf 2007-08-15 21:41:33.000000000 +0200 @@ -42,11 +42,11 @@ [ssh-iptables] -enabled = false +enabled = true filter = sshd action = iptables[name=SSH, port=ssh, protocol=tcp] - sendmail-whois[name=SSH, dest=you at mail.com, sender=fail2ban at mail.com] -logpath = /var/log/sshd.log + sendmail-whois[name=SSH, dest=root, sender=fail2ban at mail.com] +logpath = /var/log/secure maxretry = 5 [proftpd-iptables] fail2ban-0.8.2-fd_cloexec.patch: --- NEW FILE fail2ban-0.8.2-fd_cloexec.patch --- --- fail2ban-0.8.2/server/filter.py.orig 2008-03-27 16:26:59.000000000 +0000 +++ fail2ban-0.8.2/server/filter.py 2008-03-27 15:29:48.000000000 +0000 @@ -428,6 +428,7 @@ # is computed and compared to the previous hash of this line. import md5 +import fcntl class FileContainer: @@ -455,6 +456,11 @@ def open(self): self.__handler = open(self.__filename) + + # Set the file descriptor to be FD_CLOEXEC + fd = self.__handler.fileno() + fcntl.fcntl (self.__handler.fileno(), fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC) + firstLine = self.__handler.readline() # Computes the MD5 of the first line. myHash = md5.new(firstLine).digest() fail2ban-0.8.3-init.patch: --- NEW FILE fail2ban-0.8.3-init.patch --- --- fail2ban-0.8.3/files/redhat-initd.init 2008-03-10 23:36:22.000000000 +0100 +++ fail2ban-0.8.3/files/redhat-initd 2008-08-24 20:46:01.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash # -# chkconfig: 345 92 08 +# chkconfig: - 92 08 # description: Fail2ban daemon # http://fail2ban.sourceforge.net/wiki/index.php/Main_Page # process name: fail2ban-server @@ -27,8 +27,7 @@ echo -n $"Starting fail2ban: " getpid if [ -z "$pid" ]; then - rm -rf /var/run/fail2ban/fail2ban.sock # in case of unclean shutdown - $FAIL2BAN start > /dev/null + $FAIL2BAN -x start > /dev/null RETVAL=$? fi if [ $RETVAL -eq 0 ]; then --- NEW FILE fail2ban-logrotate --- /var/log/fail2ban.log { missingok notifempty size 30k create 0600 root root postrotate /usr/bin/fail2ban-client reload 2> /dev/null || true endscript } --- NEW FILE import.log --- fail2ban-0_8_3-18:EL-4:fail2ban-0.8.3-18.src.rpm:1241465271 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fail2ban/EL-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Dec 2006 19:12:03 -0000 1.2 +++ .cvsignore 4 May 2009 19:31:03 -0000 1.3 @@ -1 +1 @@ -fail2ban-0.6.2.tar.bz2 +fail2ban-0.8.3.tar.bz2 Index: fail2ban.spec =================================================================== RCS file: /cvs/extras/rpms/fail2ban/EL-4/fail2ban.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- fail2ban.spec 29 Jan 2009 14:16:02 -0000 1.2 +++ fail2ban.spec 4 May 2009 19:31:03 -0000 1.3 @@ -1,16 +1,24 @@ +# Not defined in Fedora's buildsystem +%global _initdir %{_sysconfdir}/rc.d/init.d + Summary: Ban IPs that make too many password failures Name: fail2ban -Version: 0.6.2 -Release: 3%{?dist} -License: GPL +Version: 0.8.3 +Release: 18%{?dist} +License: GPLv2+ Group: System Environment/Daemons URL: http://fail2ban.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: fail2ban-0.6.2-init.patch +Source1: fail2ban-logrotate +Patch0: fail2ban-0.8.3-init.patch +Patch1: fail2ban-0.8.1-sshd.patch +#Patch2: fail2ban-0.8.1-sock.patch +Patch3: fail2ban-0.8.2-fd_cloexec.patch +Patch4: 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel >= 2.3, dos2unix +BuildRequires: python-devel >= 2.3 BuildArch: noarch -Requires: iptables, tcp_wrappers, shorewall +Requires: iptables, tcp_wrappers, shorewall, gamin-python Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -22,10 +30,11 @@ failures. It updates firewall rules to r %prep %setup -q -grep -rl /usr/lib/fail2ban . \ - | xargs sed -i -e's,/usr/lib/fail2ban,%{_datadir}/fail2ban,g' -dos2unix config/redhat-initd %patch0 -p1 -b .init +%patch1 -p1 -b .sshd +#patch2 -p1 -b .sock +%patch3 -p1 -b .fd_cloexec +%patch4 -p1 -b .CVE-2009-0362 %build python setup.py build @@ -33,13 +42,14 @@ python setup.py build %install rm -rf %{buildroot} python setup.py install -O1 --root %{buildroot} -mkdir -p %{buildroot}%{_initrddir} -install -p -m 755 config/redhat-initd %{buildroot}%{_initrddir}/fail2ban -mkdir -p %{buildroot}%{_sysconfdir} -install -p -m 644 config/fail2ban.conf.iptables %{buildroot}%{_sysconfdir}/fail2ban.conf -mkdir -p %{buildroot}%{_mandir}/man{8,5} -install -p -m 644 man/fail2ban.8 %{buildroot}%{_mandir}/man8 -install -p -m 644 man/fail2ban.conf.5 %{buildroot}%{_mandir}/man5 +mkdir -p %{buildroot}%{_initdir} +install -p -m 755 files/redhat-initd %{buildroot}%{_initdir}/fail2ban +mkdir -p %{buildroot}%{_mandir}/man1 +install -p -m 644 man/fail2ban*.1 %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/fail2ban +mkdir -p %{buildroot}%{_localstatedir}/run/fail2ban +chmod 0755 %{buildroot}%{_localstatedir}/run/fail2ban %clean rm -rf %{buildroot} @@ -55,18 +65,77 @@ fi %files %defattr(-,root,root,-) -%doc README TODO CHANGELOG -%doc config/fail2ban.conf* -%config(noreplace) %{_sysconfdir}/fail2ban.conf -%{_bindir}/fail2ban +%doc README TODO ChangeLog COPYING +#doc config/fail2ban.conf* +%{_bindir}/fail2ban-server +%{_bindir}/fail2ban-client +%{_bindir}/fail2ban-regex %{_datadir}/fail2ban -%{_initrddir}/fail2ban -%{_mandir}/man8/fail2ban.8* -%{_mandir}/man5/fail2ban.conf.5* +%{_initdir}/fail2ban +%{_mandir}/man1/fail2ban-*.1* +%dir %{_sysconfdir}/fail2ban +%dir %{_sysconfdir}/fail2ban/action.d +%dir %{_sysconfdir}/fail2ban/filter.d +%config(noreplace) %{_sysconfdir}/fail2ban/fail2ban.conf +%config(noreplace) %{_sysconfdir}/fail2ban/jail.conf +%config(noreplace) %{_sysconfdir}/fail2ban/action.d/*.conf +%config(noreplace) %{_sysconfdir}/fail2ban/filter.d/*.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/fail2ban +%dir %{_localstatedir}/run/fail2ban %changelog -* Thu Jan 29 2009 Adam Miller - 0.6.2-3 -- Rebuild for EPEL - EL4 +* Mon Mar 04 2009 Adam Miller - 0.8.3-18 +- Rebuild For EPEL + +* Sat Feb 14 2009 Axel Thimm - 0.8.3-18 +- Fix CVE-2009-0362 (Fedora bugs #485461, #485464, #485465, #485466). + +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.8.3-17 +- Rebuild for Python 2.6 + +* Sun Aug 24 2008 Axel Thimm - 0.8.3-16 +- Update to 0.8.3. + +* Wed May 21 2008 Tom "spot" Callaway - 0.8.2-15 +- fix license tag + +* Thu Mar 27 2008 Axel Thimm - 0.8.2-14 +- Close on exec fixes by Jonathan Underwood. + +* Sun Mar 16 2008 Axel Thimm - 0.8.2-13 +- Add %%{_localstatedir}/run/fail2ban (David Rees). + +* Fri Mar 14 2008 Axel Thimm - 0.8.2-12 +- Update to 0.8.2. + +* Thu Jan 31 2008 Jonathan G. Underwood - 0.8.1-11 +- Move socket file from /tmp to /var/run to prevent SElinux from stopping + fail2ban from starting (BZ #429281) +- Change logic in init file to start with -x to remove the socket file in case + of unclean shutdown + +* Wed Aug 15 2007 Axel Thimm - 0.8.1-10 +- Update to 0.8.1. +- Remove patch fixing CVE-2007-4321 (upstream). +- Remove AllowUsers patch (upstream). +- Add dependency to gamin-python. + +* Thu Jun 21 2007 Axel Thimm - 0.8.0-9 +- Fix remote log injection (no CVE assignment yet). + +* Sun Jun 3 2007 Axel Thimm - 0.8.0-8 +- Also trigger on non-AllowUsers failures (Jonathan Underwood + ). + +* Wed May 23 2007 Axel Thimm - 0.8.0-7 +- logrotate should restart fail2ban (Zing ). +- send mail to root; logrotate (Jonathan Underwood + ) + +* Sat May 19 2007 Axel Thimm - 0.8.0-4 +- Update to 0.8.0. +- enable ssh by default, fix log file for ssh scanning, adjust python + dependency (Jonathan Underwood ) * Sat Dec 30 2006 Axel Thimm - 0.6.2-3 - Remove forgotten condrestart. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fail2ban/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Dec 2006 19:12:03 -0000 1.2 +++ sources 4 May 2009 19:31:03 -0000 1.3 @@ -1 +1 @@ -7c686e610f0ad7678688a1bb2cd913da fail2ban-0.6.2.tar.bz2 +b438d7e2ce77a469fb0cca2a5cc0b81c fail2ban-0.8.3.tar.bz2 --- fail2ban-0.6.2-init.patch DELETED --- From dwalsh at fedoraproject.org Mon May 4 19:37:00 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 4 May 2009 19:37:00 +0000 (UTC) Subject: rpms/selinux-policy/F-11 selinux-policy.spec,1.850,1.851 Message-ID: <20090504193700.706AB70131@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13639 Modified Files: selinux-policy.spec Log Message: * Mon May 4 2009 Dan Walsh 3.6.12-28 - Fix package selection handling Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v retrieving revision 1.850 retrieving revision 1.851 diff -u -p -r1.850 -r1.851 --- selinux-policy.spec 4 May 2009 18:20:22 -0000 1.850 +++ selinux-policy.spec 4 May 2009 19:36:29 -0000 1.851 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.12 -Release: 27%{?dist} +Release: 28%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -167,7 +167,7 @@ fi %define loadpolicy() \ ( cd /usr/share/selinux/%1; \ -semodule -b base.pp.bz2 -i %{expand:%%moduleList %1} %2 -s %1; \ +semodule -b base.pp.bz2 -i %2 -s %1; \ ); \ %define relabel() \ @@ -311,16 +311,16 @@ function get_unconfined() { # currently installed. If you have a version 3.0.0 or less of unconfined # installed, you will need to install both, since unconfineduser did not exist # prior to this. -both="unconfined.pp.bz2 unconfineduser.pp.bz2" -packages="" +packages="%{expand:%%moduleList targeted}" +both="$packages unconfined.pp.bz2 unconfineduser.pp.bz2" ctr=0 while [ "$1" != "" ]; do if [ "$1" = "unconfineduser" ]; then - packages="unconfineduser.pp.bz2 $packages" + packages="$packages unconfineduser.pp.bz2" let "ctr+=1" fi if [ "$1" = "unconfined" ]; then - packages="unconfined.pp.bz2 $packages" + packages="$packages unconfined.pp.bz2" version=$2 let "ctr+=1" fi @@ -351,7 +351,7 @@ if [ $1 -eq 1 ]; then restorecon -R /root /var/log /var/run 2> /dev/null else semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null - packages="%{expand:%%moduleList targeted} `get_unconfined $(semodule -l)`" + packages=`get_unconfined` %loadpolicy targeted $packages %relabel targeted fi @@ -396,16 +396,15 @@ SELinux Reference policy minimum base mo %saveFileContext minimum %post minimum -if [ $1 -eq 1 ]; then packages="unconfined.pp.bz2 unconfineduser.pp.bz2" %loadpolicy minimum $packages +if [ $1 -eq 1 ]; then semanage -S minimum -i - << __eof login -m -s unconfined_u -r s0-s0:c0.c1023 __default__ login -m -s unconfined_u -r s0-s0:c0.c1023 root __eof restorecon -R /root /var/log /var/run 2> /dev/null else -%loadminpolicy minimum %relabel minimum fi exit 0 @@ -478,6 +477,9 @@ exit 0 %endif %changelog +* Mon May 4 2009 Dan Walsh 3.6.12-28 +- Fix package selection handling + * Fri May 1 2009 Dan Walsh 3.6.12-27 - Fix /sbin/ip6tables-save context - Allod udev to transition to mount From mbarnes at fedoraproject.org Mon May 4 19:37:25 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 19:37:25 +0000 (UTC) Subject: rpms/evolution/devel evolution.spec,1.386,1.387 Message-ID: <20090504193725.A5A5C700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13851 Modified Files: evolution.spec Log Message: Still trying to get this bugger to build... Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.386 retrieving revision 1.387 diff -u -p -r1.386 -r1.387 --- evolution.spec 4 May 2009 19:10:10 -0000 1.386 +++ evolution.spec 4 May 2009 19:36:54 -0000 1.387 @@ -578,9 +578,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so -%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so - %{evo_plugin_dir}/org-gnome-itip-formatter.eplug %{evo_plugin_dir}/liborg-gnome-itip-formatter.so From dwalsh at fedoraproject.org Mon May 4 19:37:59 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 4 May 2009 19:37:59 +0000 (UTC) Subject: rpms/selinux-policy/devel selinux-policy.spec,1.845,1.846 Message-ID: <20090504193759.92908700DB@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14359 Modified Files: selinux-policy.spec Log Message: * Mon May 4 2009 Dan Walsh 3.6.12-28 - Fix package selection handling Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.845 retrieving revision 1.846 diff -u -p -r1.845 -r1.846 --- selinux-policy.spec 4 May 2009 18:20:29 -0000 1.845 +++ selinux-policy.spec 4 May 2009 19:37:29 -0000 1.846 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.12 -Release: 27%{?dist} +Release: 28%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -167,7 +167,7 @@ fi %define loadpolicy() \ ( cd /usr/share/selinux/%1; \ -semodule -b base.pp.bz2 -i %{expand:%%moduleList %1} %2 -s %1; \ +semodule -b base.pp.bz2 -i %2 -s %1; \ ); \ %define relabel() \ @@ -311,16 +311,16 @@ function get_unconfined() { # currently installed. If you have a version 3.0.0 or less of unconfined # installed, you will need to install both, since unconfineduser did not exist # prior to this. -both="unconfined.pp.bz2 unconfineduser.pp.bz2" -packages="" +packages="%{expand:%%moduleList targeted}" +both="$packages unconfined.pp.bz2 unconfineduser.pp.bz2" ctr=0 while [ "$1" != "" ]; do if [ "$1" = "unconfineduser" ]; then - packages="unconfineduser.pp.bz2 $packages" + packages="$packages unconfineduser.pp.bz2" let "ctr+=1" fi if [ "$1" = "unconfined" ]; then - packages="unconfined.pp.bz2 $packages" + packages="$packages unconfined.pp.bz2" version=$2 let "ctr+=1" fi @@ -351,7 +351,7 @@ if [ $1 -eq 1 ]; then restorecon -R /root /var/log /var/run 2> /dev/null else semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null - packages="%{expand:%%moduleList targeted} `get_unconfined $(semodule -l)`" + packages=`get_unconfined` %loadpolicy targeted $packages %relabel targeted fi @@ -396,16 +396,15 @@ SELinux Reference policy minimum base mo %saveFileContext minimum %post minimum -if [ $1 -eq 1 ]; then packages="unconfined.pp.bz2 unconfineduser.pp.bz2" %loadpolicy minimum $packages +if [ $1 -eq 1 ]; then semanage -S minimum -i - << __eof login -m -s unconfined_u -r s0-s0:c0.c1023 __default__ login -m -s unconfined_u -r s0-s0:c0.c1023 root __eof restorecon -R /root /var/log /var/run 2> /dev/null else -%loadminpolicy minimum %relabel minimum fi exit 0 @@ -478,6 +477,9 @@ exit 0 %endif %changelog +* Mon May 4 2009 Dan Walsh 3.6.12-28 +- Fix package selection handling + * Fri May 1 2009 Dan Walsh 3.6.12-27 - Fix /sbin/ip6tables-save context - Allod udev to transition to mount From mbarnes at fedoraproject.org Mon May 4 19:51:53 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 4 May 2009 19:51:53 +0000 (UTC) Subject: rpms/evolution-mapi/devel .cvsignore, 1.6, 1.7 evolution-mapi.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <20090504195153.ED4AB700DB@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-mapi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15803 Modified Files: .cvsignore evolution-mapi.spec sources Log Message: * Mon May 04 2009 Matthew Barnes - 0.27.1-1 - Update to 0.27.1 - Bump eds_major to 2.28. - Bump evo and eds req's to 2.27.1. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 14 Apr 2009 16:29:07 -0000 1.6 +++ .cvsignore 4 May 2009 19:51:23 -0000 1.7 @@ -1 +1 @@ -evolution-mapi-0.26.1.tar.bz2 +evolution-mapi-0.27.1.tar.bz2 Index: evolution-mapi.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- evolution-mapi.spec 14 Apr 2009 16:29:07 -0000 1.5 +++ evolution-mapi.spec 4 May 2009 19:51:23 -0000 1.6 @@ -1,9 +1,9 @@ -%define evo_version 2.25.2 -%define eds_version 2.25.2 +%define evo_version 2.27.1 +%define eds_version 2.27.1 %define libmapi_version 0.8 %define intltool_version 0.35.5 -%define evo_major 2.26 +%define evo_major 2.28 %define eds_major 1.2 %define strict_build_settings 0 @@ -11,7 +11,7 @@ ### Abstract ### Name: evolution-mapi -Version: 0.26.1 +Version: 0.27.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Evolution extension for MS Exchange 2007 servers @@ -111,6 +111,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libexchangemapi-1.0.pc %changelog +* Mon May 04 2009 Matthew Barnes - 0.27.1-1 +- Update to 0.27.1 +- Bump eds_major to 2.28. +- Bump evo and eds req's to 2.27.1. + * Mon Apr 13 2009 Matthew Barnes - 0.26.1-1 - Update to 0.26.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 14 Apr 2009 16:29:07 -0000 1.6 +++ sources 4 May 2009 19:51:23 -0000 1.7 @@ -1 +1 @@ -6eb79722661ce7de30af34b9742201c7 evolution-mapi-0.26.1.tar.bz2 +78c5bdbed0e282fe5d60c3c1df385e22 evolution-mapi-0.27.1.tar.bz2 From orion at fedoraproject.org Mon May 4 20:14:52 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Mon, 4 May 2009 20:14:52 +0000 (UTC) Subject: rpms/plplot/devel plplot-5.9.3-multiarch.patch, NONE, 1.1 plplot-5.9.3-soversion.patch, NONE, 1.1 plplot-5.9.3-test.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 plplot.spec, 1.74, 1.75 sources, 1.15, 1.16 plplot-5.9.1-multiarch.patch, 1.1, NONE plplot-5.9.2-f77.patch, 1.1, NONE plplot-5.9.2-gnat-4.4.patch, 1.1, NONE plplot-5.9.2-test.patch, 1.2, NONE Message-ID: <20090504201452.3F8F2700DB@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/plplot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19152 Modified Files: .cvsignore plplot.spec sources Added Files: plplot-5.9.3-multiarch.patch plplot-5.9.3-soversion.patch plplot-5.9.3-test.patch Removed Files: plplot-5.9.1-multiarch.patch plplot-5.9.2-f77.patch plplot-5.9.2-gnat-4.4.patch plplot-5.9.2-test.patch Log Message: * Mon May 4 2009 - Orion Poplawski - 5.9.3-1 - Update to 5.9.3 - Drop gnat-4.4 and f77 patches fixed upstream - Updated multiarch and test patches - Add patch to fix up libnistcd.so soversion - Convert some doc files to UTF-8 - Add lua and lua-devel sub-packages - Remove rpaths - Drop gcw driver and pygcw/gnome bindings deprecated upstream - Drop gd driver deprecated upstream - Move ldconfig run to plplot-libs, and add to plplot-wxGTK plplot-5.9.3-multiarch.patch: --- NEW FILE plplot-5.9.3-multiarch.patch --- --- plplot-5.9.2/examples/c/Makefile.examples.in.multiarch 2009-04-29 15:41:24.000000000 -0600 +++ plplot-5.9.2/examples/c/Makefile.examples.in 2009-04-29 15:45:54.000000000 -0600 @@ -25,8 +25,6 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ @gcw_true at PLPLOTCANVAS_EXECUTABLES_list = \ @gcw_true@ plplotcanvas_demo$(EXEEXT) \ @@ -80,29 +78,29 @@ rm -f $(EXECUTABLES_list) @gcw_true at plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c - at gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \ - at gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` + at gcw_true@@pkg_config_true@ $(CC) $< -o $@ \ + at gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` @gcw_true@@pkg_config_false@ $(CC) $< -o $@ \ @gcw_true@@pkg_config_false@ `plplot-config --cflags --libs --with-gcw` @gcw_true at plplotcanvas_animation$(EXEEXT): plplotcanvas_animation.c - at gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \ - at gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \ + at gcw_true@@pkg_config_true@ $(CC) $< -o $@ \ + at gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \ @gcw_true@@pkg_config_true@ `pkg-config --cflags --libs gthread-2.0` @gcw_true@@pkg_config_false@ $(CC) $< -o \ @gcw_true@@pkg_config_false@ $@ `plplot-config --cflags --libs --with-gcw` \ @gcw_true@@pkg_config_false@ @GCWTHREAD_CFLAGS@ @GCWTHREAD_LIBS@ @extXdrawable_true@@pkg_config_true at extXdrawable_demo$(EXEEXT): extXdrawable_demo.c - at extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \ - at extXdrawable_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0` + at extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ \ + at extXdrawable_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0` @extcairo_true@@pkg_config_true at ext-cairo-test$(EXEEXT): ext-cairo-test.c - at extcairo_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \ - at extcairo_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG) cairo` + at extcairo_true@@pkg_config_true@ $(CC) $< -o $@ \ + at extcairo_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG) cairo` .c$(EXEEXT): - at pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)` + at pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)` @pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs` .SUFFIXES: .c $(EXEEXT) --- plplot-5.9.2/examples/c++/Makefile.examples.in.multiarch 2009-04-29 15:41:25.000000000 -0600 +++ plplot-5.9.2/examples/c++/Makefile.examples.in 2009-04-29 15:46:49.000000000 -0600 @@ -25,10 +25,7 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ @qt_gui_true at QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ - at qt_gui_true@@pkg_config_true at qt_RPATHCMD = @qt_RPATHCMD@ @wxwidgets_true@@pkg_config_true at PLPLOTWXWIDGETS_EXECUTABLES_list = \ @wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT) @@ -79,16 +76,16 @@ rm -f $(EXECUTABLES_list) @wxwidgets_true@@pkg_config_true at wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp - at wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets` + at wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets` @qt_gui_true@@pkg_config_true at moc_qt_PlotWindow.cpp: qt_PlotWindow.h @qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config --cflags plplot$(LIB_TAG)-qt` $< -o $@ @qt_gui_true@@pkg_config_true at qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp - at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-qt` + at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-qt` .cc$(EXEEXT): - at pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++` + at pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-c++` @pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++` .SUFFIXES: .cc $(EXEEXT) --- plplot-5.9.2/examples/f77/Makefile.examples.in.multiarch 2009-01-18 13:24:12.000000000 -0700 +++ plplot-5.9.2/examples/f77/Makefile.examples.in 2009-04-29 15:41:41.000000000 -0600 @@ -25,8 +25,6 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ EXECUTABLES_list = \ x01f$(EXEEXT) \ @@ -69,7 +67,7 @@ rm -f $(EXECUTABLES_list) .f$(EXEEXT): - at pkg_config_true@ $(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f77` + at pkg_config_true@ $(F77) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f77` @pkg_config_false@ $(F77) $< -o $@ `plplot-config --cflags --libs --with-f77` .SUFFIXES: .f $(EXEEXT) --- plplot-5.9.2/examples/f95/Makefile.examples.in.multiarch 2009-01-18 13:24:12.000000000 -0700 +++ plplot-5.9.2/examples/f95/Makefile.examples.in 2009-04-29 15:41:40.000000000 -0600 @@ -25,8 +25,6 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ EXECUTABLES_list = \ x01f$(EXEEXT) \ @@ -68,7 +66,7 @@ rm -f $(EXECUTABLES_list) .f90$(EXEEXT): - at pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f95` + at pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f95` @pkg_config_false@ $(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95` .SUFFIXES: .f90 $(EXEEXT) --- plplot-5.9.2/examples/tk/Makefile.examples.in.multiarch 2009-04-29 15:41:30.000000000 -0600 +++ plplot-5.9.2/examples/tk/Makefile.examples.in 2009-04-29 15:43:55.000000000 -0600 @@ -24,8 +24,6 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ EXECUTABLES_list = xtk01$(EXEEXT) # Second and fourth examples depend on itk. @@ -37,7 +35,7 @@ rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list) .c$(EXEEXT): - at pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-tcl` + at pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-tcl` @pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl` .SUFFIXES: .c $(EXEEXT) plplot-5.9.3-soversion.patch: --- NEW FILE plplot-5.9.3-soversion.patch --- --- plplot-5.9.3/cmake/modules/plplot_version.cmake.soversion 2009-04-28 14:49:37.000000000 -0600 +++ plplot-5.9.3/cmake/modules/plplot_version.cmake 2009-05-04 11:42:42.000000000 -0600 @@ -28,7 +28,7 @@ # library version numbers the same for the release. set(nistcd_SOVERSION 0) -set(nistcd_VERSION ${nist_SOVERSION}.0.1) +set(nistcd_VERSION ${nistcd_SOVERSION}.0.1) set(csirocsa_SOVERSION 0) set(csirocsa_VERSION ${csirocsa_SOVERSION}.0.1) plplot-5.9.3-test.patch: --- NEW FILE plplot-5.9.3-test.patch --- --- plplot-5.9.2/plplot_test/plplot-test.sh.cmake.test 2009-04-29 15:57:13.000000000 -0600 +++ plplot-5.9.2/plplot_test/plplot-test.sh.cmake 2009-04-29 16:03:50.000000000 -0600 @@ -34,8 +34,9 @@ version=@VERSION@ -EXAMPLES_DIR=${EXAMPLES_DIR:-.} -SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.} +EXE_DIR=`dirname $0` +EXAMPLES_DIR=${EXAMPLES_DIR:=$EXE_DIR} +SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:=$EXE_DIR} OUTPUT_DIR=${OUTPUT_DIR:-.} device=${DEVICE:-psc} export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD @@ -145,18 +146,6 @@ shift done -# This script is only designed to work when EXAMPLES_DIR is a directory -# with a subdirectory called "c". Check whether this conditions is true. - -if [ ! -d $EXAMPLES_DIR/c ] ; then -echo ' -This script is only designed to work when the EXAMPLES_DIR environment -variable (overridden by option --examples-dir) is a directory with a -subdirectory called "c". This condition has been violated. -' -exit 1 -fi - # These variables set by default assuming you are going to run this # script from the installed demos directory $prefix/lib/plplot$version/examples. cdir=$EXAMPLES_DIR/c @@ -292,21 +281,18 @@ dsuffix=$device export dsuffix options -# Find out what front-ends have been configured +# Find out what front-ends have been configured and installed if [ -z "$FRONT_END" ] ; then - FRONT_END=c - test "@ENABLE_cxx@" = "ON" && FRONT_END="$FRONT_END cxx" - test "@ENABLE_f77@" = "ON" && FRONT_END="$FRONT_END f77" - test "@ENABLE_f95@" = "ON" && FRONT_END="$FRONT_END f95" - test "@ENABLE_java@" = "ON" && FRONT_END="$FRONT_END java" - test "@ENABLE_octave@" = "ON" && FRONT_END="$FRONT_END octave" - test "@ENABLE_python@" = "ON" && FRONT_END="$FRONT_END python" - test "@ENABLE_tcl@" = "ON" && FRONT_END="$FRONT_END tcl" - test "@ENABLE_pdl@" = "ON" && FRONT_END="$FRONT_END perl" - test "@ENABLE_ada@" = "ON" && FRONT_END="$FRONT_END ada" - test "@ENABLE_ocaml@" = "ON" && FRONT_END="$FRONT_END ocaml" - test "@ENABLE_lua@" = "ON" && FRONT_END="$FRONT_END lua" - test "@ENABLE_d@" = "ON" && FRONT_END="$FRONT_END d" + for front_end_status in c:@ENABLE_c@ cxx:@ENABLE_cxx@ f77:@ENABLE_f77@ \ + f95:@ENABLE_f95@ java:@ENABLE_java@ \ + octave:@ENABLE_octave@ python:@ENABLE_python@ \ + tcl:@ENABLE_tcl@ perl:@ENABLE_pdl@ \ + ada:@ENABLE_ada@ ocaml:@ENABLE_ocaml@ \ + lua:@ENABLE_lua@ d:@ENABLE_d@ + do + front_end=${front_end_status/:ON/} + [ $front_end != $front_end_status ] && [ -d $EXAMPLES_DIR/$front_end ] && FRONT_END="$FRONT_END $front_end" + done fi # Find where the front-end scripts are by looking at the directory name of the @@ -332,9 +318,6 @@ for i in $FRONT_END ; do echo "Testing front-end $i" script=$scripts_dir/test_$i.sh - if [ "@WIN32@" != "1" ] ; then - chmod +x $script - fi @SH_EXECUTABLE@ $script || status=1 done Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/plplot/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- .cvsignore 30 Jan 2009 16:50:01 -0000 1.15 +++ .cvsignore 4 May 2009 20:14:21 -0000 1.16 @@ -1 +1 @@ -plplot-5.9.2.tar.gz +plplot-5.9.3.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- plplot.spec 20 Apr 2009 17:36:27 -0000 1.74 +++ plplot.spec 4 May 2009 20:14:21 -0000 1.75 @@ -9,19 +9,18 @@ %bcond_without pdl Name: plplot -Version: 5.9.2 -Release: 4%{?dist} +Version: 5.9.3 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering License: LGPLv2+ URL: http://plplot.sourceforge.net/ Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz -Patch1: plplot-5.9.1-multiarch.patch +Patch1: plplot-5.9.3-multiarch.patch Patch2: plplot-5.9.2-info.patch -Patch3: plplot-5.9.2-gnat-4.4.patch -Patch4: plplot-5.9.2-f77.patch -Patch5: plplot-5.9.2-test.patch +Patch3: plplot-5.9.3-soversion.patch +Patch5: plplot-5.9.3-test.patch Patch6: plplot-5.7.3-jni.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,13 +57,14 @@ BuildRequires: texlive, texinfo, openja %ifnarch sparc64 s390 s390x BuildRequires: ocaml, ocaml-findlib, ocaml-camlidl-devel %endif -Requires(post): /sbin/ldconfig +BuildRequires: lua-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: gnu-free-mono-fonts Requires: gnu-free-sans-fonts Requires: gnu-free-serif-fonts Requires: numpy +Obsoletes: %{name}-gnome <= %{version}-%{release} %description @@ -95,6 +95,7 @@ the png and jpeg drivers that uses the F %package libs Summary: Libraries for PLplot Group: Development/Libraries +Requires(post): /sbin/ldconfig %description libs %{summary}. @@ -133,27 +134,6 @@ Requires: gcc-gnat %{summary}. -%package gnome -Summary: Functions for scientific plotting with GNOME -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description gnome -%{summary}. - -%package gnome-devel -Summary: Development files for using PLplot GNOME -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Requires: %{name}-gnome = %{version}-%{release} -Requires: pkgconfig -Requires: libgnomecanvas-devel, libgnomeprintui22-devel - -%description gnome-devel -%{summary}. - - %package java Summary: Functions for scientific plotting with Java Group: Development/Libraries @@ -174,6 +154,16 @@ Requires: %{name}-java = %{version %{summary}. +%package lua +Summary: Functions for scientific plotting with Lua +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: lua + +%description lua +%{summary}. + + %ifnarch sparc64 s390 s390x %package ocaml Summary: Functions for scientific plotting with OCaml @@ -265,11 +255,17 @@ Requires: pkgconfig %prep %setup -q %patch1 -p1 -b .multiarch -%patch2 -p1 -b .orig -%patch3 -p1 -b .gnat-4.4 -%patch4 -p1 -b .f77 +%patch2 -p1 -b .info +%patch3 -p1 -b .soversion %patch5 -p1 -b .test %patch6 -p1 -b .jni +# Convert to UTF-8 +for file in ChangeLog NEWS +do + iconv -f ISO-8859-1 -t UTF-8 $file > ${file}.tmp + touch -r $file ${file}.tmp + mv ${file}.tmp $file +done %build @@ -282,17 +278,18 @@ export FFLAGS="$RPM_OPT_FLAGS" unset TERM %cmake .. \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ - -DCMAKE_INSTALL_RPATH:PATH="" \ + -DUSE_RPATH:BOOL=OFF \ -DENABLE_ada:BOOL=ON \ -DHAVE_ADA_2007:BOOL=ON \ -DENABLE_d:BOOL=ON \ -DENABLE_itcl:BOOL=ON \ -DENABLE_itk:BOOL=ON \ + -DENABLE_lua:BOOL=ON \ + -DHAVE_lua51:BOOL=ON \ -DENABLE_ocaml:BOOL=ON \ -DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \ %{build_octave} \ -DENABLE_pdl:BOOL=ON \ - -DENABLE_pygcw:BOOL=ON \ -DENABLE_tk:BOOL=ON \ -DHAVE_PTHREAD:BOOL=ON \ -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \ @@ -359,7 +356,6 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig /sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || : %preun @@ -367,26 +363,23 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || : fi -%postun -p /sbin/ldconfig - -%post ada -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig +%post ada -p /sbin/ldconfig %postun ada -p /sbin/ldconfig -%post gnome -p /sbin/ldconfig - -%postun gnome -p /sbin/ldconfig - %if %{with octave} -%post octave -p /sbin/ldconfig - +%post octave -p /sbin/ldconfig %postun octave -p /sbin/ldconfig %endif -%post tk -p /sbin/ldconfig - +%post tk -p /sbin/ldconfig %postun tk -p /sbin/ldconfig +%post wxGTK -p /sbin/ldconfig +%postun wxGTK -p /sbin/ldconfig + %files %defattr(-,root,root,-) @@ -399,7 +392,6 @@ fi %{python_sitearch}/plplot.py* %{python_sitearch}/plplot_widgetmodule.so %{python_sitearch}/plplotc.py* -%{python_sitearch}/plplotcanvas.py* %{_infodir}/plplotdoc.info* %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz @@ -418,20 +410,22 @@ fi %defattr(-,root,root,-) %{_libdir}/libcsirocsa.so.* %{_libdir}/libcsironn.so.* +%{_libdir}/libnistcd.so.* %{_libdir}/libplplotcxxd.so.* %{_libdir}/libplplotd.so.* %{_libdir}/libplplotf77cd.so.* %{_libdir}/libplplotf77d.so.* %{_libdir}/libplplotf95cd.so.* %{_libdir}/libplplotf95d.so.* +%{_libdir}/libqsastime.so.* %dir %{_libdir}/plplot%{version} %dir %{_libdir}/plplot%{version}/driversd %{_libdir}/plplot%{version}/driversd/cairo.rc %{_libdir}/plplot%{version}/driversd/cairo.so +%{_libdir}/plplot%{version}/driversd/cgm.rc +%{_libdir}/plplot%{version}/driversd/cgm.so %{_libdir}/plplot%{version}/driversd/dg300.rc %{_libdir}/plplot%{version}/driversd/dg300.so -%{_libdir}/plplot%{version}/driversd/gd.rc -%{_libdir}/plplot%{version}/driversd/gd.so %{_libdir}/plplot%{version}/driversd/hpgl.rc %{_libdir}/plplot%{version}/driversd/hpgl.so %{_libdir}/plplot%{version}/driversd/impress.rc @@ -473,12 +467,14 @@ fi %{_includedir}/plplot/ %{_libdir}/libcsirocsa.so %{_libdir}/libcsironn.so +%{_libdir}/libnistcd.so %{_libdir}/libplplotcxxd.so %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so %{_libdir}/libplplotf95cd.so %{_libdir}/libplplotf95d.so +%{_libdir}/libqsastime.so %{_libdir}/fortran/ %{_libdir}/pkgconfig/plplotd.pc %{_libdir}/pkgconfig/plplotd-c++.pc @@ -487,7 +483,6 @@ fi %{_datadir}/plplot%{version}/examples/lena.pgm %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ -%{_datadir}/plplot%{version}/examples/d/ %{_datadir}/plplot%{version}/examples/f77/ %{_datadir}/plplot%{version}/examples/f95/ %{_datadir}/plplot%{version}/examples/Makefile @@ -515,19 +510,6 @@ fi %{_datadir}/plplot%{version}/examples/ada/ %{_datadir}/plplot%{version}/examples/test_ada.sh -%files gnome -%defattr(-,root,root,-) -%{_libdir}/libplplotgnome2d.so.* -%{_libdir}/plplot%{version}/driversd/gcw.rc -%{_libdir}/plplot%{version}/driversd/gcw.so -%{python_sitearch}/gcwmodule.so -%{python_sitearch}/cplplotcanvasmodule.so - -%files gnome-devel -%defattr(-,root,root,-) -%{_libdir}/libplplotgnome2d.so -%{_libdir}/pkgconfig/plplotd-gnome2.pc - %files java %defattr(-,root,root,-) %{_libdir}/plplot%{version}/plplotjavac_wrap.so @@ -538,6 +520,12 @@ fi %{_datadir}/plplot%{version}/examples/java/ %{_datadir}/plplot%{version}/examples/test_java.sh +%files lua +%defattr(-,root,root,-) +%{_libdir}/lua/5.1/plplot/ +%{_datadir}/plplot%{version}/examples/lua/ +%{_datadir}/plplot%{version}/examples/test_lua.sh + %ifnarch sparc64 s390 s390x %files ocaml %defattr(-,root,root,-) @@ -546,14 +534,14 @@ fi %{_libdir}/ocaml/plplot/*.cma %{_libdir}/ocaml/plplot/*.cmi %{_libdir}/ocaml/stublibs/* -%{_datadir}/plplot%{version}/examples/ocaml/ -%{_datadir}/plplot%{version}/examples/test_ocaml.sh %files ocaml-devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/plplotd-ocaml.pc %{_libdir}/ocaml/plplot/*.a %{_libdir}/ocaml/plplot/*.cmxa +%{_datadir}/plplot%{version}/examples/ocaml/ +%{_datadir}/plplot%{version}/examples/test_ocaml.sh %endif %if %{with octave} @@ -610,6 +598,18 @@ fi %changelog +* Mon May 4 2009 - Orion Poplawski - 5.9.3-1 +- Update to 5.9.3 +- Drop gnat-4.4 and f77 patches fixed upstream +- Updated multiarch and test patches +- Add patch to fix up libnistcd.so soversion +- Convert some doc files to UTF-8 +- Add lua and lua-devel sub-packages +- Remove rpaths +- Drop gcw driver and pygcw/gnome bindings deprecated upstream +- Drop gd driver deprecated upstream +- Move ldconfig run to plplot-libs, and add to plplot-wxGTK + * Thu Apr 16 2009 Orion Poplawski - Only disable ocaml support on sparc64, s390, s390x Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plplot/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 30 Jan 2009 16:50:06 -0000 1.15 +++ sources 4 May 2009 20:14:21 -0000 1.16 @@ -1 +1 @@ -2a14753112083badab87f1806cc12a46 plplot-5.9.2.tar.gz +ee5ee8bd539c203c1e045bd4368c0a4c plplot-5.9.3.tar.gz --- plplot-5.9.1-multiarch.patch DELETED --- --- plplot-5.9.2-f77.patch DELETED --- --- plplot-5.9.2-gnat-4.4.patch DELETED --- --- plplot-5.9.2-test.patch DELETED --- From rdieter at fedoraproject.org Mon May 4 20:19:20 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 20:19:20 +0000 (UTC) Subject: rpms/kdebase-workspace/F-10 kdebase-workspace.spec,1.172,1.173 Message-ID: <20090504201920.9C1CB700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19845/F-10 Modified Files: kdebase-workspace.spec Log Message: Requires: oxygen-icon-theme >= 4.2.2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -p -r1.172 -r1.173 --- kdebase-workspace.spec 28 Apr 2009 17:13:16 -0000 1.172 +++ kdebase-workspace.spec 4 May 2009 20:18:50 -0000 1.173 @@ -95,7 +95,7 @@ Requires: %{name}-libs = %{version}-%{re # would much rather these deps be elsewhere, # but adding here doesn't hurt either -- Rex Requires: kdebase-runtime >= %{version} -Requires: oxygen-icon-theme >= %{version} +Requires: oxygen-icon-theme >= 4.2.2 # pkg-splits, upgrade path Requires: kdm = %{version}-%{release} From rdieter at fedoraproject.org Mon May 4 20:19:20 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 20:19:20 +0000 (UTC) Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec,1.217,1.218 Message-ID: <20090504201920.D72E0700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19845/F-11 Modified Files: kdebase-workspace.spec Log Message: Requires: oxygen-icon-theme >= 4.2.2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -p -r1.217 -r1.218 --- kdebase-workspace.spec 3 May 2009 21:24:17 -0000 1.217 +++ kdebase-workspace.spec 4 May 2009 20:18:50 -0000 1.218 @@ -90,7 +90,7 @@ Requires: %{name}-libs = %{version}-%{re # would much rather these deps be elsewhere, # but adding here doesn't hurt either -- Rex Requires: kdebase-runtime >= %{version} -Requires: oxygen-icon-theme >= %{version} +Requires: oxygen-icon-theme >= 4.2.2 # pkg-splits, upgrade path Requires: kdm = %{version}-%{release} From rdieter at fedoraproject.org Mon May 4 20:19:21 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 20:19:21 +0000 (UTC) Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.217,1.218 Message-ID: <20090504201921.8749A700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19845/devel Modified Files: kdebase-workspace.spec Log Message: Requires: oxygen-icon-theme >= 4.2.2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -p -r1.217 -r1.218 --- kdebase-workspace.spec 30 Apr 2009 00:20:52 -0000 1.217 +++ kdebase-workspace.spec 4 May 2009 20:18:51 -0000 1.218 @@ -95,7 +95,7 @@ Requires: %{name}-libs = %{version}-%{re # would much rather these deps be elsewhere, # but adding here doesn't hurt either -- Rex Requires: kdebase-runtime >= %{version} -Requires: oxygen-icon-theme >= %{version} +Requires: oxygen-icon-theme >= 4.2.2 # pkg-splits, upgrade path Requires: kdm = %{version}-%{release} From rdieter at fedoraproject.org Mon May 4 20:19:21 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 20:19:21 +0000 (UTC) Subject: rpms/kdebase-workspace/F-9 kdebase-workspace.spec,1.148,1.149 Message-ID: <20090504201921.2D70A700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19845/F-9 Modified Files: kdebase-workspace.spec Log Message: Requires: oxygen-icon-theme >= 4.2.2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -p -r1.148 -r1.149 --- kdebase-workspace.spec 28 Apr 2009 17:13:16 -0000 1.148 +++ kdebase-workspace.spec 4 May 2009 20:18:50 -0000 1.149 @@ -95,7 +95,7 @@ Requires: %{name}-libs = %{version}-%{re # would much rather these deps be elsewhere, # but adding here doesn't hurt either -- Rex Requires: kdebase-runtime >= %{version} -Requires: oxygen-icon-theme >= %{version} +Requires: oxygen-icon-theme >= 4.2.2 # pkg-splits, upgrade path Requires: kdm = %{version}-%{release} From rdieter at fedoraproject.org Mon May 4 20:24:45 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 20:24:45 +0000 (UTC) Subject: rpms/kdebase/F-10 kdebase.spec,1.363,1.364 Message-ID: <20090504202445.79CBC700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20587/F-10 Modified Files: kdebase.spec Log Message: drop oxygen-icon-theme dep (already pulled in by kde-settings) Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase.spec,v retrieving revision 1.363 retrieving revision 1.364 diff -u -p -r1.363 -r1.364 --- kdebase.spec 21 Apr 2009 15:37:04 -0000 1.363 +++ kdebase.spec 4 May 2009 20:24:15 -0000 1.364 @@ -88,8 +88,8 @@ 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 +# Dolphin needs the ioslaves from kdebase-runtime (#438632) +Requires: kdebase-runtime %description Core runtime requirements and applications for the K Desktop Environment 4. From rdieter at fedoraproject.org Mon May 4 20:24:46 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 20:24:46 +0000 (UTC) Subject: rpms/kdebase/F-9 kdebase.spec,1.353,1.354 Message-ID: <20090504202446.29C34700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20587/F-9 Modified Files: kdebase.spec Log Message: drop oxygen-icon-theme dep (already pulled in by kde-settings) Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.353 retrieving revision 1.354 diff -u -p -r1.353 -r1.354 --- kdebase.spec 21 Apr 2009 15:37:07 -0000 1.353 +++ kdebase.spec 4 May 2009 20:24:15 -0000 1.354 @@ -88,8 +88,8 @@ 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 +# Dolphin needs the ioslaves from kdebase-runtime (#438632) +Requires: kdebase-runtime %description Core runtime requirements and applications for the K Desktop Environment 4. From rdieter at fedoraproject.org Mon May 4 20:24:46 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 20:24:46 +0000 (UTC) Subject: rpms/kdebase/devel kdebase.spec,1.373,1.374 Message-ID: <20090504202446.83B88700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20587/devel Modified Files: kdebase.spec Log Message: drop oxygen-icon-theme dep (already pulled in by kde-settings) Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.373 retrieving revision 1.374 diff -u -p -r1.373 -r1.374 --- kdebase.spec 21 Apr 2009 14:59:01 -0000 1.373 +++ kdebase.spec 4 May 2009 20:24:16 -0000 1.374 @@ -88,8 +88,8 @@ 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 +# Dolphin needs the ioslaves from kdebase-runtime (#438632) +Requires: kdebase-runtime %description Core runtime requirements and applications for the K Desktop Environment 4. From rdieter at fedoraproject.org Mon May 4 20:24:45 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 4 May 2009 20:24:45 +0000 (UTC) Subject: rpms/kdebase/F-11 kdebase.spec,1.374,1.375 Message-ID: <20090504202445.B372C700DB@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20587/F-11 Modified Files: kdebase.spec Log Message: drop oxygen-icon-theme dep (already pulled in by kde-settings) Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/F-11/kdebase.spec,v retrieving revision 1.374 retrieving revision 1.375 diff -u -p -r1.374 -r1.375 --- kdebase.spec 3 May 2009 13:09:38 -0000 1.374 +++ kdebase.spec 4 May 2009 20:24:15 -0000 1.375 @@ -87,8 +87,8 @@ 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 +# Dolphin needs the ioslaves from kdebase-runtime (#438632) +Requires: kdebase-runtime %description Core runtime requirements and applications for the K Desktop Environment 4. From kevin at fedoraproject.org Mon May 4 20:35:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:35:51 +0000 (UTC) Subject: rpms/gst-mixer - New directory Message-ID: <20090504203551.61421700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gst-mixer In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22670/rpms/gst-mixer Log Message: Directory /cvs/pkgs/rpms/gst-mixer added to the repository From pkgdb at fedoraproject.org Mon May 4 20:35:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:35:39 +0000 Subject: [pkgdb] gst-mixer (Fedora, 11) updated by kevin Message-ID: <20090504203540.2311F10F89E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for gst-mixer kevin has set commit to Approved for provenpackager on gst-mixer (Fedora 11) kevin has set build to Approved for provenpackager on gst-mixer (Fedora 11) kevin has set checkout to Approved for provenpackager on gst-mixer (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gst-mixer From pkgdb at fedoraproject.org Mon May 4 20:35:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:35:38 +0000 Subject: [pkgdb] gst-mixer was added for adamwill Message-ID: <20090504203539.4845D10F893@bastion2.fedora.phx.redhat.com> kevin has added Package gst-mixer with summary legacy mixer for GNOME kevin has approved Package gst-mixer kevin has added a Fedora devel branch for gst-mixer with an owner of adamwill kevin has approved gst-mixer in Fedora devel kevin has approved Package gst-mixer kevin has set commit to Approved for provenpackager on gst-mixer (Fedora devel) kevin has set build to Approved for provenpackager on gst-mixer (Fedora devel) kevin has set checkout to Approved for provenpackager on gst-mixer (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gst-mixer From kevin at fedoraproject.org Mon May 4 20:35:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:35:51 +0000 (UTC) Subject: rpms/gst-mixer/devel - New directory Message-ID: <20090504203551.B3A747013A@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gst-mixer/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22670/rpms/gst-mixer/devel Log Message: Directory /cvs/pkgs/rpms/gst-mixer/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:36:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:36:02 +0000 (UTC) Subject: rpms/gst-mixer Makefile,NONE,1.1 Message-ID: <20090504203602.DDD67700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gst-mixer In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22670/rpms/gst-mixer Added Files: Makefile Log Message: Setup of module gst-mixer --- NEW FILE Makefile --- # Top level Makefile for module gst-mixer 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 kevin at fedoraproject.org Mon May 4 20:36:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:36:03 +0000 (UTC) Subject: rpms/gst-mixer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504203603.6779C700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gst-mixer/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22670/rpms/gst-mixer/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gst-mixer --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gst-mixer # $Id: Makefile,v 1.1 2009/05/04 20:36:03 kevin Exp $ NAME := gst-mixer 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 pkgdb at fedoraproject.org Mon May 4 20:38:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:38:12 +0000 Subject: [pkgdb] gearmand was added for ruben Message-ID: <20090504203812.E72E410F8A5@bastion2.fedora.phx.redhat.com> kevin has added Package gearmand with summary A distributed job system kevin has approved Package gearmand kevin has added a Fedora devel branch for gearmand with an owner of ruben kevin has approved gearmand in Fedora devel kevin has approved Package gearmand kevin has set commit to Approved for provenpackager on gearmand (Fedora devel) kevin has set build to Approved for provenpackager on gearmand (Fedora devel) kevin has set checkout to Approved for provenpackager on gearmand (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gearmand From pkgdb at fedoraproject.org Mon May 4 20:38:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:38:13 +0000 Subject: [pkgdb] gearmand (Fedora EPEL, 5) updated by kevin Message-ID: <20090504203814.1841D10F8A8@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for gearmand kevin has set commit to Approved for provenpackager on gearmand (Fedora EPEL 5) kevin has set build to Approved for provenpackager on gearmand (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on gearmand (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gearmand From kevin at fedoraproject.org Mon May 4 20:38:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:38:25 +0000 (UTC) Subject: rpms/gearmand - New directory Message-ID: <20090504203825.52054700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gearmand In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY23174/rpms/gearmand Log Message: Directory /cvs/pkgs/rpms/gearmand added to the repository From pkgdb at fedoraproject.org Mon May 4 20:38:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:38:13 +0000 Subject: [pkgdb] gearmand (Fedora, 11) updated by kevin Message-ID: <20090504203814.2207910F8AB@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for gearmand kevin has set commit to Approved for provenpackager on gearmand (Fedora 11) kevin has set build to Approved for provenpackager on gearmand (Fedora 11) kevin has set checkout to Approved for provenpackager on gearmand (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gearmand From kevin at fedoraproject.org Mon May 4 20:38:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:38:25 +0000 (UTC) Subject: rpms/gearmand/devel - New directory Message-ID: <20090504203825.C16C6700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gearmand/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY23174/rpms/gearmand/devel Log Message: Directory /cvs/pkgs/rpms/gearmand/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:38:38 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:38:38 +0000 (UTC) Subject: rpms/gearmand Makefile,NONE,1.1 Message-ID: <20090504203838.BDB3770135@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gearmand In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY23174/rpms/gearmand Added Files: Makefile Log Message: Setup of module gearmand --- NEW FILE Makefile --- # Top level Makefile for module gearmand 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 kevin at fedoraproject.org Mon May 4 20:38:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:38:39 +0000 (UTC) Subject: rpms/gearmand/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504203839.38FD570135@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gearmand/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY23174/rpms/gearmand/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gearmand --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gearmand # $Id: Makefile,v 1.1 2009/05/04 20:38:38 kevin Exp $ NAME := gearmand 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 nsantos at fedoraproject.org Mon May 4 20:39:01 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Mon, 4 May 2009 20:39:01 +0000 (UTC) Subject: rpms/qpidc/devel qpidc.patch,NONE,1.1 qpidc.spec,1.77,1.78 Message-ID: <20090504203901.DADCA70131@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23216 Modified Files: qpidc.spec Added Files: qpidc.patch Log Message: patch for SASL credentials refresh qpidc.patch: --- NEW FILE qpidc.patch --- diff -up src/qpid/client/Connector.cpp.orig src/qpid/client/Connector.cpp --- src/qpid/client/Connector.cpp.orig 2009-05-04 16:06:17.000000000 -0400 +++ src/qpid/client/Connector.cpp 2009-05-04 16:07:06.000000000 -0400 @@ -391,11 +391,13 @@ void TCPConnector::run() { aio->start(poller); d.run(); - socket.close(); } catch (const std::exception& e) { QPID_LOG(error, QPID_MSG("FAIL " << identifier << ": " << e.what())); handleClosed(); } + try { + socket.close(); + } catch (const std::exception& e) {} } void TCPConnector::activateSecurityLayer(std::auto_ptr sl) Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 --- qpidc.spec 1 Apr 2009 13:15:51 -0000 1.77 +++ qpidc.spec 4 May 2009 20:38:31 -0000 1.78 @@ -7,13 +7,14 @@ Name: qpidc Version: 0.5.752600 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: ASL 2.0 URL: http://qpid.apache.org Source0: %{name}-%{version}.tar.gz Source1: qpidd.pp +Patch: qpidc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel @@ -196,6 +197,7 @@ exit 0 %prep %setup -q +%patch %define perftests "perftest topic_listener topic_publisher \ latencytest client_test txtest" @@ -409,6 +411,9 @@ fi %postun -n qmf -p /sbin/ldconfig %changelog +* Mon May 4 2009 Nuno Santos - 0.5.752600-6 +- patch for SASL credentials refresh + * Wed Apr 1 2009 Michael Schwendt - 0.5.752600-5 - Fix unowned examples directory in -devel pkg. From pkgdb at fedoraproject.org Mon May 4 20:39:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:39:08 +0000 Subject: [pkgdb] perl-MIME-EncWords was added for xavierb Message-ID: <20090504203909.113D410F8A2@bastion2.fedora.phx.redhat.com> kevin has added Package perl-MIME-EncWords with summary perl module to deal with RFC 2047 encoded words kevin has approved Package perl-MIME-EncWords kevin has added a Fedora devel branch for perl-MIME-EncWords with an owner of xavierb kevin has approved perl-MIME-EncWords in Fedora devel kevin has approved Package perl-MIME-EncWords kevin has set commit to Approved for provenpackager on perl-MIME-EncWords (Fedora devel) kevin has set build to Approved for provenpackager on perl-MIME-EncWords (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-MIME-EncWords (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-EncWords From pkgdb at fedoraproject.org Mon May 4 20:39:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:39:10 +0000 Subject: [pkgdb] perl-MIME-EncWords (Fedora, 10) updated by kevin Message-ID: <20090504203910.DF09910F8A7@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-MIME-EncWords kevin has set commit to Approved for provenpackager on perl-MIME-EncWords (Fedora 10) kevin has set build to Approved for provenpackager on perl-MIME-EncWords (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-MIME-EncWords (Fedora 10) kevin approved watchbugzilla on perl-MIME-EncWords (Fedora 10) for perl-sig kevin approved watchcommits on perl-MIME-EncWords (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-EncWords From pkgdb at fedoraproject.org Mon May 4 20:39:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:39:10 +0000 Subject: [pkgdb] perl-MIME-EncWords (Fedora, 11) updated by kevin Message-ID: <20090504203910.F15B910F8AE@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-MIME-EncWords kevin has set commit to Approved for provenpackager on perl-MIME-EncWords (Fedora 11) kevin has set build to Approved for provenpackager on perl-MIME-EncWords (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-MIME-EncWords (Fedora 11) kevin approved watchbugzilla on perl-MIME-EncWords (Fedora 11) for perl-sig kevin approved watchcommits on perl-MIME-EncWords (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-EncWords From pkgdb at fedoraproject.org Mon May 4 20:39:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:39:10 +0000 Subject: [pkgdb] perl-MIME-EncWords (Fedora, 9) updated by kevin Message-ID: <20090504203910.E58AA10F8AC@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-MIME-EncWords kevin has set commit to Approved for provenpackager on perl-MIME-EncWords (Fedora 9) kevin has set build to Approved for provenpackager on perl-MIME-EncWords (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-MIME-EncWords (Fedora 9) kevin approved watchbugzilla on perl-MIME-EncWords (Fedora 9) for perl-sig kevin approved watchcommits on perl-MIME-EncWords (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-EncWords From pkgdb at fedoraproject.org Mon May 4 20:39:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:39:10 +0000 Subject: [pkgdb] perl-MIME-EncWords (Fedora EPEL, 5) updated by kevin Message-ID: <20090504203911.14CFD10F8B0@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for perl-MIME-EncWords kevin has set commit to Approved for provenpackager on perl-MIME-EncWords (Fedora EPEL 5) kevin has set build to Approved for provenpackager on perl-MIME-EncWords (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on perl-MIME-EncWords (Fedora EPEL 5) kevin approved watchbugzilla on perl-MIME-EncWords (Fedora EPEL 5) for perl-sig kevin approved watchcommits on perl-MIME-EncWords (Fedora EPEL 5) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-EncWords From pkgdb at fedoraproject.org Mon May 4 20:39:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:39:10 +0000 Subject: [pkgdb] perl-MIME-EncWords (Fedora, devel) updated by kevin Message-ID: <20090504203911.21E8210F8B4@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-MIME-EncWords (Fedora devel) for perl-sig kevin approved watchcommits on perl-MIME-EncWords (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-EncWords From kevin at fedoraproject.org Mon May 4 20:39:21 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:39:21 +0000 (UTC) Subject: rpms/perl-MIME-EncWords - New directory Message-ID: <20090504203921.4C3B670131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-MIME-EncWords In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23606/rpms/perl-MIME-EncWords Log Message: Directory /cvs/pkgs/rpms/perl-MIME-EncWords added to the repository From kevin at fedoraproject.org Mon May 4 20:39:21 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:39:21 +0000 (UTC) Subject: rpms/perl-MIME-EncWords/devel - New directory Message-ID: <20090504203921.A8CEF70131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-MIME-EncWords/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23606/rpms/perl-MIME-EncWords/devel Log Message: Directory /cvs/pkgs/rpms/perl-MIME-EncWords/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:39:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:39:37 +0000 (UTC) Subject: rpms/perl-MIME-EncWords Makefile,NONE,1.1 Message-ID: <20090504203937.0C2CB70131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-MIME-EncWords In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23606/rpms/perl-MIME-EncWords Added Files: Makefile Log Message: Setup of module perl-MIME-EncWords --- NEW FILE Makefile --- # Top level Makefile for module perl-MIME-EncWords 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 kevin at fedoraproject.org Mon May 4 20:39:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:39:37 +0000 (UTC) Subject: rpms/perl-MIME-EncWords/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504203937.AA95370131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-MIME-EncWords/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23606/rpms/perl-MIME-EncWords/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-MIME-EncWords --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-MIME-EncWords # $Id: Makefile,v 1.1 2009/05/04 20:39:37 kevin Exp $ NAME := perl-MIME-EncWords 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 pkgdb at fedoraproject.org Mon May 4 20:40:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:40:04 +0000 Subject: [pkgdb] perl-Any-Moose was added for cweyl Message-ID: <20090504204004.6803E10F8AA@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Any-Moose with summary Use Moose or Mouse automagically kevin has approved Package perl-Any-Moose kevin has added a Fedora devel branch for perl-Any-Moose with an owner of cweyl kevin has approved perl-Any-Moose in Fedora devel kevin has approved Package perl-Any-Moose kevin has set commit to Approved for provenpackager on perl-Any-Moose (Fedora devel) kevin has set build to Approved for provenpackager on perl-Any-Moose (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Any-Moose (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Any-Moose From pkgdb at fedoraproject.org Mon May 4 20:40:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:40:06 +0000 Subject: [pkgdb] perl-Any-Moose (Fedora, 10) updated by kevin Message-ID: <20090504204007.24F1A10F8AD@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Any-Moose kevin has set commit to Approved for provenpackager on perl-Any-Moose (Fedora 10) kevin has set build to Approved for provenpackager on perl-Any-Moose (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Any-Moose (Fedora 10) kevin approved watchbugzilla on perl-Any-Moose (Fedora 10) for perl-sig kevin approved watchcommits on perl-Any-Moose (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Any-Moose From pkgdb at fedoraproject.org Mon May 4 20:40:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:40:06 +0000 Subject: [pkgdb] perl-Any-Moose (Fedora, 11) updated by kevin Message-ID: <20090504204007.3092210F8B2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Any-Moose kevin has set commit to Approved for provenpackager on perl-Any-Moose (Fedora 11) kevin has set build to Approved for provenpackager on perl-Any-Moose (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Any-Moose (Fedora 11) kevin approved watchbugzilla on perl-Any-Moose (Fedora 11) for perl-sig kevin approved watchcommits on perl-Any-Moose (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Any-Moose From pkgdb at fedoraproject.org Mon May 4 20:40:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:40:06 +0000 Subject: [pkgdb] perl-Any-Moose (Fedora, devel) updated by kevin Message-ID: <20090504204007.3A7D310F8BE@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Any-Moose (Fedora devel) for perl-sig kevin approved watchcommits on perl-Any-Moose (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Any-Moose From pkgdb at fedoraproject.org Mon May 4 20:40:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:40:06 +0000 Subject: [pkgdb] perl-Any-Moose (Fedora, 9) updated by kevin Message-ID: <20090504204007.4017210F8BF@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Any-Moose kevin has set commit to Approved for provenpackager on perl-Any-Moose (Fedora 9) kevin has set build to Approved for provenpackager on perl-Any-Moose (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Any-Moose (Fedora 9) kevin approved watchbugzilla on perl-Any-Moose (Fedora 9) for perl-sig kevin approved watchcommits on perl-Any-Moose (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Any-Moose From kevin at fedoraproject.org Mon May 4 20:40:16 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:40:16 +0000 (UTC) Subject: rpms/perl-Any-Moose - New directory Message-ID: <20090504204016.2ADE770131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Any-Moose In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd24407/rpms/perl-Any-Moose Log Message: Directory /cvs/pkgs/rpms/perl-Any-Moose added to the repository From kevin at fedoraproject.org Mon May 4 20:40:16 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:40:16 +0000 (UTC) Subject: rpms/perl-Any-Moose/devel - New directory Message-ID: <20090504204016.7B8C670131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Any-Moose/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd24407/rpms/perl-Any-Moose/devel Log Message: Directory /cvs/pkgs/rpms/perl-Any-Moose/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:40:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:40:29 +0000 (UTC) Subject: rpms/perl-Any-Moose/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504204029.6761B700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Any-Moose/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd24407/rpms/perl-Any-Moose/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Any-Moose --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Any-Moose # $Id: Makefile,v 1.1 2009/05/04 20:40:29 kevin Exp $ NAME := perl-Any-Moose 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 kevin at fedoraproject.org Mon May 4 20:40:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:40:29 +0000 (UTC) Subject: rpms/perl-Any-Moose Makefile,NONE,1.1 Message-ID: <20090504204029.0D036700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Any-Moose In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd24407/rpms/perl-Any-Moose Added Files: Makefile Log Message: Setup of module perl-Any-Moose --- NEW FILE Makefile --- # Top level Makefile for module perl-Any-Moose 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 pkgdb at fedoraproject.org Mon May 4 20:42:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:42:09 +0000 Subject: [pkgdb] hunspell-so was added for caolanm Message-ID: <20090504204209.E905710F89C@bastion2.fedora.phx.redhat.com> kevin has added Package hunspell-so with summary Somali hunspell dictionaries kevin has approved Package hunspell-so kevin has added a Fedora devel branch for hunspell-so with an owner of caolanm kevin has approved hunspell-so in Fedora devel kevin has approved Package hunspell-so kevin has set commit to Approved for provenpackager on hunspell-so (Fedora devel) kevin has set build to Approved for provenpackager on hunspell-so (Fedora devel) kevin has set checkout to Approved for provenpackager on hunspell-so (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-so From kevin at fedoraproject.org Mon May 4 20:42:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:42:22 +0000 (UTC) Subject: rpms/hunspell-so - New directory Message-ID: <20090504204222.54052700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/hunspell-so In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25424/rpms/hunspell-so Log Message: Directory /cvs/pkgs/rpms/hunspell-so added to the repository From kevin at fedoraproject.org Mon May 4 20:42:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:42:22 +0000 (UTC) Subject: rpms/hunspell-so/devel - New directory Message-ID: <20090504204222.A7304700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/hunspell-so/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25424/rpms/hunspell-so/devel Log Message: Directory /cvs/pkgs/rpms/hunspell-so/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:42:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:42:34 +0000 (UTC) Subject: rpms/hunspell-so Makefile,NONE,1.1 Message-ID: <20090504204234.88879700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/hunspell-so In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25424/rpms/hunspell-so Added Files: Makefile Log Message: Setup of module hunspell-so --- NEW FILE Makefile --- # Top level Makefile for module hunspell-so 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 kevin at fedoraproject.org Mon May 4 20:42:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:42:34 +0000 (UTC) Subject: rpms/hunspell-so/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504204234.D8DE9700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/hunspell-so/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25424/rpms/hunspell-so/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-so --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: hunspell-so # $Id: Makefile,v 1.1 2009/05/04 20:42:34 kevin Exp $ NAME := hunspell-so 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 pkgdb at fedoraproject.org Mon May 4 20:43:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:43:27 +0000 Subject: [pkgdb] clthreads was added for oget Message-ID: <20090504204327.2CC7510F893@bastion2.fedora.phx.redhat.com> kevin has added Package clthreads with summary POSIX threads C++ access library kevin has approved Package clthreads kevin has added a Fedora devel branch for clthreads with an owner of oget kevin has approved clthreads in Fedora devel kevin has approved Package clthreads kevin has set commit to Approved for provenpackager on clthreads (Fedora devel) kevin has set build to Approved for provenpackager on clthreads (Fedora devel) kevin has set checkout to Approved for provenpackager on clthreads (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clthreads From pkgdb at fedoraproject.org Mon May 4 20:43:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:43:29 +0000 Subject: [pkgdb] clthreads (Fedora, devel) updated by kevin Message-ID: <20090504204329.E19B810F89F@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on clthreads (Fedora devel) for nando kevin approved watchcommits on clthreads (Fedora devel) for nando kevin approved commit on clthreads (Fedora devel) for nando kevin approved build on clthreads (Fedora devel) for nando kevin approved approveacls on clthreads (Fedora devel) for nando To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clthreads From pkgdb at fedoraproject.org Mon May 4 20:43:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:43:29 +0000 Subject: [pkgdb] clthreads (Fedora, 10) updated by kevin Message-ID: <20090504204329.E8D8910F8A3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for clthreads kevin has set commit to Approved for provenpackager on clthreads (Fedora 10) kevin has set build to Approved for provenpackager on clthreads (Fedora 10) kevin has set checkout to Approved for provenpackager on clthreads (Fedora 10) kevin approved watchbugzilla on clthreads (Fedora 10) for nando kevin approved watchcommits on clthreads (Fedora 10) for nando kevin approved commit on clthreads (Fedora 10) for nando kevin approved build on clthreads (Fedora 10) for nando kevin approved approveacls on clthreads (Fedora 10) for nando To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clthreads From pkgdb at fedoraproject.org Mon May 4 20:43:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:43:29 +0000 Subject: [pkgdb] clthreads (Fedora, 9) updated by kevin Message-ID: <20090504204330.0152010F8A7@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for clthreads kevin has set commit to Approved for provenpackager on clthreads (Fedora 9) kevin has set build to Approved for provenpackager on clthreads (Fedora 9) kevin has set checkout to Approved for provenpackager on clthreads (Fedora 9) kevin approved watchbugzilla on clthreads (Fedora 9) for nando kevin approved watchcommits on clthreads (Fedora 9) for nando kevin approved commit on clthreads (Fedora 9) for nando kevin approved build on clthreads (Fedora 9) for nando kevin approved approveacls on clthreads (Fedora 9) for nando To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clthreads From kevin at fedoraproject.org Mon May 4 20:43:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:43:39 +0000 (UTC) Subject: rpms/clthreads - New directory Message-ID: <20090504204339.39292700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/clthreads In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD25738/rpms/clthreads Log Message: Directory /cvs/pkgs/rpms/clthreads added to the repository From kevin at fedoraproject.org Mon May 4 20:43:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:43:39 +0000 (UTC) Subject: rpms/clthreads/devel - New directory Message-ID: <20090504204339.86513700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/clthreads/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD25738/rpms/clthreads/devel Log Message: Directory /cvs/pkgs/rpms/clthreads/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:43:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:43:51 +0000 (UTC) Subject: rpms/clthreads Makefile,NONE,1.1 Message-ID: <20090504204351.966BA700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/clthreads In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD25738/rpms/clthreads Added Files: Makefile Log Message: Setup of module clthreads --- NEW FILE Makefile --- # Top level Makefile for module clthreads 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 kevin at fedoraproject.org Mon May 4 20:43:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:43:52 +0000 (UTC) Subject: rpms/clthreads/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504204352.39B62700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/clthreads/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD25738/rpms/clthreads/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module clthreads --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: clthreads # $Id: Makefile,v 1.1 2009/05/04 20:43:51 kevin Exp $ NAME := clthreads 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 pkgdb at fedoraproject.org Mon May 4 20:43:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:43:29 +0000 Subject: [pkgdb] clthreads (Fedora, 11) updated by kevin Message-ID: <20090504204330.0F37510F8AB@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for clthreads kevin has set commit to Approved for provenpackager on clthreads (Fedora 11) kevin has set build to Approved for provenpackager on clthreads (Fedora 11) kevin has set checkout to Approved for provenpackager on clthreads (Fedora 11) kevin approved watchbugzilla on clthreads (Fedora 11) for nando kevin approved watchcommits on clthreads (Fedora 11) for nando kevin approved commit on clthreads (Fedora 11) for nando kevin approved build on clthreads (Fedora 11) for nando kevin approved approveacls on clthreads (Fedora 11) for nando To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clthreads From pkgdb at fedoraproject.org Mon May 4 20:47:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:47:08 +0000 Subject: [pkgdb] perl-Data-FormValidator-Constraints-DateTime was added for iarnell Message-ID: <20090504204708.C5EF910F89C@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Data-FormValidator-Constraints-DateTime with summary D::FV constraints for dates and times kevin has approved Package perl-Data-FormValidator-Constraints-DateTime kevin has added a Fedora devel branch for perl-Data-FormValidator-Constraints-DateTime with an owner of iarnell kevin has approved perl-Data-FormValidator-Constraints-DateTime in Fedora devel kevin has approved Package perl-Data-FormValidator-Constraints-DateTime kevin has set commit to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora devel) kevin has set build to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-FormValidator-Constraints-DateTime From pkgdb at fedoraproject.org Mon May 4 20:47:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:47:10 +0000 Subject: [pkgdb] perl-Data-FormValidator-Constraints-DateTime (Fedora, 10) updated by kevin Message-ID: <20090504204710.6F69910F89F@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Data-FormValidator-Constraints-DateTime kevin has set commit to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora 10) kevin has set build to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora 10) kevin approved watchbugzilla on perl-Data-FormValidator-Constraints-DateTime (Fedora 10) for perl-sig kevin approved watchcommits on perl-Data-FormValidator-Constraints-DateTime (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-FormValidator-Constraints-DateTime From pkgdb at fedoraproject.org Mon May 4 20:47:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:47:10 +0000 Subject: [pkgdb] perl-Data-FormValidator-Constraints-DateTime (Fedora, devel) updated by kevin Message-ID: <20090504204710.771E010F8A3@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Data-FormValidator-Constraints-DateTime (Fedora devel) for perl-sig kevin approved watchcommits on perl-Data-FormValidator-Constraints-DateTime (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-FormValidator-Constraints-DateTime From kevin at fedoraproject.org Mon May 4 20:47:21 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:47:21 +0000 (UTC) Subject: rpms/perl-Data-FormValidator-Constraints-DateTime - New directory Message-ID: <20090504204721.571BC700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK26533/rpms/perl-Data-FormValidator-Constraints-DateTime Log Message: Directory /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime added to the repository From kevin at fedoraproject.org Mon May 4 20:47:21 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:47:21 +0000 (UTC) Subject: rpms/perl-Data-FormValidator-Constraints-DateTime/devel - New directory Message-ID: <20090504204721.B89D2700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK26533/rpms/perl-Data-FormValidator-Constraints-DateTime/devel Log Message: Directory /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:47:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:47:35 +0000 (UTC) Subject: rpms/perl-Data-FormValidator-Constraints-DateTime Makefile, NONE, 1.1 Message-ID: <20090504204735.0822C700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK26533/rpms/perl-Data-FormValidator-Constraints-DateTime Added Files: Makefile Log Message: Setup of module perl-Data-FormValidator-Constraints-DateTime --- NEW FILE Makefile --- # Top level Makefile for module perl-Data-FormValidator-Constraints-DateTime 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 pkgdb at fedoraproject.org Mon May 4 20:47:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:47:10 +0000 Subject: [pkgdb] perl-Data-FormValidator-Constraints-DateTime (Fedora, 11) updated by kevin Message-ID: <20090504204710.7FCA510F8A6@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Data-FormValidator-Constraints-DateTime kevin has set commit to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora 11) kevin has set build to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Data-FormValidator-Constraints-DateTime (Fedora 11) kevin approved watchbugzilla on perl-Data-FormValidator-Constraints-DateTime (Fedora 11) for perl-sig kevin approved watchcommits on perl-Data-FormValidator-Constraints-DateTime (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-FormValidator-Constraints-DateTime From kevin at fedoraproject.org Mon May 4 20:47:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:47:35 +0000 (UTC) Subject: rpms/perl-Data-FormValidator-Constraints-DateTime/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504204735.B3A48700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK26533/rpms/perl-Data-FormValidator-Constraints-DateTime/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Data-FormValidator-Constraints-DateTime --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Data-FormValidator-Constraints-DateTime # $Id: Makefile,v 1.1 2009/05/04 20:47:35 kevin Exp $ NAME := perl-Data-FormValidator-Constraints-DateTime 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 pkgdb at fedoraproject.org Mon May 4 20:48:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:48:48 +0000 Subject: [pkgdb] perl-Class-Mix was added for iarnell Message-ID: <20090504204848.CCEF910F893@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Class-Mix with summary Dynamic class mixing kevin has approved Package perl-Class-Mix kevin has added a Fedora devel branch for perl-Class-Mix with an owner of iarnell kevin has approved perl-Class-Mix in Fedora devel kevin has approved Package perl-Class-Mix kevin has set commit to Approved for provenpackager on perl-Class-Mix (Fedora devel) kevin has set build to Approved for provenpackager on perl-Class-Mix (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Class-Mix (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Mix From pkgdb at fedoraproject.org Mon May 4 20:48:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:48:49 +0000 Subject: [pkgdb] perl-Class-Mix (Fedora, 10) updated by kevin Message-ID: <20090504204850.024BF10F89E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Class-Mix kevin has set commit to Approved for provenpackager on perl-Class-Mix (Fedora 10) kevin has set build to Approved for provenpackager on perl-Class-Mix (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Class-Mix (Fedora 10) kevin approved watchbugzilla on perl-Class-Mix (Fedora 10) for perl-sig kevin approved watchcommits on perl-Class-Mix (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Mix From pkgdb at fedoraproject.org Mon May 4 20:48:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:48:49 +0000 Subject: [pkgdb] perl-Class-Mix (Fedora, devel) updated by kevin Message-ID: <20090504204850.0AFAA10F8A2@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Class-Mix (Fedora devel) for perl-sig kevin approved watchcommits on perl-Class-Mix (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Mix From pkgdb at fedoraproject.org Mon May 4 20:48:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:48:49 +0000 Subject: [pkgdb] perl-Class-Mix (Fedora, 11) updated by kevin Message-ID: <20090504204850.1510A10F8A5@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Class-Mix kevin has set commit to Approved for provenpackager on perl-Class-Mix (Fedora 11) kevin has set build to Approved for provenpackager on perl-Class-Mix (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Class-Mix (Fedora 11) kevin approved watchbugzilla on perl-Class-Mix (Fedora 11) for perl-sig kevin approved watchcommits on perl-Class-Mix (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Mix From kevin at fedoraproject.org Mon May 4 20:49:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:49:05 +0000 (UTC) Subject: rpms/perl-Class-Mix - New directory Message-ID: <20090504204905.3C8F4700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Class-Mix In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB27041/rpms/perl-Class-Mix Log Message: Directory /cvs/pkgs/rpms/perl-Class-Mix added to the repository From kevin at fedoraproject.org Mon May 4 20:49:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:49:05 +0000 (UTC) Subject: rpms/perl-Class-Mix/devel - New directory Message-ID: <20090504204905.8CF67700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Class-Mix/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB27041/rpms/perl-Class-Mix/devel Log Message: Directory /cvs/pkgs/rpms/perl-Class-Mix/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:49:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:49:18 +0000 (UTC) Subject: rpms/perl-Class-Mix Makefile,NONE,1.1 Message-ID: <20090504204918.65B29700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Class-Mix In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB27041/rpms/perl-Class-Mix Added Files: Makefile Log Message: Setup of module perl-Class-Mix --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-Mix 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 kevin at fedoraproject.org Mon May 4 20:49:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:49:18 +0000 (UTC) Subject: rpms/perl-Class-Mix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504204918.D85A8700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Class-Mix/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB27041/rpms/perl-Class-Mix/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-Mix --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Class-Mix # $Id: Makefile,v 1.1 2009/05/04 20:49:18 kevin Exp $ NAME := perl-Class-Mix 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 pkgdb at fedoraproject.org Mon May 4 20:49:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:49:43 +0000 Subject: [pkgdb] perl-Module-Pluggable-Ordered was added for iarnell Message-ID: <20090504204943.278CF10F89E@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Module-Pluggable-Ordered with summary Call module plugins in a specified order kevin has approved Package perl-Module-Pluggable-Ordered kevin has added a Fedora devel branch for perl-Module-Pluggable-Ordered with an owner of iarnell kevin has approved perl-Module-Pluggable-Ordered in Fedora devel kevin has approved Package perl-Module-Pluggable-Ordered kevin has set commit to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora devel) kevin has set build to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Pluggable-Ordered From pkgdb at fedoraproject.org Mon May 4 20:49:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:49:44 +0000 Subject: [pkgdb] perl-Module-Pluggable-Ordered (Fedora, 10) updated by kevin Message-ID: <20090504204944.6662710F8A8@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Module-Pluggable-Ordered kevin has set commit to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora 10) kevin has set build to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora 10) kevin approved watchbugzilla on perl-Module-Pluggable-Ordered (Fedora 10) for perl-sig kevin approved watchcommits on perl-Module-Pluggable-Ordered (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Pluggable-Ordered From pkgdb at fedoraproject.org Mon May 4 20:49:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:49:44 +0000 Subject: [pkgdb] perl-Module-Pluggable-Ordered (Fedora, devel) updated by kevin Message-ID: <20090504204944.6FF9010F8B0@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Module-Pluggable-Ordered (Fedora devel) for perl-sig kevin approved watchcommits on perl-Module-Pluggable-Ordered (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Pluggable-Ordered From pkgdb at fedoraproject.org Mon May 4 20:49:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:49:44 +0000 Subject: [pkgdb] perl-Module-Pluggable-Ordered (Fedora, 11) updated by kevin Message-ID: <20090504204944.7B49E10F8B7@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Module-Pluggable-Ordered kevin has set commit to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora 11) kevin has set build to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Module-Pluggable-Ordered (Fedora 11) kevin approved watchbugzilla on perl-Module-Pluggable-Ordered (Fedora 11) for perl-sig kevin approved watchcommits on perl-Module-Pluggable-Ordered (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Pluggable-Ordered From kevin at fedoraproject.org Mon May 4 20:49:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:49:55 +0000 (UTC) Subject: rpms/perl-Module-Pluggable-Ordered - New directory Message-ID: <20090504204955.3EE67700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC27397/rpms/perl-Module-Pluggable-Ordered Log Message: Directory /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered added to the repository From kevin at fedoraproject.org Mon May 4 20:49:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:49:55 +0000 (UTC) Subject: rpms/perl-Module-Pluggable-Ordered/devel - New directory Message-ID: <20090504204955.8A70B700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC27397/rpms/perl-Module-Pluggable-Ordered/devel Log Message: Directory /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:50:07 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:50:07 +0000 (UTC) Subject: rpms/perl-Module-Pluggable-Ordered Makefile,NONE,1.1 Message-ID: <20090504205007.D5DED700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC27397/rpms/perl-Module-Pluggable-Ordered Added Files: Makefile Log Message: Setup of module perl-Module-Pluggable-Ordered --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-Pluggable-Ordered 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 kevin at fedoraproject.org Mon May 4 20:50:08 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:50:08 +0000 (UTC) Subject: rpms/perl-Module-Pluggable-Ordered/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504205008.3C8E9700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC27397/rpms/perl-Module-Pluggable-Ordered/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-Pluggable-Ordered --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Module-Pluggable-Ordered # $Id: Makefile,v 1.1 2009/05/04 20:50:08 kevin Exp $ NAME := perl-Module-Pluggable-Ordered 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 orion at fedoraproject.org Mon May 4 20:51:12 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Mon, 4 May 2009 20:51:12 +0000 (UTC) Subject: rpms/plplot/F-11 import.log, NONE, 1.1 plplot-5.9.3-multiarch.patch, NONE, 1.1 plplot-5.9.3-soversion.patch, NONE, 1.1 plplot-5.9.3-test.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 plplot.spec, 1.72, 1.73 sources, 1.15, 1.16 plplot-5.9.1-multiarch.patch, 1.1, NONE plplot-5.9.1-octave.patch, 1.1, NONE plplot-5.9.2-f77.patch, 1.1, NONE plplot-5.9.2-gnat-4.4.patch, 1.1, NONE plplot-5.9.2-test.patch, 1.2, NONE Message-ID: <20090504205113.00114700DB@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/plplot/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27962/F-11 Modified Files: .cvsignore plplot.spec sources Added Files: import.log plplot-5.9.3-multiarch.patch plplot-5.9.3-soversion.patch plplot-5.9.3-test.patch Removed Files: plplot-5.9.1-multiarch.patch plplot-5.9.1-octave.patch plplot-5.9.2-f77.patch plplot-5.9.2-gnat-4.4.patch plplot-5.9.2-test.patch Log Message: Sync to 5.9.3 from devel --- NEW FILE import.log --- plplot-5_9_3-1_fc12:F-11:plplot-5.9.3-1.fc12.src.rpm:1241470222 plplot-5.9.3-multiarch.patch: --- NEW FILE plplot-5.9.3-multiarch.patch --- --- plplot-5.9.2/examples/c/Makefile.examples.in.multiarch 2009-04-29 15:41:24.000000000 -0600 +++ plplot-5.9.2/examples/c/Makefile.examples.in 2009-04-29 15:45:54.000000000 -0600 @@ -25,8 +25,6 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ @gcw_true at PLPLOTCANVAS_EXECUTABLES_list = \ @gcw_true@ plplotcanvas_demo$(EXEEXT) \ @@ -80,29 +78,29 @@ rm -f $(EXECUTABLES_list) @gcw_true at plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c - at gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \ - at gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` + at gcw_true@@pkg_config_true@ $(CC) $< -o $@ \ + at gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` @gcw_true@@pkg_config_false@ $(CC) $< -o $@ \ @gcw_true@@pkg_config_false@ `plplot-config --cflags --libs --with-gcw` @gcw_true at plplotcanvas_animation$(EXEEXT): plplotcanvas_animation.c - at gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \ - at gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \ + at gcw_true@@pkg_config_true@ $(CC) $< -o $@ \ + at gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \ @gcw_true@@pkg_config_true@ `pkg-config --cflags --libs gthread-2.0` @gcw_true@@pkg_config_false@ $(CC) $< -o \ @gcw_true@@pkg_config_false@ $@ `plplot-config --cflags --libs --with-gcw` \ @gcw_true@@pkg_config_false@ @GCWTHREAD_CFLAGS@ @GCWTHREAD_LIBS@ @extXdrawable_true@@pkg_config_true at extXdrawable_demo$(EXEEXT): extXdrawable_demo.c - at extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \ - at extXdrawable_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0` + at extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ \ + at extXdrawable_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0` @extcairo_true@@pkg_config_true at ext-cairo-test$(EXEEXT): ext-cairo-test.c - at extcairo_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \ - at extcairo_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG) cairo` + at extcairo_true@@pkg_config_true@ $(CC) $< -o $@ \ + at extcairo_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG) cairo` .c$(EXEEXT): - at pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)` + at pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)` @pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs` .SUFFIXES: .c $(EXEEXT) --- plplot-5.9.2/examples/c++/Makefile.examples.in.multiarch 2009-04-29 15:41:25.000000000 -0600 +++ plplot-5.9.2/examples/c++/Makefile.examples.in 2009-04-29 15:46:49.000000000 -0600 @@ -25,10 +25,7 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ @qt_gui_true at QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ - at qt_gui_true@@pkg_config_true at qt_RPATHCMD = @qt_RPATHCMD@ @wxwidgets_true@@pkg_config_true at PLPLOTWXWIDGETS_EXECUTABLES_list = \ @wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT) @@ -79,16 +76,16 @@ rm -f $(EXECUTABLES_list) @wxwidgets_true@@pkg_config_true at wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp - at wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets` + at wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets` @qt_gui_true@@pkg_config_true at moc_qt_PlotWindow.cpp: qt_PlotWindow.h @qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config --cflags plplot$(LIB_TAG)-qt` $< -o $@ @qt_gui_true@@pkg_config_true at qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp - at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-qt` + at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-qt` .cc$(EXEEXT): - at pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++` + at pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-c++` @pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++` .SUFFIXES: .cc $(EXEEXT) --- plplot-5.9.2/examples/f77/Makefile.examples.in.multiarch 2009-01-18 13:24:12.000000000 -0700 +++ plplot-5.9.2/examples/f77/Makefile.examples.in 2009-04-29 15:41:41.000000000 -0600 @@ -25,8 +25,6 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ EXECUTABLES_list = \ x01f$(EXEEXT) \ @@ -69,7 +67,7 @@ rm -f $(EXECUTABLES_list) .f$(EXEEXT): - at pkg_config_true@ $(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f77` + at pkg_config_true@ $(F77) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f77` @pkg_config_false@ $(F77) $< -o $@ `plplot-config --cflags --libs --with-f77` .SUFFIXES: .f $(EXEEXT) --- plplot-5.9.2/examples/f95/Makefile.examples.in.multiarch 2009-01-18 13:24:12.000000000 -0700 +++ plplot-5.9.2/examples/f95/Makefile.examples.in 2009-04-29 15:41:40.000000000 -0600 @@ -25,8 +25,6 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ EXECUTABLES_list = \ x01f$(EXEEXT) \ @@ -68,7 +66,7 @@ rm -f $(EXECUTABLES_list) .f90$(EXEEXT): - at pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f95` + at pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f95` @pkg_config_false@ $(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95` .SUFFIXES: .f90 $(EXEEXT) --- plplot-5.9.2/examples/tk/Makefile.examples.in.multiarch 2009-04-29 15:41:30.000000000 -0600 +++ plplot-5.9.2/examples/tk/Makefile.examples.in 2009-04-29 15:43:55.000000000 -0600 @@ -24,8 +24,6 @@ EXEEXT = @EXEEXT@ @pkg_config_true at LIB_TAG = @LIB_TAG@ - at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - at pkg_config_true@RPATHCMD = @RPATHCMD@ EXECUTABLES_list = xtk01$(EXEEXT) # Second and fourth examples depend on itk. @@ -37,7 +35,7 @@ rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list) .c$(EXEEXT): - at pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-tcl` + at pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-tcl` @pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl` .SUFFIXES: .c $(EXEEXT) plplot-5.9.3-soversion.patch: --- NEW FILE plplot-5.9.3-soversion.patch --- --- plplot-5.9.3/cmake/modules/plplot_version.cmake.soversion 2009-04-28 14:49:37.000000000 -0600 +++ plplot-5.9.3/cmake/modules/plplot_version.cmake 2009-05-04 11:42:42.000000000 -0600 @@ -28,7 +28,7 @@ # library version numbers the same for the release. set(nistcd_SOVERSION 0) -set(nistcd_VERSION ${nist_SOVERSION}.0.1) +set(nistcd_VERSION ${nistcd_SOVERSION}.0.1) set(csirocsa_SOVERSION 0) set(csirocsa_VERSION ${csirocsa_SOVERSION}.0.1) plplot-5.9.3-test.patch: --- NEW FILE plplot-5.9.3-test.patch --- --- plplot-5.9.2/plplot_test/plplot-test.sh.cmake.test 2009-04-29 15:57:13.000000000 -0600 +++ plplot-5.9.2/plplot_test/plplot-test.sh.cmake 2009-04-29 16:03:50.000000000 -0600 @@ -34,8 +34,9 @@ version=@VERSION@ -EXAMPLES_DIR=${EXAMPLES_DIR:-.} -SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.} +EXE_DIR=`dirname $0` +EXAMPLES_DIR=${EXAMPLES_DIR:=$EXE_DIR} +SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:=$EXE_DIR} OUTPUT_DIR=${OUTPUT_DIR:-.} device=${DEVICE:-psc} export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD @@ -145,18 +146,6 @@ shift done -# This script is only designed to work when EXAMPLES_DIR is a directory -# with a subdirectory called "c". Check whether this conditions is true. - -if [ ! -d $EXAMPLES_DIR/c ] ; then -echo ' -This script is only designed to work when the EXAMPLES_DIR environment -variable (overridden by option --examples-dir) is a directory with a -subdirectory called "c". This condition has been violated. -' -exit 1 -fi - # These variables set by default assuming you are going to run this # script from the installed demos directory $prefix/lib/plplot$version/examples. cdir=$EXAMPLES_DIR/c @@ -292,21 +281,18 @@ dsuffix=$device export dsuffix options -# Find out what front-ends have been configured +# Find out what front-ends have been configured and installed if [ -z "$FRONT_END" ] ; then - FRONT_END=c - test "@ENABLE_cxx@" = "ON" && FRONT_END="$FRONT_END cxx" - test "@ENABLE_f77@" = "ON" && FRONT_END="$FRONT_END f77" - test "@ENABLE_f95@" = "ON" && FRONT_END="$FRONT_END f95" - test "@ENABLE_java@" = "ON" && FRONT_END="$FRONT_END java" - test "@ENABLE_octave@" = "ON" && FRONT_END="$FRONT_END octave" - test "@ENABLE_python@" = "ON" && FRONT_END="$FRONT_END python" - test "@ENABLE_tcl@" = "ON" && FRONT_END="$FRONT_END tcl" - test "@ENABLE_pdl@" = "ON" && FRONT_END="$FRONT_END perl" - test "@ENABLE_ada@" = "ON" && FRONT_END="$FRONT_END ada" - test "@ENABLE_ocaml@" = "ON" && FRONT_END="$FRONT_END ocaml" - test "@ENABLE_lua@" = "ON" && FRONT_END="$FRONT_END lua" - test "@ENABLE_d@" = "ON" && FRONT_END="$FRONT_END d" + for front_end_status in c:@ENABLE_c@ cxx:@ENABLE_cxx@ f77:@ENABLE_f77@ \ + f95:@ENABLE_f95@ java:@ENABLE_java@ \ + octave:@ENABLE_octave@ python:@ENABLE_python@ \ + tcl:@ENABLE_tcl@ perl:@ENABLE_pdl@ \ + ada:@ENABLE_ada@ ocaml:@ENABLE_ocaml@ \ + lua:@ENABLE_lua@ d:@ENABLE_d@ + do + front_end=${front_end_status/:ON/} + [ $front_end != $front_end_status ] && [ -d $EXAMPLES_DIR/$front_end ] && FRONT_END="$FRONT_END $front_end" + done fi # Find where the front-end scripts are by looking at the directory name of the @@ -332,9 +318,6 @@ for i in $FRONT_END ; do echo "Testing front-end $i" script=$scripts_dir/test_$i.sh - if [ "@WIN32@" != "1" ] ; then - chmod +x $script - fi @SH_EXECUTABLE@ $script || status=1 done Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/plplot/F-11/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- .cvsignore 30 Jan 2009 16:50:01 -0000 1.15 +++ .cvsignore 4 May 2009 20:50:41 -0000 1.16 @@ -1 +1 @@ -plplot-5.9.2.tar.gz +plplot-5.9.3.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/pkgs/rpms/plplot/F-11/plplot.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -p -r1.72 -r1.73 --- plplot.spec 27 Mar 2009 21:17:59 -0000 1.72 +++ plplot.spec 4 May 2009 20:50:42 -0000 1.73 @@ -9,19 +9,18 @@ %bcond_without pdl Name: plplot -Version: 5.9.2 -Release: 4%{?dist} +Version: 5.9.3 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering License: LGPLv2+ URL: http://plplot.sourceforge.net/ Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz -Patch1: plplot-5.9.1-multiarch.patch +Patch1: plplot-5.9.3-multiarch.patch Patch2: plplot-5.9.2-info.patch -Patch3: plplot-5.9.2-gnat-4.4.patch -Patch4: plplot-5.9.2-f77.patch -Patch5: plplot-5.9.2-test.patch +Patch3: plplot-5.9.3-soversion.patch +Patch5: plplot-5.9.3-test.patch Patch6: plplot-5.7.3-jni.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,14 +54,17 @@ BuildRequires: svgalib-devel %if %{with doc} BuildRequires: texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl %endif +%ifnarch sparc64 s390 s390x BuildRequires: ocaml, ocaml-findlib, ocaml-camlidl-devel -Requires(post): /sbin/ldconfig +%endif +BuildRequires: lua-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: gnu-free-mono-fonts Requires: gnu-free-sans-fonts Requires: gnu-free-serif-fonts Requires: numpy +Obsoletes: %{name}-gnome <= %{version}-%{release} %description @@ -93,6 +95,7 @@ the png and jpeg drivers that uses the F %package libs Summary: Libraries for PLplot Group: Development/Libraries +Requires(post): /sbin/ldconfig %description libs %{summary}. @@ -131,27 +134,6 @@ Requires: gcc-gnat %{summary}. -%package gnome -Summary: Functions for scientific plotting with GNOME -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description gnome -%{summary}. - -%package gnome-devel -Summary: Development files for using PLplot GNOME -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Requires: %{name}-gnome = %{version}-%{release} -Requires: pkgconfig -Requires: libgnomecanvas-devel, libgnomeprintui22-devel - -%description gnome-devel -%{summary}. - - %package java Summary: Functions for scientific plotting with Java Group: Development/Libraries @@ -172,6 +154,17 @@ Requires: %{name}-java = %{version %{summary}. +%package lua +Summary: Functions for scientific plotting with Lua +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: lua + +%description lua +%{summary}. + + +%ifnarch sparc64 s390 s390x %package ocaml Summary: Functions for scientific plotting with OCaml Group: Development/Libraries @@ -193,6 +186,7 @@ Provides: ocaml-plplot-devel = %{v %description ocaml-devel %{summary}. +%endif %if %{with octave} @@ -261,11 +255,17 @@ Requires: pkgconfig %prep %setup -q %patch1 -p1 -b .multiarch -%patch2 -p1 -b .orig -%patch3 -p1 -b .gnat-4.4 -%patch4 -p1 -b .f77 +%patch2 -p1 -b .info +%patch3 -p1 -b .soversion %patch5 -p1 -b .test %patch6 -p1 -b .jni +# Convert to UTF-8 +for file in ChangeLog NEWS +do + iconv -f ISO-8859-1 -t UTF-8 $file > ${file}.tmp + touch -r $file ${file}.tmp + mv ${file}.tmp $file +done %build @@ -278,17 +278,18 @@ export FFLAGS="$RPM_OPT_FLAGS" unset TERM %cmake .. \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ - -DCMAKE_INSTALL_RPATH:PATH="" \ + -DUSE_RPATH:BOOL=OFF \ -DENABLE_ada:BOOL=ON \ -DHAVE_ADA_2007:BOOL=ON \ -DENABLE_d:BOOL=ON \ -DENABLE_itcl:BOOL=ON \ -DENABLE_itk:BOOL=ON \ + -DENABLE_lua:BOOL=ON \ + -DHAVE_lua51:BOOL=ON \ -DENABLE_ocaml:BOOL=ON \ -DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \ %{build_octave} \ -DENABLE_pdl:BOOL=ON \ - -DENABLE_pygcw:BOOL=ON \ -DENABLE_tk:BOOL=ON \ -DHAVE_PTHREAD:BOOL=ON \ -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \ @@ -355,7 +356,6 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig /sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || : %preun @@ -363,26 +363,23 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || : fi -%postun -p /sbin/ldconfig - -%post ada -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig +%post ada -p /sbin/ldconfig %postun ada -p /sbin/ldconfig -%post gnome -p /sbin/ldconfig - -%postun gnome -p /sbin/ldconfig - %if %{with octave} -%post octave -p /sbin/ldconfig - +%post octave -p /sbin/ldconfig %postun octave -p /sbin/ldconfig %endif -%post tk -p /sbin/ldconfig - +%post tk -p /sbin/ldconfig %postun tk -p /sbin/ldconfig +%post wxGTK -p /sbin/ldconfig +%postun wxGTK -p /sbin/ldconfig + %files %defattr(-,root,root,-) @@ -395,7 +392,6 @@ fi %{python_sitearch}/plplot.py* %{python_sitearch}/plplot_widgetmodule.so %{python_sitearch}/plplotc.py* -%{python_sitearch}/plplotcanvas.py* %{_infodir}/plplotdoc.info* %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz @@ -414,20 +410,22 @@ fi %defattr(-,root,root,-) %{_libdir}/libcsirocsa.so.* %{_libdir}/libcsironn.so.* +%{_libdir}/libnistcd.so.* %{_libdir}/libplplotcxxd.so.* %{_libdir}/libplplotd.so.* %{_libdir}/libplplotf77cd.so.* %{_libdir}/libplplotf77d.so.* %{_libdir}/libplplotf95cd.so.* %{_libdir}/libplplotf95d.so.* +%{_libdir}/libqsastime.so.* %dir %{_libdir}/plplot%{version} %dir %{_libdir}/plplot%{version}/driversd %{_libdir}/plplot%{version}/driversd/cairo.rc %{_libdir}/plplot%{version}/driversd/cairo.so +%{_libdir}/plplot%{version}/driversd/cgm.rc +%{_libdir}/plplot%{version}/driversd/cgm.so %{_libdir}/plplot%{version}/driversd/dg300.rc %{_libdir}/plplot%{version}/driversd/dg300.so -%{_libdir}/plplot%{version}/driversd/gd.rc -%{_libdir}/plplot%{version}/driversd/gd.so %{_libdir}/plplot%{version}/driversd/hpgl.rc %{_libdir}/plplot%{version}/driversd/hpgl.so %{_libdir}/plplot%{version}/driversd/impress.rc @@ -469,12 +467,14 @@ fi %{_includedir}/plplot/ %{_libdir}/libcsirocsa.so %{_libdir}/libcsironn.so +%{_libdir}/libnistcd.so %{_libdir}/libplplotcxxd.so %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so %{_libdir}/libplplotf95cd.so %{_libdir}/libplplotf95d.so +%{_libdir}/libqsastime.so %{_libdir}/fortran/ %{_libdir}/pkgconfig/plplotd.pc %{_libdir}/pkgconfig/plplotd-c++.pc @@ -483,7 +483,6 @@ fi %{_datadir}/plplot%{version}/examples/lena.pgm %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ -%{_datadir}/plplot%{version}/examples/d/ %{_datadir}/plplot%{version}/examples/f77/ %{_datadir}/plplot%{version}/examples/f95/ %{_datadir}/plplot%{version}/examples/Makefile @@ -511,19 +510,6 @@ fi %{_datadir}/plplot%{version}/examples/ada/ %{_datadir}/plplot%{version}/examples/test_ada.sh -%files gnome -%defattr(-,root,root,-) -%{_libdir}/libplplotgnome2d.so.* -%{_libdir}/plplot%{version}/driversd/gcw.rc -%{_libdir}/plplot%{version}/driversd/gcw.so -%{python_sitearch}/gcwmodule.so -%{python_sitearch}/cplplotcanvasmodule.so - -%files gnome-devel -%defattr(-,root,root,-) -%{_libdir}/libplplotgnome2d.so -%{_libdir}/pkgconfig/plplotd-gnome2.pc - %files java %defattr(-,root,root,-) %{_libdir}/plplot%{version}/plplotjavac_wrap.so @@ -534,6 +520,13 @@ fi %{_datadir}/plplot%{version}/examples/java/ %{_datadir}/plplot%{version}/examples/test_java.sh +%files lua +%defattr(-,root,root,-) +%{_libdir}/lua/5.1/plplot/ +%{_datadir}/plplot%{version}/examples/lua/ +%{_datadir}/plplot%{version}/examples/test_lua.sh + +%ifnarch sparc64 s390 s390x %files ocaml %defattr(-,root,root,-) %dir %{_libdir}/ocaml/plplot/ @@ -541,14 +534,15 @@ fi %{_libdir}/ocaml/plplot/*.cma %{_libdir}/ocaml/plplot/*.cmi %{_libdir}/ocaml/stublibs/* -%{_datadir}/plplot%{version}/examples/ocaml/ -%{_datadir}/plplot%{version}/examples/test_ocaml.sh %files ocaml-devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/plplotd-ocaml.pc %{_libdir}/ocaml/plplot/*.a %{_libdir}/ocaml/plplot/*.cmxa +%{_datadir}/plplot%{version}/examples/ocaml/ +%{_datadir}/plplot%{version}/examples/test_ocaml.sh +%endif %if %{with octave} %files octave @@ -604,6 +598,25 @@ fi %changelog +* Mon May 4 2009 - Orion Poplawski - 5.9.3-1 +- Update to 5.9.3 +- Drop gnat-4.4 and f77 patches fixed upstream +- Updated multiarch and test patches +- Add patch to fix up libnistcd.so soversion +- Convert some doc files to UTF-8 +- Add lua and lua-devel sub-packages +- Remove rpaths +- Drop gcw driver and pygcw/gnome bindings deprecated upstream +- Drop gd driver deprecated upstream +- Move ldconfig run to plplot-libs, and add to plplot-wxGTK + +* Thu Apr 16 2009 Orion Poplawski +- Only disable ocaml support on sparc64, s390, s390x + +* Thu Apr 16 2009 S390x secondary arch maintainer +- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs + (added sparc64 per request from the sparc maintainer) + * Fri Mar 27 2009 - Orion Poplawski - 5.9.2-4 - Enable ada on ppc64 (resolves bug#241233) - freefont is now gnu-free-{mono,sans,serif}-fonts Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plplot/F-11/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 30 Jan 2009 16:50:06 -0000 1.15 +++ sources 4 May 2009 20:50:42 -0000 1.16 @@ -1 +1 @@ -2a14753112083badab87f1806cc12a46 plplot-5.9.2.tar.gz +ee5ee8bd539c203c1e045bd4368c0a4c plplot-5.9.3.tar.gz --- plplot-5.9.1-multiarch.patch DELETED --- --- plplot-5.9.1-octave.patch DELETED --- --- plplot-5.9.2-f77.patch DELETED --- --- plplot-5.9.2-gnat-4.4.patch DELETED --- --- plplot-5.9.2-test.patch DELETED --- From pkgdb at fedoraproject.org Mon May 4 20:51:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:51:24 +0000 Subject: [pkgdb] perl-Text-Context-EitherSide was added for iarnell Message-ID: <20090504205124.3672F10F893@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Text-Context-EitherSide with summary Get n words either side of search keywords kevin has approved Package perl-Text-Context-EitherSide kevin has added a Fedora devel branch for perl-Text-Context-EitherSide with an owner of iarnell kevin has approved perl-Text-Context-EitherSide in Fedora devel kevin has approved Package perl-Text-Context-EitherSide kevin has set commit to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora devel) kevin has set build to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Context-EitherSide From pkgdb at fedoraproject.org Mon May 4 20:51:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:51:28 +0000 Subject: [pkgdb] perl-Text-Context-EitherSide (Fedora, 10) updated by kevin Message-ID: <20090504205128.6313C10F89E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Text-Context-EitherSide kevin has set commit to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora 10) kevin has set build to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora 10) kevin approved watchbugzilla on perl-Text-Context-EitherSide (Fedora 10) for perl-sig kevin approved watchcommits on perl-Text-Context-EitherSide (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Context-EitherSide From pkgdb at fedoraproject.org Mon May 4 20:51:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:51:28 +0000 Subject: [pkgdb] perl-Text-Context-EitherSide (Fedora, devel) updated by kevin Message-ID: <20090504205128.6BD1B10F8A2@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Text-Context-EitherSide (Fedora devel) for perl-sig kevin approved watchcommits on perl-Text-Context-EitherSide (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Context-EitherSide From pkgdb at fedoraproject.org Mon May 4 20:51:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:51:28 +0000 Subject: [pkgdb] perl-Text-Context-EitherSide (Fedora, 11) updated by kevin Message-ID: <20090504205128.769B510F8A5@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Text-Context-EitherSide kevin has set commit to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora 11) kevin has set build to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Text-Context-EitherSide (Fedora 11) kevin approved watchbugzilla on perl-Text-Context-EitherSide (Fedora 11) for perl-sig kevin approved watchcommits on perl-Text-Context-EitherSide (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Context-EitherSide From kevin at fedoraproject.org Mon May 4 20:51:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:51:39 +0000 (UTC) Subject: rpms/perl-Text-Context-EitherSide/devel - New directory Message-ID: <20090504205139.88556700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Context-EitherSide/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28257/rpms/perl-Text-Context-EitherSide/devel Log Message: Directory /cvs/pkgs/rpms/perl-Text-Context-EitherSide/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:51:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:51:39 +0000 (UTC) Subject: rpms/perl-Text-Context-EitherSide - New directory Message-ID: <20090504205139.38092700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Context-EitherSide In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28257/rpms/perl-Text-Context-EitherSide Log Message: Directory /cvs/pkgs/rpms/perl-Text-Context-EitherSide added to the repository From kevin at fedoraproject.org Mon May 4 20:51:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:51:54 +0000 (UTC) Subject: rpms/perl-Text-Context-EitherSide Makefile,NONE,1.1 Message-ID: <20090504205154.8463F700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Context-EitherSide In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28257/rpms/perl-Text-Context-EitherSide Added Files: Makefile Log Message: Setup of module perl-Text-Context-EitherSide --- NEW FILE Makefile --- # Top level Makefile for module perl-Text-Context-EitherSide 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 kevin at fedoraproject.org Mon May 4 20:51:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:51:55 +0000 (UTC) Subject: rpms/perl-Text-Context-EitherSide/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504205155.148F3700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Context-EitherSide/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28257/rpms/perl-Text-Context-EitherSide/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Text-Context-EitherSide --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Text-Context-EitherSide # $Id: Makefile,v 1.1 2009/05/04 20:51:54 kevin Exp $ NAME := perl-Text-Context-EitherSide 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 pkgdb at fedoraproject.org Mon May 4 20:52:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:52:13 +0000 Subject: [pkgdb] perl-HTML-Toc was added for iarnell Message-ID: <20090504205213.7789210F89D@bastion2.fedora.phx.redhat.com> kevin has added Package perl-HTML-Toc with summary Generate, insert and update HTML Table of Contents kevin has approved Package perl-HTML-Toc kevin has added a Fedora devel branch for perl-HTML-Toc with an owner of iarnell kevin has approved perl-HTML-Toc in Fedora devel kevin has approved Package perl-HTML-Toc kevin has set commit to Approved for provenpackager on perl-HTML-Toc (Fedora devel) kevin has set build to Approved for provenpackager on perl-HTML-Toc (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-HTML-Toc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Toc From pkgdb at fedoraproject.org Mon May 4 20:52:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:52:14 +0000 Subject: [pkgdb] perl-HTML-Toc (Fedora, 10) updated by kevin Message-ID: <20090504205214.AA12610F8A1@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-HTML-Toc kevin has set commit to Approved for provenpackager on perl-HTML-Toc (Fedora 10) kevin has set build to Approved for provenpackager on perl-HTML-Toc (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-HTML-Toc (Fedora 10) kevin approved watchbugzilla on perl-HTML-Toc (Fedora 10) for perl-sig kevin approved watchcommits on perl-HTML-Toc (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Toc From pkgdb at fedoraproject.org Mon May 4 20:52:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:52:14 +0000 Subject: [pkgdb] perl-HTML-Toc (Fedora, devel) updated by kevin Message-ID: <20090504205214.B513F10F8A5@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-HTML-Toc (Fedora devel) for perl-sig kevin approved watchcommits on perl-HTML-Toc (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Toc From pkgdb at fedoraproject.org Mon May 4 20:52:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:52:14 +0000 Subject: [pkgdb] perl-HTML-Toc (Fedora, 11) updated by kevin Message-ID: <20090504205214.BCACD10F8A8@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-HTML-Toc kevin has set commit to Approved for provenpackager on perl-HTML-Toc (Fedora 11) kevin has set build to Approved for provenpackager on perl-HTML-Toc (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-HTML-Toc (Fedora 11) kevin approved watchbugzilla on perl-HTML-Toc (Fedora 11) for perl-sig kevin approved watchcommits on perl-HTML-Toc (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Toc From kevin at fedoraproject.org Mon May 4 20:52:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:52:28 +0000 (UTC) Subject: rpms/perl-HTML-Toc - New directory Message-ID: <20090504205228.3376A700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-Toc In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28712/rpms/perl-HTML-Toc Log Message: Directory /cvs/pkgs/rpms/perl-HTML-Toc added to the repository From kevin at fedoraproject.org Mon May 4 20:52:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:52:28 +0000 (UTC) Subject: rpms/perl-HTML-Toc/devel - New directory Message-ID: <20090504205228.7C4E6700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-Toc/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28712/rpms/perl-HTML-Toc/devel Log Message: Directory /cvs/pkgs/rpms/perl-HTML-Toc/devel added to the repository From kevin at fedoraproject.org Mon May 4 20:52:40 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:52:40 +0000 (UTC) Subject: rpms/perl-HTML-Toc Makefile,NONE,1.1 Message-ID: <20090504205240.53195700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-Toc In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28712/rpms/perl-HTML-Toc Added Files: Makefile Log Message: Setup of module perl-HTML-Toc --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-Toc 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 kevin at fedoraproject.org Mon May 4 20:52:40 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:52:40 +0000 (UTC) Subject: rpms/perl-HTML-Toc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504205240.CF563700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-Toc/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28712/rpms/perl-HTML-Toc/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-Toc --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-Toc # $Id: Makefile,v 1.1 2009/05/04 20:52:40 kevin Exp $ NAME := perl-HTML-Toc 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 pkgdb at fedoraproject.org Mon May 4 20:53:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:53:03 +0000 Subject: [pkgdb] perl-XML-TokeParser was added for iarnell Message-ID: <20090504205303.6574610F89D@bastion2.fedora.phx.redhat.com> kevin has added Package perl-XML-TokeParser with summary Simplified interface to XML::Parser kevin has approved Package perl-XML-TokeParser kevin has added a Fedora devel branch for perl-XML-TokeParser with an owner of iarnell kevin has approved perl-XML-TokeParser in Fedora devel kevin has approved Package perl-XML-TokeParser kevin has set commit to Approved for provenpackager on perl-XML-TokeParser (Fedora devel) kevin has set build to Approved for provenpackager on perl-XML-TokeParser (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-XML-TokeParser (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-TokeParser From pkgdb at fedoraproject.org Mon May 4 20:53:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:53:04 +0000 Subject: [pkgdb] perl-XML-TokeParser (Fedora, 10) updated by kevin Message-ID: <20090504205304.DD9BD10F8A9@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-XML-TokeParser kevin has set commit to Approved for provenpackager on perl-XML-TokeParser (Fedora 10) kevin has set build to Approved for provenpackager on perl-XML-TokeParser (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-XML-TokeParser (Fedora 10) kevin approved watchbugzilla on perl-XML-TokeParser (Fedora 10) for perl-sig kevin approved watchcommits on perl-XML-TokeParser (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-TokeParser From pkgdb at fedoraproject.org Mon May 4 20:53:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:53:04 +0000 Subject: [pkgdb] perl-XML-TokeParser (Fedora, devel) updated by kevin Message-ID: <20090504205304.E66E510F8AE@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-XML-TokeParser (Fedora devel) for perl-sig kevin approved watchcommits on perl-XML-TokeParser (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-TokeParser From kevin at fedoraproject.org Mon May 4 20:53:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:53:25 +0000 (UTC) Subject: rpms/perl-XML-TokeParser - New directory Message-ID: <20090504205325.3D66A700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-XML-TokeParser In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc29043/rpms/perl-XML-TokeParser Log Message: Directory /cvs/pkgs/rpms/perl-XML-TokeParser added to the repository From kevin at fedoraproject.org Mon May 4 20:53:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:53:25 +0000 (UTC) Subject: rpms/perl-XML-TokeParser/devel - New directory Message-ID: <20090504205325.834A5700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-XML-TokeParser/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc29043/rpms/perl-XML-TokeParser/devel Log Message: Directory /cvs/pkgs/rpms/perl-XML-TokeParser/devel added to the repository From pkgdb at fedoraproject.org Mon May 4 20:53:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 04 May 2009 20:53:04 +0000 Subject: [pkgdb] perl-XML-TokeParser (Fedora, 11) updated by kevin Message-ID: <20090504205304.F142410F8B5@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-XML-TokeParser kevin has set commit to Approved for provenpackager on perl-XML-TokeParser (Fedora 11) kevin has set build to Approved for provenpackager on perl-XML-TokeParser (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-XML-TokeParser (Fedora 11) kevin approved watchbugzilla on perl-XML-TokeParser (Fedora 11) for perl-sig kevin approved watchcommits on perl-XML-TokeParser (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-TokeParser From kevin at fedoraproject.org Mon May 4 20:53:36 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:53:36 +0000 (UTC) Subject: rpms/perl-XML-TokeParser Makefile,NONE,1.1 Message-ID: <20090504205336.787F8700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-XML-TokeParser In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc29043/rpms/perl-XML-TokeParser Added Files: Makefile Log Message: Setup of module perl-XML-TokeParser --- NEW FILE Makefile --- # Top level Makefile for module perl-XML-TokeParser 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 kevin at fedoraproject.org Mon May 4 20:53:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 4 May 2009 20:53:37 +0000 (UTC) Subject: rpms/perl-XML-TokeParser/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090504205337.1E647700DB@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-XML-TokeParser/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc29043/rpms/perl-XML-TokeParser/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-XML-TokeParser --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-XML-TokeParser # $Id: Makefile,v 1.1 2009/05/04 20:53:36 kevin Exp $ NAME := perl-XML-TokeParser 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 xavierb at fedoraproject.org Mon May 4 20:59:19 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Mon, 4 May 2009 20:59:19 +0000 (UTC) Subject: rpms/perl-MIME-EncWords/devel import.log, NONE, 1.1 perl-MIME-EncWords.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504205919.7D241700DB@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-MIME-EncWords/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30074/devel Modified Files: .cvsignore sources Added Files: import.log perl-MIME-EncWords.spec Log Message: Initial import. --- NEW FILE import.log --- perl-MIME-EncWords-1_010_101-2_fc10:HEAD:perl-MIME-EncWords-1.010.101-2.fc10.src.rpm:1241470647 --- NEW FILE perl-MIME-EncWords.spec --- Name: perl-MIME-EncWords Version: 1.010.101 Release: 2%{?dist} Summary: Deal with RFC 2047 encoded words (improved) License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MIME-EncWords/ Source0: http://www.cpan.org/modules/by-module/MIME/MIME-EncWords-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 0:5.005 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(MIME::Charset) >= 1.006.2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MIME::EncWords is aimed to be another implementation of MIME::Words so that it will achive more exact conformance with RFC 2047 (former RFC 1522) specifications. Additionally, it contains some improvements. Following synopsis and descriptions are inherited from its inspirer, then added descriptions on improvements (**) or changes and clarifications (*). %prep %setup -q -n MIME-EncWords-%{version} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(MIME::EncWords)$/d' EOF %global __perl_provides %{_builddir}/MIME-EncWords-%{version}/%{name}-prov chmod +x %{__perl_provides} %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 ARTISTIC Changes GPL README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Xavier Bachelot 1.010.101-2 - Better Description; tag. - Filter duplicate Provides:. - Remove unneeded Requires:. * Fri Apr 24 2009 Xavier Bachelot 1.010.101-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-EncWords/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:39:37 -0000 1.1 +++ .cvsignore 4 May 2009 20:58:48 -0000 1.2 @@ -0,0 +1 @@ +MIME-EncWords-1.010.101.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-EncWords/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:39:37 -0000 1.1 +++ sources 4 May 2009 20:58:49 -0000 1.2 @@ -0,0 +1 @@ +2009449d0af39275d45e45a4afcaf58f MIME-EncWords-1.010.101.tar.gz From oget at fedoraproject.org Mon May 4 21:01:18 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Mon, 4 May 2009 21:01:18 +0000 (UTC) Subject: rpms/clthreads/devel clthreads.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504210118.40130700DB@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/clthreads/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30770/devel Modified Files: .cvsignore sources Added Files: clthreads.spec import.log Log Message: * Mon May 04 2009 Orcan Ogetbil - 2.4.0-3 - Use %%{name} macro more often - Preserve timestamps * Mon May 04 2009 Orcan Ogetbil - 2.4.0-2 - prepare package for Fedora submission (SPEC file from PlanetCCRMA) * Tue Apr 15 2008 Fernando Lopez-Lezcano 2.4.0-1 - updated to version 2.4.0 --- NEW FILE clthreads.spec --- %global libmajor 2 Summary: POSIX threads C++ access library Name: clthreads Version: 2.4.0 Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.kokkinizita.net/linuxaudio/ Source0: http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Clthreads is a C++ wrapper library around the POSIX threads API. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Clthreads is a C++ wrapper library around the POSIX threads API. This package contains libraries and header files for developing applications that use %{name}. %prep %setup -q # No need to call ldconfig during packaging sed -i '\|/sbin/ldconfig|d' Makefile # Preserve timestamps sed -i 's|/install|/install -p|' Makefile %build export CPPFLAGS="%{optflags}" make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} make PREFIX=%{buildroot}%{_prefix} LIBDIR=%{_lib} install # create .so.x link ln -s lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so.%{libmajor} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/lib%{name}.so.* %files devel %defattr(-,root,root,-) %{_includedir}/%{name}.h %{_libdir}/lib%{name}.so %changelog * Mon May 04 2009 Orcan Ogetbil - 2.4.0-3 - Use %%{name} macro more often - Preserve timestamps * Mon May 04 2009 Orcan Ogetbil - 2.4.0-2 - prepare package for Fedora submission (SPEC file from PlanetCCRMA) * Tue Apr 15 2008 Fernando Lopez-Lezcano 2.4.0-1 - updated to version 2.4.0 * Fri Nov 24 2006 Fernando Lopez-Lezcano 2.2.1-1 - updated to version 2.2.1 * Sun Nov 19 2006 Fernando Lopez-Lezcano 2.2.0-3 - add %%{?dist} to release tag, add %%{fedora} conditional for X build requirement * Mon May 29 2006 Fernando Lopez-Lezcano 2.2.0-2 - fix library link * Sat May 13 2006 Fernando Lopez-Lezcano 2.2.0 - update to 2.2.0 * Fri Mar 31 2006 Fernando Lopez-Lezcano - proper build dependencies for fc5 * Tue Dec 28 2004 Fernando Lopez-Lezcano - spec file cleanups * Fri Dec 3 2004 Fernando Lopez-Lezcano 1.0.2-1 - updated to 1.0.2 * Fri Jul 23 2004 Fernando Lopez-Lezcano 1.0.0-1 - updated to 1.0.0 * Wed Jun 16 2004 Fernando Lopez-Lezcano 0.0.3-2 - DOH!, obsolete the -devel package as well... * Mon Jun 14 2004 Fernando Lopez-Lezcano 0.0.3-1 - obsoletes classlibs - first build * Tue May 11 2004 Fernando Lopez-Lezcano - moved so file to main package to keep aeolus happy * Wed May 5 2004 Fernando Lopez-Lezcano 0.0.1-2 - force apps to link with the major release name of the libraries (ie: ".so.0" instead of ".so") * Tue May 4 2004 Fernando Lopez-Lezcano 0.0.1-1 - initial build, needed for releasing Aeolus --- NEW FILE import.log --- clthreads-2_4_0-3_fc10:HEAD:clthreads-2.4.0-3.fc10.src.rpm:1241470821 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clthreads/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:43:51 -0000 1.1 +++ .cvsignore 4 May 2009 21:00:47 -0000 1.2 @@ -0,0 +1 @@ +clthreads-2.4.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clthreads/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:43:51 -0000 1.1 +++ sources 4 May 2009 21:00:47 -0000 1.2 @@ -0,0 +1 @@ +90b650f1f5c9f39f4d77f73aca3c53be clthreads-2.4.0.tar.bz2 From oget at fedoraproject.org Mon May 4 21:02:52 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Mon, 4 May 2009 21:02:52 +0000 (UTC) Subject: rpms/clthreads/F-11 clthreads.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504210252.2AEEE700DB@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/clthreads/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31373/F-11 Modified Files: .cvsignore sources Added Files: clthreads.spec import.log Log Message: * Mon May 04 2009 Orcan Ogetbil - 2.4.0-3 - Use %%{name} macro more often - Preserve timestamps * Mon May 04 2009 Orcan Ogetbil - 2.4.0-2 - prepare package for Fedora submission (SPEC file from PlanetCCRMA) * Tue Apr 15 2008 Fernando Lopez-Lezcano 2.4.0-1 - updated to version 2.4.0 --- NEW FILE clthreads.spec --- %global libmajor 2 Summary: POSIX threads C++ access library Name: clthreads Version: 2.4.0 Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.kokkinizita.net/linuxaudio/ Source0: http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Clthreads is a C++ wrapper library around the POSIX threads API. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Clthreads is a C++ wrapper library around the POSIX threads API. This package contains libraries and header files for developing applications that use %{name}. %prep %setup -q # No need to call ldconfig during packaging sed -i '\|/sbin/ldconfig|d' Makefile # Preserve timestamps sed -i 's|/install|/install -p|' Makefile %build export CPPFLAGS="%{optflags}" make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} make PREFIX=%{buildroot}%{_prefix} LIBDIR=%{_lib} install # create .so.x link ln -s lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so.%{libmajor} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/lib%{name}.so.* %files devel %defattr(-,root,root,-) %{_includedir}/%{name}.h %{_libdir}/lib%{name}.so %changelog * Mon May 04 2009 Orcan Ogetbil - 2.4.0-3 - Use %%{name} macro more often - Preserve timestamps * Mon May 04 2009 Orcan Ogetbil - 2.4.0-2 - prepare package for Fedora submission (SPEC file from PlanetCCRMA) * Tue Apr 15 2008 Fernando Lopez-Lezcano 2.4.0-1 - updated to version 2.4.0 * Fri Nov 24 2006 Fernando Lopez-Lezcano 2.2.1-1 - updated to version 2.2.1 * Sun Nov 19 2006 Fernando Lopez-Lezcano 2.2.0-3 - add %%{?dist} to release tag, add %%{fedora} conditional for X build requirement * Mon May 29 2006 Fernando Lopez-Lezcano 2.2.0-2 - fix library link * Sat May 13 2006 Fernando Lopez-Lezcano 2.2.0 - update to 2.2.0 * Fri Mar 31 2006 Fernando Lopez-Lezcano - proper build dependencies for fc5 * Tue Dec 28 2004 Fernando Lopez-Lezcano - spec file cleanups * Fri Dec 3 2004 Fernando Lopez-Lezcano 1.0.2-1 - updated to 1.0.2 * Fri Jul 23 2004 Fernando Lopez-Lezcano 1.0.0-1 - updated to 1.0.0 * Wed Jun 16 2004 Fernando Lopez-Lezcano 0.0.3-2 - DOH!, obsolete the -devel package as well... * Mon Jun 14 2004 Fernando Lopez-Lezcano 0.0.3-1 - obsoletes classlibs - first build * Tue May 11 2004 Fernando Lopez-Lezcano - moved so file to main package to keep aeolus happy * Wed May 5 2004 Fernando Lopez-Lezcano 0.0.1-2 - force apps to link with the major release name of the libraries (ie: ".so.0" instead of ".so") * Tue May 4 2004 Fernando Lopez-Lezcano 0.0.1-1 - initial build, needed for releasing Aeolus --- NEW FILE import.log --- clthreads-2_4_0-3_fc10:F-11:clthreads-2.4.0-3.fc10.src.rpm:1241470921 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clthreads/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:43:51 -0000 1.1 +++ .cvsignore 4 May 2009 21:02:21 -0000 1.2 @@ -0,0 +1 @@ +clthreads-2.4.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clthreads/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:43:51 -0000 1.1 +++ sources 4 May 2009 21:02:21 -0000 1.2 @@ -0,0 +1 @@ +90b650f1f5c9f39f4d77f73aca3c53be clthreads-2.4.0.tar.bz2 From xavierb at fedoraproject.org Mon May 4 21:03:14 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Mon, 4 May 2009 21:03:14 +0000 (UTC) Subject: rpms/perl-MIME-EncWords/EL-5 perl-MIME-EncWords.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504210314.75684700DB@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-MIME-EncWords/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31409/EL-5 Modified Files: sources Added Files: perl-MIME-EncWords.spec Log Message: Import into F-9, F-10, F-11 and EL-5 --- NEW FILE perl-MIME-EncWords.spec --- Name: perl-MIME-EncWords Version: 1.010.101 Release: 2%{?dist} Summary: Deal with RFC 2047 encoded words (improved) License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MIME-EncWords/ Source0: http://www.cpan.org/modules/by-module/MIME/MIME-EncWords-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 0:5.005 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(MIME::Charset) >= 1.006.2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MIME::EncWords is aimed to be another implementation of MIME::Words so that it will achive more exact conformance with RFC 2047 (former RFC 1522) specifications. Additionally, it contains some improvements. Following synopsis and descriptions are inherited from its inspirer, then added descriptions on improvements (**) or changes and clarifications (*). %prep %setup -q -n MIME-EncWords-%{version} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(MIME::EncWords)$/d' EOF %global __perl_provides %{_builddir}/MIME-EncWords-%{version}/%{name}-prov chmod +x %{__perl_provides} %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 ARTISTIC Changes GPL README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Xavier Bachelot 1.010.101-2 - Better Description; tag. - Filter duplicate Provides:. - Remove unneeded Requires:. * Fri Apr 24 2009 Xavier Bachelot 1.010.101-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-EncWords/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:39:37 -0000 1.1 +++ sources 4 May 2009 21:02:44 -0000 1.2 @@ -0,0 +1 @@ +2009449d0af39275d45e45a4afcaf58f MIME-EncWords-1.010.101.tar.gz From xavierb at fedoraproject.org Mon May 4 21:03:14 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Mon, 4 May 2009 21:03:14 +0000 (UTC) Subject: rpms/perl-MIME-EncWords/F-10 perl-MIME-EncWords.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504210314.CE503700DB@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-MIME-EncWords/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31409/F-10 Modified Files: sources Added Files: perl-MIME-EncWords.spec Log Message: Import into F-9, F-10, F-11 and EL-5 --- NEW FILE perl-MIME-EncWords.spec --- Name: perl-MIME-EncWords Version: 1.010.101 Release: 2%{?dist} Summary: Deal with RFC 2047 encoded words (improved) License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MIME-EncWords/ Source0: http://www.cpan.org/modules/by-module/MIME/MIME-EncWords-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 0:5.005 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(MIME::Charset) >= 1.006.2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MIME::EncWords is aimed to be another implementation of MIME::Words so that it will achive more exact conformance with RFC 2047 (former RFC 1522) specifications. Additionally, it contains some improvements. Following synopsis and descriptions are inherited from its inspirer, then added descriptions on improvements (**) or changes and clarifications (*). %prep %setup -q -n MIME-EncWords-%{version} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(MIME::EncWords)$/d' EOF %global __perl_provides %{_builddir}/MIME-EncWords-%{version}/%{name}-prov chmod +x %{__perl_provides} %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 ARTISTIC Changes GPL README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Xavier Bachelot 1.010.101-2 - Better Description; tag. - Filter duplicate Provides:. - Remove unneeded Requires:. * Fri Apr 24 2009 Xavier Bachelot 1.010.101-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-EncWords/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:39:37 -0000 1.1 +++ sources 4 May 2009 21:02:44 -0000 1.2 @@ -0,0 +1 @@ +2009449d0af39275d45e45a4afcaf58f MIME-EncWords-1.010.101.tar.gz From xavierb at fedoraproject.org Mon May 4 21:03:16 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Mon, 4 May 2009 21:03:16 +0000 (UTC) Subject: rpms/perl-MIME-EncWords/F-9 perl-MIME-EncWords.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504210316.2EE2C700DB@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-MIME-EncWords/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31409/F-9 Modified Files: sources Added Files: perl-MIME-EncWords.spec Log Message: Import into F-9, F-10, F-11 and EL-5 --- NEW FILE perl-MIME-EncWords.spec --- Name: perl-MIME-EncWords Version: 1.010.101 Release: 2%{?dist} Summary: Deal with RFC 2047 encoded words (improved) License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MIME-EncWords/ Source0: http://www.cpan.org/modules/by-module/MIME/MIME-EncWords-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 0:5.005 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(MIME::Charset) >= 1.006.2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MIME::EncWords is aimed to be another implementation of MIME::Words so that it will achive more exact conformance with RFC 2047 (former RFC 1522) specifications. Additionally, it contains some improvements. Following synopsis and descriptions are inherited from its inspirer, then added descriptions on improvements (**) or changes and clarifications (*). %prep %setup -q -n MIME-EncWords-%{version} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(MIME::EncWords)$/d' EOF %global __perl_provides %{_builddir}/MIME-EncWords-%{version}/%{name}-prov chmod +x %{__perl_provides} %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 ARTISTIC Changes GPL README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Xavier Bachelot 1.010.101-2 - Better Description; tag. - Filter duplicate Provides:. - Remove unneeded Requires:. * Fri Apr 24 2009 Xavier Bachelot 1.010.101-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-EncWords/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:39:37 -0000 1.1 +++ sources 4 May 2009 21:02:45 -0000 1.2 @@ -0,0 +1 @@ +2009449d0af39275d45e45a4afcaf58f MIME-EncWords-1.010.101.tar.gz From xavierb at fedoraproject.org Mon May 4 21:03:15 2009 From: xavierb at fedoraproject.org (Xavier Bachelot) Date: Mon, 4 May 2009 21:03:15 +0000 (UTC) Subject: rpms/perl-MIME-EncWords/F-11 perl-MIME-EncWords.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504210315.5FCEF700DB@cvs1.fedora.phx.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-MIME-EncWords/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31409/F-11 Modified Files: sources Added Files: perl-MIME-EncWords.spec Log Message: Import into F-9, F-10, F-11 and EL-5 --- NEW FILE perl-MIME-EncWords.spec --- Name: perl-MIME-EncWords Version: 1.010.101 Release: 2%{?dist} Summary: Deal with RFC 2047 encoded words (improved) License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MIME-EncWords/ Source0: http://www.cpan.org/modules/by-module/MIME/MIME-EncWords-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 0:5.005 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(MIME::Charset) >= 1.006.2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MIME::EncWords is aimed to be another implementation of MIME::Words so that it will achive more exact conformance with RFC 2047 (former RFC 1522) specifications. Additionally, it contains some improvements. Following synopsis and descriptions are inherited from its inspirer, then added descriptions on improvements (**) or changes and clarifications (*). %prep %setup -q -n MIME-EncWords-%{version} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(MIME::EncWords)$/d' EOF %global __perl_provides %{_builddir}/MIME-EncWords-%{version}/%{name}-prov chmod +x %{__perl_provides} %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 ARTISTIC Changes GPL README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Xavier Bachelot 1.010.101-2 - Better Description; tag. - Filter duplicate Provides:. - Remove unneeded Requires:. * Fri Apr 24 2009 Xavier Bachelot 1.010.101-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-EncWords/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:39:37 -0000 1.1 +++ sources 4 May 2009 21:02:45 -0000 1.2 @@ -0,0 +1 @@ +2009449d0af39275d45e45a4afcaf58f MIME-EncWords-1.010.101.tar.gz From oget at fedoraproject.org Mon May 4 21:05:13 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Mon, 4 May 2009 21:05:13 +0000 (UTC) Subject: rpms/clthreads/F-10 clthreads.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504210513.647DA700DB@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/clthreads/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31922/F-10 Modified Files: .cvsignore sources Added Files: clthreads.spec import.log Log Message: * Mon May 04 2009 Orcan Ogetbil - 2.4.0-3 - Use %%{name} macro more often - Preserve timestamps * Mon May 04 2009 Orcan Ogetbil - 2.4.0-2 - prepare package for Fedora submission (SPEC file from PlanetCCRMA) * Tue Apr 15 2008 Fernando Lopez-Lezcano 2.4.0-1 - updated to version 2.4.0 --- NEW FILE clthreads.spec --- %global libmajor 2 Summary: POSIX threads C++ access library Name: clthreads Version: 2.4.0 Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.kokkinizita.net/linuxaudio/ Source0: http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Clthreads is a C++ wrapper library around the POSIX threads API. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Clthreads is a C++ wrapper library around the POSIX threads API. This package contains libraries and header files for developing applications that use %{name}. %prep %setup -q # No need to call ldconfig during packaging sed -i '\|/sbin/ldconfig|d' Makefile # Preserve timestamps sed -i 's|/install|/install -p|' Makefile %build export CPPFLAGS="%{optflags}" make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} make PREFIX=%{buildroot}%{_prefix} LIBDIR=%{_lib} install # create .so.x link ln -s lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so.%{libmajor} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/lib%{name}.so.* %files devel %defattr(-,root,root,-) %{_includedir}/%{name}.h %{_libdir}/lib%{name}.so %changelog * Mon May 04 2009 Orcan Ogetbil - 2.4.0-3 - Use %%{name} macro more often - Preserve timestamps * Mon May 04 2009 Orcan Ogetbil - 2.4.0-2 - prepare package for Fedora submission (SPEC file from PlanetCCRMA) * Tue Apr 15 2008 Fernando Lopez-Lezcano 2.4.0-1 - updated to version 2.4.0 * Fri Nov 24 2006 Fernando Lopez-Lezcano 2.2.1-1 - updated to version 2.2.1 * Sun Nov 19 2006 Fernando Lopez-Lezcano 2.2.0-3 - add %%{?dist} to release tag, add %%{fedora} conditional for X build requirement * Mon May 29 2006 Fernando Lopez-Lezcano 2.2.0-2 - fix library link * Sat May 13 2006 Fernando Lopez-Lezcano 2.2.0 - update to 2.2.0 * Fri Mar 31 2006 Fernando Lopez-Lezcano - proper build dependencies for fc5 * Tue Dec 28 2004 Fernando Lopez-Lezcano - spec file cleanups * Fri Dec 3 2004 Fernando Lopez-Lezcano 1.0.2-1 - updated to 1.0.2 * Fri Jul 23 2004 Fernando Lopez-Lezcano 1.0.0-1 - updated to 1.0.0 * Wed Jun 16 2004 Fernando Lopez-Lezcano 0.0.3-2 - DOH!, obsolete the -devel package as well... * Mon Jun 14 2004 Fernando Lopez-Lezcano 0.0.3-1 - obsoletes classlibs - first build * Tue May 11 2004 Fernando Lopez-Lezcano - moved so file to main package to keep aeolus happy * Wed May 5 2004 Fernando Lopez-Lezcano 0.0.1-2 - force apps to link with the major release name of the libraries (ie: ".so.0" instead of ".so") * Tue May 4 2004 Fernando Lopez-Lezcano 0.0.1-1 - initial build, needed for releasing Aeolus --- NEW FILE import.log --- clthreads-2_4_0-3_fc10:F-10:clthreads-2.4.0-3.fc10.src.rpm:1241471060 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clthreads/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:43:51 -0000 1.1 +++ .cvsignore 4 May 2009 21:04:42 -0000 1.2 @@ -0,0 +1 @@ +clthreads-2.4.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clthreads/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:43:51 -0000 1.1 +++ sources 4 May 2009 21:04:42 -0000 1.2 @@ -0,0 +1 @@ +90b650f1f5c9f39f4d77f73aca3c53be clthreads-2.4.0.tar.bz2 From oget at fedoraproject.org Mon May 4 21:06:43 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Mon, 4 May 2009 21:06:43 +0000 (UTC) Subject: rpms/clthreads/F-9 clthreads.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504210643.19A8D700DB@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/clthreads/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32358/F-9 Modified Files: .cvsignore sources Added Files: clthreads.spec import.log Log Message: * Mon May 04 2009 Orcan Ogetbil - 2.4.0-3 - Use %%{name} macro more often - Preserve timestamps * Mon May 04 2009 Orcan Ogetbil - 2.4.0-2 - prepare package for Fedora submission (SPEC file from PlanetCCRMA) * Tue Apr 15 2008 Fernando Lopez-Lezcano 2.4.0-1 - updated to version 2.4.0 --- NEW FILE clthreads.spec --- %global libmajor 2 Summary: POSIX threads C++ access library Name: clthreads Version: 2.4.0 Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.kokkinizita.net/linuxaudio/ Source0: http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Clthreads is a C++ wrapper library around the POSIX threads API. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Clthreads is a C++ wrapper library around the POSIX threads API. This package contains libraries and header files for developing applications that use %{name}. %prep %setup -q # No need to call ldconfig during packaging sed -i '\|/sbin/ldconfig|d' Makefile # Preserve timestamps sed -i 's|/install|/install -p|' Makefile %build export CPPFLAGS="%{optflags}" make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} make PREFIX=%{buildroot}%{_prefix} LIBDIR=%{_lib} install # create .so.x link ln -s lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so.%{libmajor} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/lib%{name}.so.* %files devel %defattr(-,root,root,-) %{_includedir}/%{name}.h %{_libdir}/lib%{name}.so %changelog * Mon May 04 2009 Orcan Ogetbil - 2.4.0-3 - Use %%{name} macro more often - Preserve timestamps * Mon May 04 2009 Orcan Ogetbil - 2.4.0-2 - prepare package for Fedora submission (SPEC file from PlanetCCRMA) * Tue Apr 15 2008 Fernando Lopez-Lezcano 2.4.0-1 - updated to version 2.4.0 * Fri Nov 24 2006 Fernando Lopez-Lezcano 2.2.1-1 - updated to version 2.2.1 * Sun Nov 19 2006 Fernando Lopez-Lezcano 2.2.0-3 - add %%{?dist} to release tag, add %%{fedora} conditional for X build requirement * Mon May 29 2006 Fernando Lopez-Lezcano 2.2.0-2 - fix library link * Sat May 13 2006 Fernando Lopez-Lezcano 2.2.0 - update to 2.2.0 * Fri Mar 31 2006 Fernando Lopez-Lezcano - proper build dependencies for fc5 * Tue Dec 28 2004 Fernando Lopez-Lezcano - spec file cleanups * Fri Dec 3 2004 Fernando Lopez-Lezcano 1.0.2-1 - updated to 1.0.2 * Fri Jul 23 2004 Fernando Lopez-Lezcano 1.0.0-1 - updated to 1.0.0 * Wed Jun 16 2004 Fernando Lopez-Lezcano 0.0.3-2 - DOH!, obsolete the -devel package as well... * Mon Jun 14 2004 Fernando Lopez-Lezcano 0.0.3-1 - obsoletes classlibs - first build * Tue May 11 2004 Fernando Lopez-Lezcano - moved so file to main package to keep aeolus happy * Wed May 5 2004 Fernando Lopez-Lezcano 0.0.1-2 - force apps to link with the major release name of the libraries (ie: ".so.0" instead of ".so") * Tue May 4 2004 Fernando Lopez-Lezcano 0.0.1-1 - initial build, needed for releasing Aeolus --- NEW FILE import.log --- clthreads-2_4_0-3_fc10:F-9:clthreads-2.4.0-3.fc10.src.rpm:1241471142 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clthreads/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:43:51 -0000 1.1 +++ .cvsignore 4 May 2009 21:06:12 -0000 1.2 @@ -0,0 +1 @@ +clthreads-2.4.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clthreads/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:43:51 -0000 1.1 +++ sources 4 May 2009 21:06:12 -0000 1.2 @@ -0,0 +1 @@ +90b650f1f5c9f39f4d77f73aca3c53be clthreads-2.4.0.tar.bz2 From nsantos at fedoraproject.org Mon May 4 21:10:22 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Mon, 4 May 2009 21:10:22 +0000 (UTC) Subject: rpms/qpidc/F-10 qpidc.patch,NONE,1.1 qpidc.spec,1.70,1.71 Message-ID: <20090504211022.6CB1F700DB@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv611 Modified Files: qpidc.spec Added Files: qpidc.patch Log Message: patch for SASL credentials refresh qpidc.patch: --- NEW FILE qpidc.patch --- diff -up src/qpid/client/Connector.cpp.orig src/qpid/client/Connector.cpp --- src/qpid/client/Connector.cpp.orig 2009-05-04 16:06:17.000000000 -0400 +++ src/qpid/client/Connector.cpp 2009-05-04 16:07:06.000000000 -0400 @@ -391,11 +391,13 @@ void TCPConnector::run() { aio->start(poller); d.run(); - socket.close(); } catch (const std::exception& e) { QPID_LOG(error, QPID_MSG("FAIL " << identifier << ": " << e.what())); handleClosed(); } + try { + socket.close(); + } catch (const std::exception& e) {} } void TCPConnector::activateSecurityLayer(std::auto_ptr sl) Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- qpidc.spec 30 Mar 2009 17:45:23 -0000 1.70 +++ qpidc.spec 4 May 2009 21:09:51 -0000 1.71 @@ -14,6 +14,7 @@ License: ASL 2.0 URL: http://qpid.apache.org Source0: %{name}-%{version}.tar.gz Source1: qpidd.pp +Patch: qpidc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel @@ -196,6 +197,7 @@ exit 0 %prep %setup -q +%patch %define perftests "perftest topic_listener topic_publisher \ latencytest client_test txtest" @@ -408,6 +410,9 @@ fi %postun -n qmf -p /sbin/ldconfig %changelog +* Mon May 4 2009 Nuno Santos - 0.5.752600-4 +- patch for SASL credentials refresh + * Mon Mar 16 2009 Nuno Santos - 0.5.752600-4 - BZ483925 - split docs into a separate noarch subpackage From adamwill at fedoraproject.org Mon May 4 21:12:37 2009 From: adamwill at fedoraproject.org (Adam Williamson) Date: Mon, 4 May 2009 21:12:37 +0000 (UTC) Subject: rpms/gst-mixer/devel gst-mixer-2.26.0-rebrand.patch, NONE, 1.1 gst-mixer-2.26.0-switch.patch, NONE, 1.1 gst-mixer.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504211237.50972700DB@cvs1.fedora.phx.redhat.com> Author: adamwill Update of /cvs/pkgs/rpms/gst-mixer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30868/devel Modified Files: .cvsignore sources Added Files: gst-mixer-2.26.0-rebrand.patch gst-mixer-2.26.0-switch.patch gst-mixer.spec import.log Log Message: - initial import (based on gnome-media spec) gst-mixer-2.26.0-rebrand.patch: --- NEW FILE gst-mixer-2.26.0-rebrand.patch --- --- gnome-media-dirty/gst-mixer/gnome-volume-control.desktop.in.in 2009-04-27 13:42:03.684021984 -0700 +++ gnome-media-dirty/gst-mixer/gnome-volume-control.desktop.in.in.new 2009-04-27 14:35:45.306021777 -0700 @@ -1,16 +1,16 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Volume Control -_Comment=Adjust the volume level -Exec=gnome-volume-control +_Name=Advanced Volume Control +_Comment=Full hardware access volume control +Exec=gst-mixer Icon=multimedia-volume-control StartupNotify=true X-Info=Gnome Mixer Terminal=false Type=Application Categories=GNOME;GTK;AudioVideo;Settings;HardwareSettings; -X-GNOME-DocPath=gst-mixer/gnome-volume-control.xml +X-GNOME-DocPath=gst-mixer/gst-mixer.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-media -X-GNOME-Bugzilla-Component=gnome-volume-control +X-GNOME-Bugzilla-Component=gst-mixer X-GNOME-Bugzilla-Version=@VERSION@ --- gnome-media-dirty/gst-mixer/gnome-volume-control.schemas.in 2009-04-27 13:42:03.684021984 -0700 +++ gnome-media-dirty/gst-mixer/gnome-volume-control.schemas.in.new 2009-04-27 14:23:10.198147405 -0700 @@ -2,9 +2,9 @@ - /schemas/apps/gnome-volume-control/ui/window_height - /apps/gnome-volume-control/ui/window_height - gnome-volume-control + /schemas/apps/gst-mixer/ui/window_height + /apps/gst-mixer/ui/window_height + gst-mixer int -1 @@ -14,9 +14,9 @@ - /schemas/apps/gnome-volume-control/ui/window_width - /apps/gnome-volume-control/ui/window_width - gnome-volume-control + /schemas/apps/gst-mixer/ui/window_width + /apps/gst-mixer/ui/window_width + gst-mixer int 500 --- gnome-media-dirty/gst-mixer/Makefile.am 2009-04-27 13:42:03.684021984 -0700 +++ gnome-media-dirty/gst-mixer/Makefile.am.new 2009-04-27 14:27:35.002397016 -0700 @@ -4,10 +4,10 @@ @INTLTOOL_DESKTOP_RULE@ @INTLTOOL_SCHEMAS_RULE@ -Desktop_in_files = gnome-volume-control.desktop.in.in +Desktop_in_files = gst-mixer.desktop.in.in Desktop_DATA = $(Desktop_in_files:.desktop.in.in=.desktop) schemadir=$(GCONF_SCHEMA_FILE_DIR) -schema_DATA=gnome-volume-control.schemas +schema_DATA=gst-mixer.schemas install-schemas: GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || true @@ -19,7 +19,7 @@ endif EXTRA_DIST = $(Desktop_in_files) \ - gnome-volume-control.schemas.in + gst-mixer.schemas.in CLEANFILES = $(Desktop_DATA) $(schema_DATA) --- gnome-media-dirty/gst-mixer/src/Makefile.am 2009-04-27 13:42:03.689021762 -0700 +++ gnome-media-dirty/gst-mixer/src/Makefile.am.new 2009-04-27 14:29:50.791032216 -0700 @@ -11,9 +11,9 @@ -DDATA_DIR=\""$(pkgdatadir)"\" \ -DPIX_DIR=\""$(pkgdatadir)/pixmaps"\" -bin_PROGRAMS = gnome-volume-control +bin_PROGRAMS = gst-mixer -gnome_volume_control_SOURCES = \ +gst_mixer_SOURCES = \ button.c \ element.c \ main.c \ @@ -33,7 +33,7 @@ window.h \ misc.h -gnome_volume_control_LDFLAGS = \ +gst_mixer_LDFLAGS = \ $(GVC_ST_LIBS) \ $(GSTMIXER_LIBS) --- gnome-media-dirty/gst-mixer/doc/Makefile.am 2009-04-27 13:42:03.687021893 -0700 +++ gnome-media-dirty/gst-mixer/doc/Makefile.am.new 2009-04-27 15:29:35.626416724 -0700 @@ -1,6 +1,6 @@ include $(top_srcdir)/gnome-doc-utils.make dist-hook: doc-dist-hook -DOC_MODULE = gnome-volume-control +DOC_MODULE = gst-mixer DOC_ENTITIES = legal.xml DOC_INCLUDES = DOC_FIGURES = figures/gnome-volume-control_window.png --- gnome-media-dirty/po/POTFILES.in 2009-04-27 13:42:03.625403777 -0700 +++ gnome-media-dirty/po/POTFILES.in.new 2009-04-27 15:33:17.775022080 -0700 @@ -30,8 +30,8 @@ grecord/gnome-sound-recorder.schemas.in.in grecord/src/gnome-recorder.c grecord/src/gsr-window.c -gst-mixer/gnome-volume-control.desktop.in.in -gst-mixer/gnome-volume-control.schemas.in +gst-mixer/gst-mixer.desktop.in.in +gst-mixer/gst-mixer.schemas.in gst-mixer/src/element.c gst-mixer/src/main.c gst-mixer/src/misc.c --- gnome-media-dirty/configure.ac 2009-04-27 13:42:03.722022151 -0700 +++ gnome-media-dirty/configure.ac.new 2009-04-27 15:37:53.984022242 -0700 @@ -363,7 +363,7 @@ dnl i18n dnl======================================================================= -GETTEXT_PACKAGE=gnome-media-2.0 +GETTEXT_PACKAGE=gst-mixer-2.0 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name]) AM_GLIB_GNU_GETTEXT @@ -738,7 +738,7 @@ cddb-slave2/cddb-slave.desktop.in gnome-cd/gnome-cd.desktop.in grecord/gnome-sound-recorder.desktop.in -gst-mixer/gnome-volume-control.desktop.in +gst-mixer/gst-mixer.desktop.in gstreamer-properties/gstreamer-properties.desktop.in vu-meter/reclevel.desktop.in vu-meter/vumeter.desktop.in --- gnome-media-dirty/gst-mixer/src/keys.h 2009-04-27 13:42:03.689021762 -0700 +++ gnome-media-dirty/gst-mixer/src/keys.h.new 2009-04-27 16:05:26.560273019 -0700 @@ -25,7 +25,7 @@ G_BEGIN_DECLS #define GNOME_VOLUME_CONTROL_KEY_DIR \ - "/apps/gnome-volume-control" + "/apps/gst-mixer" #define GNOME_VOLUME_CONTROL_KEY(key) \ GNOME_VOLUME_CONTROL_KEY_DIR "/" key gst-mixer-2.26.0-switch.patch: --- NEW FILE gst-mixer-2.26.0-switch.patch --- # # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/345645 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=576022 # Desciption: Fixes whitelist bug by reverting to 2.24 behaviour. # diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/element.c gnome-media-2.26.0.new/gst-mixer/src/element.c --- gnome-media-2.26.0/gst-mixer/src/element.c 2009-03-04 23:54:53.000000000 +0000 +++ gnome-media-2.26.0.new/gst-mixer/src/element.c 2009-03-26 14:20:07.000000000 +0000 @@ -133,6 +133,14 @@ { "front", FALSE }, { NULL, FALSE } }; + + /* Reset the whitelist. This is a hack to fix bugs LP:345645, 576022 */ + if (track == NULL) + { + for (i = 0; list[i].label != NULL; i++) + list[i].done = FALSE; + return TRUE; + } for (i = 0; !found && list[i].label != NULL; i++) { gchar *label_l = NULL; @@ -304,6 +312,7 @@ } /* show */ + gnome_volume_control_element_whitelist (NULL); for (item = gst_mixer_list_tracks (el->mixer); item != NULL; item = item->next) { GstMixerTrack *track = item->data; diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/preferences.c gnome-media-2.26.0.new/gst-mixer/src/preferences.c --- gnome-media-2.26.0/gst-mixer/src/preferences.c 2009-03-04 23:54:53.000000000 +0000 +++ gnome-media-2.26.0.new/gst-mixer/src/preferences.c 2009-03-26 14:20:20.000000000 +0000 @@ -309,6 +309,7 @@ gst_object_replace ((GstObject **) &prefs->mixer, GST_OBJECT (element)); /* add all tracks */ + gnome_volume_control_element_whitelist (NULL); for (item = gst_mixer_list_tracks (mixer); item != NULL; item = item->next) { GstMixerTrack *track = item->data; --- NEW FILE gst-mixer.spec --- %global gettext_package gst-mixer-2.0 Summary: Legacy gnome-volume-control for advanced use cases Name: gst-mixer Version: 2.26.0 Release: 2%{?dist} License: GPLv2+ and GFDL Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2 # Renames the app from 'gnome-volume-control' to 'gst-mixer' Patch0: gst-mixer-2.26.0-rebrand.patch # Fixes Launchpad bug #345645 (patch from that report / upstream) Patch1: gst-mixer-2.26.0-switch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org ExcludeArch: s390 s390x Requires(post): scrollkeeper >= 0.1.4 Requires(postun): scrollkeeper >= 0.1.4 Requires(post): GConf2 >= 2.14 Requires(pre): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 BuildRequires: gtk2-devel >= 2.10.0 BuildRequires: libgnome-devel >= 2.13.7 BuildRequires: libgnomeui-devel >= 2.13.2 BuildRequires: libglade2-devel BuildRequires: GConf2-devel BuildRequires: gstreamer-devel >= 0.10.3 BuildRequires: gstreamer-plugins-base-devel >= 0.10.3 BuildRequires: dbus-glib-devel BuildRequires: libcanberra-devel BuildRequires: gnome-doc-utils BuildRequires: intltool BuildRequires: unique-devel # for patch 0 BuildRequires: autoconf automake libtool #For stuff dropped from this 'alternate' package Requires: gnome-media %description This package contains the pre-GNOME 2.26 version of the GNOME volume control application, renamed 'gst-mixer' (the name it carries in the source tree). It is provided to cover use cases the new GNOME volume control application cannot handle. %prep %setup -q -n gnome-media-%{version} %patch0 -p1 %patch1 -p1 mv gst-mixer/gnome-volume-control.desktop.in.in gst-mixer/gst-mixer.desktop.in.in mv gst-mixer/gnome-volume-control.schemas.in gst-mixer/gst-mixer.schemas.in mv gst-mixer/doc/gnome-volume-control.omf.in gst-mixer/doc/gst-mixer.omf.in mv gst-mixer/doc/C/gnome-volume-control.xml gst-mixer/doc/C/gst-mixer.xml autoreconf -f -i %build # 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 %configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no --enable-gstmix --disable-pulseaudio --disable-grecord --disable-esound --disable-gstprops --disable-profiles make #%{?_smp_mflags} # strip unneeded translations from .mo files # ideally intltool (ha!) would do that for us # http://bugzilla.gnome.org/show_bug.cgi?id=474987 cd po grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in intltool-update --pot for p in *.po; do msgmerge $p %{gettext_package}.pot > $p.out msgfmt -o `basename $p .po`.gmo $p.out done %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a rm -rf $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/lib*.*a rm -rf $RPM_BUILD_ROOT/var/scrollkeeper # We don't want all this in this 'alternative' package: we'll # require gnome-media (see above) to let the 'master' package # provide it rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/status rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-media/sounds rm -rf $RPM_BUILD_ROOT%{_datadir}/sounds # save space by linking identical images in translated docs for helpdir in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*; do for f in $helpdir/C/figures/*.png; do b="$(basename $f)" for d in $helpdir/*; do if [ -d "$d" -a "$d" != "$helpdir/C" ]; then g="$d/figures/$b" if [ -f "$g" ]; then if cmp -s $f $g; then rm "$g"; ln -s "../../C/figures/$b" "$g" fi fi fi done done done %find_lang %{gettext_package} --all-name --with-gnome %clean rm -rf $RPM_BUILD_ROOT %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/gst-mixer.schemas \ > /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` if [ -f %{_sysconfdir}/gconf/schemas/gst-mixer.schemas ] ; then gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/gst-mixer.schemas \ > /dev/null || : fi fi %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` if [ -f %{_sysconfdir}/gconf/schemas/gst-mixer.schemas ] ; then gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/gst-mixer.schemas \ > /dev/null || : fi fi %postun scrollkeeper-update -q || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{gettext_package}.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README %{_sysconfdir}/gconf/schemas/gst-mixer.schemas %{_datadir}/icons/hicolor/16x16/devices/* %{_datadir}/gnome-media/pixmaps %{_datadir}/applications/* %{_bindir}/* %changelog * Fri May 1 2009 Adam Williamson - 2.26.0-2 - Drop a bunch of %%defines in the spec as recommended for review * Tue Apr 28 2009 Adam Williamson - 2.26.0-1 - Initial Fedora package based on gnome-media spec --- NEW FILE import.log --- gst-mixer-2_26_0-2_aw_fc11:HEAD:gst-mixer-2.26.0-2.aw_fc11.src.rpm:1241470822 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gst-mixer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:36:03 -0000 1.1 +++ .cvsignore 4 May 2009 21:12:06 -0000 1.2 @@ -0,0 +1 @@ +gnome-media-2.26.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gst-mixer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:36:03 -0000 1.1 +++ sources 4 May 2009 21:12:06 -0000 1.2 @@ -0,0 +1 @@ +3d519bc7d812aed8f6e4288b6d3cdf26 gnome-media-2.26.0.tar.bz2 From nsantos at fedoraproject.org Mon May 4 21:13:15 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Mon, 4 May 2009 21:13:15 +0000 (UTC) Subject: rpms/qpidc/F-10 qpidc.spec,1.71,1.72 Message-ID: <20090504211315.616F4700DB@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1735 Modified Files: qpidc.spec Log Message: patch for SASL credentials refresh Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -p -r1.71 -r1.72 --- qpidc.spec 4 May 2009 21:09:51 -0000 1.71 +++ qpidc.spec 4 May 2009 21:12:45 -0000 1.72 @@ -7,7 +7,7 @@ Name: qpidc Version: 0.5.752600 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: ASL 2.0 @@ -410,7 +410,7 @@ fi %postun -n qmf -p /sbin/ldconfig %changelog -* Mon May 4 2009 Nuno Santos - 0.5.752600-4 +* Mon May 4 2009 Nuno Santos - 0.5.752600-5 - patch for SASL credentials refresh * Mon Mar 16 2009 Nuno Santos - 0.5.752600-4 From adamwill at fedoraproject.org Mon May 4 21:16:22 2009 From: adamwill at fedoraproject.org (Adam Williamson) Date: Mon, 4 May 2009 21:16:22 +0000 (UTC) Subject: rpms/gst-mixer/F-11 gst-mixer-2.26.0-rebrand.patch, NONE, 1.1 gst-mixer-2.26.0-switch.patch, NONE, 1.1 gst-mixer.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504211622.206F8700DB@cvs1.fedora.phx.redhat.com> Author: adamwill Update of /cvs/pkgs/rpms/gst-mixer/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2544/F-11 Modified Files: .cvsignore sources Added Files: gst-mixer-2.26.0-rebrand.patch gst-mixer-2.26.0-switch.patch gst-mixer.spec import.log Log Message: - initial import, based on gnome-media spec gst-mixer-2.26.0-rebrand.patch: --- NEW FILE gst-mixer-2.26.0-rebrand.patch --- --- gnome-media-dirty/gst-mixer/gnome-volume-control.desktop.in.in 2009-04-27 13:42:03.684021984 -0700 +++ gnome-media-dirty/gst-mixer/gnome-volume-control.desktop.in.in.new 2009-04-27 14:35:45.306021777 -0700 @@ -1,16 +1,16 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Volume Control -_Comment=Adjust the volume level -Exec=gnome-volume-control +_Name=Advanced Volume Control +_Comment=Full hardware access volume control +Exec=gst-mixer Icon=multimedia-volume-control StartupNotify=true X-Info=Gnome Mixer Terminal=false Type=Application Categories=GNOME;GTK;AudioVideo;Settings;HardwareSettings; -X-GNOME-DocPath=gst-mixer/gnome-volume-control.xml +X-GNOME-DocPath=gst-mixer/gst-mixer.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-media -X-GNOME-Bugzilla-Component=gnome-volume-control +X-GNOME-Bugzilla-Component=gst-mixer X-GNOME-Bugzilla-Version=@VERSION@ --- gnome-media-dirty/gst-mixer/gnome-volume-control.schemas.in 2009-04-27 13:42:03.684021984 -0700 +++ gnome-media-dirty/gst-mixer/gnome-volume-control.schemas.in.new 2009-04-27 14:23:10.198147405 -0700 @@ -2,9 +2,9 @@ - /schemas/apps/gnome-volume-control/ui/window_height - /apps/gnome-volume-control/ui/window_height - gnome-volume-control + /schemas/apps/gst-mixer/ui/window_height + /apps/gst-mixer/ui/window_height + gst-mixer int -1 @@ -14,9 +14,9 @@ - /schemas/apps/gnome-volume-control/ui/window_width - /apps/gnome-volume-control/ui/window_width - gnome-volume-control + /schemas/apps/gst-mixer/ui/window_width + /apps/gst-mixer/ui/window_width + gst-mixer int 500 --- gnome-media-dirty/gst-mixer/Makefile.am 2009-04-27 13:42:03.684021984 -0700 +++ gnome-media-dirty/gst-mixer/Makefile.am.new 2009-04-27 14:27:35.002397016 -0700 @@ -4,10 +4,10 @@ @INTLTOOL_DESKTOP_RULE@ @INTLTOOL_SCHEMAS_RULE@ -Desktop_in_files = gnome-volume-control.desktop.in.in +Desktop_in_files = gst-mixer.desktop.in.in Desktop_DATA = $(Desktop_in_files:.desktop.in.in=.desktop) schemadir=$(GCONF_SCHEMA_FILE_DIR) -schema_DATA=gnome-volume-control.schemas +schema_DATA=gst-mixer.schemas install-schemas: GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || true @@ -19,7 +19,7 @@ endif EXTRA_DIST = $(Desktop_in_files) \ - gnome-volume-control.schemas.in + gst-mixer.schemas.in CLEANFILES = $(Desktop_DATA) $(schema_DATA) --- gnome-media-dirty/gst-mixer/src/Makefile.am 2009-04-27 13:42:03.689021762 -0700 +++ gnome-media-dirty/gst-mixer/src/Makefile.am.new 2009-04-27 14:29:50.791032216 -0700 @@ -11,9 +11,9 @@ -DDATA_DIR=\""$(pkgdatadir)"\" \ -DPIX_DIR=\""$(pkgdatadir)/pixmaps"\" -bin_PROGRAMS = gnome-volume-control +bin_PROGRAMS = gst-mixer -gnome_volume_control_SOURCES = \ +gst_mixer_SOURCES = \ button.c \ element.c \ main.c \ @@ -33,7 +33,7 @@ window.h \ misc.h -gnome_volume_control_LDFLAGS = \ +gst_mixer_LDFLAGS = \ $(GVC_ST_LIBS) \ $(GSTMIXER_LIBS) --- gnome-media-dirty/gst-mixer/doc/Makefile.am 2009-04-27 13:42:03.687021893 -0700 +++ gnome-media-dirty/gst-mixer/doc/Makefile.am.new 2009-04-27 15:29:35.626416724 -0700 @@ -1,6 +1,6 @@ include $(top_srcdir)/gnome-doc-utils.make dist-hook: doc-dist-hook -DOC_MODULE = gnome-volume-control +DOC_MODULE = gst-mixer DOC_ENTITIES = legal.xml DOC_INCLUDES = DOC_FIGURES = figures/gnome-volume-control_window.png --- gnome-media-dirty/po/POTFILES.in 2009-04-27 13:42:03.625403777 -0700 +++ gnome-media-dirty/po/POTFILES.in.new 2009-04-27 15:33:17.775022080 -0700 @@ -30,8 +30,8 @@ grecord/gnome-sound-recorder.schemas.in.in grecord/src/gnome-recorder.c grecord/src/gsr-window.c -gst-mixer/gnome-volume-control.desktop.in.in -gst-mixer/gnome-volume-control.schemas.in +gst-mixer/gst-mixer.desktop.in.in +gst-mixer/gst-mixer.schemas.in gst-mixer/src/element.c gst-mixer/src/main.c gst-mixer/src/misc.c --- gnome-media-dirty/configure.ac 2009-04-27 13:42:03.722022151 -0700 +++ gnome-media-dirty/configure.ac.new 2009-04-27 15:37:53.984022242 -0700 @@ -363,7 +363,7 @@ dnl i18n dnl======================================================================= -GETTEXT_PACKAGE=gnome-media-2.0 +GETTEXT_PACKAGE=gst-mixer-2.0 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name]) AM_GLIB_GNU_GETTEXT @@ -738,7 +738,7 @@ cddb-slave2/cddb-slave.desktop.in gnome-cd/gnome-cd.desktop.in grecord/gnome-sound-recorder.desktop.in -gst-mixer/gnome-volume-control.desktop.in +gst-mixer/gst-mixer.desktop.in gstreamer-properties/gstreamer-properties.desktop.in vu-meter/reclevel.desktop.in vu-meter/vumeter.desktop.in --- gnome-media-dirty/gst-mixer/src/keys.h 2009-04-27 13:42:03.689021762 -0700 +++ gnome-media-dirty/gst-mixer/src/keys.h.new 2009-04-27 16:05:26.560273019 -0700 @@ -25,7 +25,7 @@ G_BEGIN_DECLS #define GNOME_VOLUME_CONTROL_KEY_DIR \ - "/apps/gnome-volume-control" + "/apps/gst-mixer" #define GNOME_VOLUME_CONTROL_KEY(key) \ GNOME_VOLUME_CONTROL_KEY_DIR "/" key gst-mixer-2.26.0-switch.patch: --- NEW FILE gst-mixer-2.26.0-switch.patch --- # # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/345645 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=576022 # Desciption: Fixes whitelist bug by reverting to 2.24 behaviour. # diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/element.c gnome-media-2.26.0.new/gst-mixer/src/element.c --- gnome-media-2.26.0/gst-mixer/src/element.c 2009-03-04 23:54:53.000000000 +0000 +++ gnome-media-2.26.0.new/gst-mixer/src/element.c 2009-03-26 14:20:07.000000000 +0000 @@ -133,6 +133,14 @@ { "front", FALSE }, { NULL, FALSE } }; + + /* Reset the whitelist. This is a hack to fix bugs LP:345645, 576022 */ + if (track == NULL) + { + for (i = 0; list[i].label != NULL; i++) + list[i].done = FALSE; + return TRUE; + } for (i = 0; !found && list[i].label != NULL; i++) { gchar *label_l = NULL; @@ -304,6 +312,7 @@ } /* show */ + gnome_volume_control_element_whitelist (NULL); for (item = gst_mixer_list_tracks (el->mixer); item != NULL; item = item->next) { GstMixerTrack *track = item->data; diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/preferences.c gnome-media-2.26.0.new/gst-mixer/src/preferences.c --- gnome-media-2.26.0/gst-mixer/src/preferences.c 2009-03-04 23:54:53.000000000 +0000 +++ gnome-media-2.26.0.new/gst-mixer/src/preferences.c 2009-03-26 14:20:20.000000000 +0000 @@ -309,6 +309,7 @@ gst_object_replace ((GstObject **) &prefs->mixer, GST_OBJECT (element)); /* add all tracks */ + gnome_volume_control_element_whitelist (NULL); for (item = gst_mixer_list_tracks (mixer); item != NULL; item = item->next) { GstMixerTrack *track = item->data; --- NEW FILE gst-mixer.spec --- %global gettext_package gst-mixer-2.0 Summary: Legacy gnome-volume-control for advanced use cases Name: gst-mixer Version: 2.26.0 Release: 2%{?dist} License: GPLv2+ and GFDL Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2 # Renames the app from 'gnome-volume-control' to 'gst-mixer' Patch0: gst-mixer-2.26.0-rebrand.patch # Fixes Launchpad bug #345645 (patch from that report / upstream) Patch1: gst-mixer-2.26.0-switch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org ExcludeArch: s390 s390x Requires(post): scrollkeeper >= 0.1.4 Requires(postun): scrollkeeper >= 0.1.4 Requires(post): GConf2 >= 2.14 Requires(pre): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 BuildRequires: gtk2-devel >= 2.10.0 BuildRequires: libgnome-devel >= 2.13.7 BuildRequires: libgnomeui-devel >= 2.13.2 BuildRequires: libglade2-devel BuildRequires: GConf2-devel BuildRequires: gstreamer-devel >= 0.10.3 BuildRequires: gstreamer-plugins-base-devel >= 0.10.3 BuildRequires: dbus-glib-devel BuildRequires: libcanberra-devel BuildRequires: gnome-doc-utils BuildRequires: intltool BuildRequires: unique-devel # for patch 0 BuildRequires: autoconf automake libtool #For stuff dropped from this 'alternate' package Requires: gnome-media %description This package contains the pre-GNOME 2.26 version of the GNOME volume control application, renamed 'gst-mixer' (the name it carries in the source tree). It is provided to cover use cases the new GNOME volume control application cannot handle. %prep %setup -q -n gnome-media-%{version} %patch0 -p1 %patch1 -p1 mv gst-mixer/gnome-volume-control.desktop.in.in gst-mixer/gst-mixer.desktop.in.in mv gst-mixer/gnome-volume-control.schemas.in gst-mixer/gst-mixer.schemas.in mv gst-mixer/doc/gnome-volume-control.omf.in gst-mixer/doc/gst-mixer.omf.in mv gst-mixer/doc/C/gnome-volume-control.xml gst-mixer/doc/C/gst-mixer.xml autoreconf -f -i %build # 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 %configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no --enable-gstmix --disable-pulseaudio --disable-grecord --disable-esound --disable-gstprops --disable-profiles make #%{?_smp_mflags} # strip unneeded translations from .mo files # ideally intltool (ha!) would do that for us # http://bugzilla.gnome.org/show_bug.cgi?id=474987 cd po grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in intltool-update --pot for p in *.po; do msgmerge $p %{gettext_package}.pot > $p.out msgfmt -o `basename $p .po`.gmo $p.out done %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a rm -rf $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/lib*.*a rm -rf $RPM_BUILD_ROOT/var/scrollkeeper # We don't want all this in this 'alternative' package: we'll # require gnome-media (see above) to let the 'master' package # provide it rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/status rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-media/sounds rm -rf $RPM_BUILD_ROOT%{_datadir}/sounds # save space by linking identical images in translated docs for helpdir in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*; do for f in $helpdir/C/figures/*.png; do b="$(basename $f)" for d in $helpdir/*; do if [ -d "$d" -a "$d" != "$helpdir/C" ]; then g="$d/figures/$b" if [ -f "$g" ]; then if cmp -s $f $g; then rm "$g"; ln -s "../../C/figures/$b" "$g" fi fi fi done done done %find_lang %{gettext_package} --all-name --with-gnome %clean rm -rf $RPM_BUILD_ROOT %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/gst-mixer.schemas \ > /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` if [ -f %{_sysconfdir}/gconf/schemas/gst-mixer.schemas ] ; then gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/gst-mixer.schemas \ > /dev/null || : fi fi %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` if [ -f %{_sysconfdir}/gconf/schemas/gst-mixer.schemas ] ; then gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/gst-mixer.schemas \ > /dev/null || : fi fi %postun scrollkeeper-update -q || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{gettext_package}.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README %{_sysconfdir}/gconf/schemas/gst-mixer.schemas %{_datadir}/icons/hicolor/16x16/devices/* %{_datadir}/gnome-media/pixmaps %{_datadir}/applications/* %{_bindir}/* %changelog * Fri May 1 2009 Adam Williamson - 2.26.0-2 - Drop a bunch of %%defines in the spec as recommended for review * Tue Apr 28 2009 Adam Williamson - 2.26.0-1 - Initial Fedora package based on gnome-media spec --- NEW FILE import.log --- gst-mixer-2_26_0-2_aw_fc11:F-11:gst-mixer-2.26.0-2.aw_fc11.src.rpm:1241471616 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gst-mixer/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:36:03 -0000 1.1 +++ .cvsignore 4 May 2009 21:15:51 -0000 1.2 @@ -0,0 +1 @@ +gnome-media-2.26.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gst-mixer/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:36:03 -0000 1.1 +++ sources 4 May 2009 21:15:51 -0000 1.2 @@ -0,0 +1 @@ +3d519bc7d812aed8f6e4288b6d3cdf26 gnome-media-2.26.0.tar.bz2 From notting at fedoraproject.org Mon May 4 21:19:20 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Mon, 4 May 2009 21:19:20 +0000 (UTC) Subject: comps comps-f11.xml.in,1.210,1.211 Message-ID: <20090504211920.37453700DB@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3153 Modified Files: comps-f11.xml.in Log Message: specspo: - has not been updated during the F11 cycle - does not have an upstream on Fedora hosted to pull from It should not be in the default install. Index: comps-f11.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f11.xml.in,v retrieving revision 1.210 retrieving revision 1.211 diff -u -p -r1.210 -r1.211 --- comps-f11.xml.in 1 May 2009 01:00:11 -0000 1.210 +++ comps-f11.xml.in 4 May 2009 21:18:49 -0000 1.211 @@ -274,7 +274,6 @@ setuptool smartmontools sos - specspo stunnel sudo symlinks From cweyl at fedoraproject.org Mon May 4 21:26:43 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 4 May 2009 21:26:43 +0000 (UTC) Subject: rpms/perl-Any-Moose/F-10 import.log, NONE, 1.1 perl-Any-Moose.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504212643.C82F8700DB@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Any-Moose/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4555/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-Any-Moose.spec Log Message: Initial import. --- NEW FILE import.log --- perl-Any-Moose-0_07-1_fc10:F-10:perl-Any-Moose-0.07-1.fc10.src.rpm:1241472362 --- NEW FILE perl-Any-Moose.spec --- Name: perl-Any-Moose Version: 0.07 Release: 1%{?dist} # lib/Any/Moose.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Use Moose or Mouse automagically Source: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Any-Moose-%{version}.tar.gz Url: http://search.cpan.org/dist/Any-Moose BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch # not automagically picked up Requires: perl(Mouse) >= 0.20 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Mouse) >= 0.20 # tests BuildRequires: perl(Test::More) BuildRequires: perl(Moose) BuildRequires: perl(MooseX::Types) BuildRequires: perl(MouseX::Types) %description This module allows one to take advantage of the features Moose/Mouse provides, while allowing one to let the program author determine if Moose or Mouse should be used; when use'd, we load Mouse if Moose isn't already loaded, otherwise we go with Moose. %prep %setup -q -n Any-Moose-%{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 {} ';' 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 %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun May 03 2009 Chris Weyl 0.07-1 - submission * Sun May 03 2009 Chris Weyl 0.07-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Any-Moose/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:40:29 -0000 1.1 +++ .cvsignore 4 May 2009 21:26:13 -0000 1.2 @@ -0,0 +1 @@ +Any-Moose-0.07.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Any-Moose/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:40:29 -0000 1.1 +++ sources 4 May 2009 21:26:13 -0000 1.2 @@ -0,0 +1 @@ +42db620f669d878ac4bf797415acbd06 Any-Moose-0.07.tar.gz From cweyl at fedoraproject.org Mon May 4 21:28:08 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 4 May 2009 21:28:08 +0000 (UTC) Subject: rpms/perl-Any-Moose/F-11 import.log, NONE, 1.1 perl-Any-Moose.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504212808.44F21700DB@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Any-Moose/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5028/F-11 Modified Files: .cvsignore sources Added Files: import.log perl-Any-Moose.spec Log Message: Initial import. --- NEW FILE import.log --- perl-Any-Moose-0_07-1_fc10:F-11:perl-Any-Moose-0.07-1.fc10.src.rpm:1241472446 --- NEW FILE perl-Any-Moose.spec --- Name: perl-Any-Moose Version: 0.07 Release: 1%{?dist} # lib/Any/Moose.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Use Moose or Mouse automagically Source: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Any-Moose-%{version}.tar.gz Url: http://search.cpan.org/dist/Any-Moose BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch # not automagically picked up Requires: perl(Mouse) >= 0.20 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Mouse) >= 0.20 # tests BuildRequires: perl(Test::More) BuildRequires: perl(Moose) BuildRequires: perl(MooseX::Types) BuildRequires: perl(MouseX::Types) %description This module allows one to take advantage of the features Moose/Mouse provides, while allowing one to let the program author determine if Moose or Mouse should be used; when use'd, we load Mouse if Moose isn't already loaded, otherwise we go with Moose. %prep %setup -q -n Any-Moose-%{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 {} ';' 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 %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun May 03 2009 Chris Weyl 0.07-1 - submission * Sun May 03 2009 Chris Weyl 0.07-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Any-Moose/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:40:29 -0000 1.1 +++ .cvsignore 4 May 2009 21:27:37 -0000 1.2 @@ -0,0 +1 @@ +Any-Moose-0.07.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Any-Moose/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:40:29 -0000 1.1 +++ sources 4 May 2009 21:27:38 -0000 1.2 @@ -0,0 +1 @@ +42db620f669d878ac4bf797415acbd06 Any-Moose-0.07.tar.gz From denis at fedoraproject.org Mon May 4 21:30:17 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Mon, 4 May 2009 21:30:17 +0000 (UTC) Subject: rpms/glibmm24/F-10 glibmm.spec,1.49,1.50 Message-ID: <20090504213017.C3294700DB@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/glibmm24/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5521 Modified Files: glibmm.spec Log Message: Added missing BRs to generate documentation graphs Index: glibmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/F-10/glibmm.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- glibmm.spec 4 May 2009 08:54:05 -0000 1.49 +++ glibmm.spec 4 May 2009 21:29:47 -0000 1.50 @@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: libsigc++20-devel >= 2.0.0 BuildRequires: glib2-devel >= 2.17.3 +BuildRequires: doxygen graphviz %description @@ -105,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Mar 24 2009 Denis Leroy - 2.18.2-1 - Update to upstream 2.18.2 (memory leak fix) - Added patch for missing implementation (#498847) +- Added missing BRs to generate documentation graphs * Tue Oct 21 2008 Denis Leroy - 2.18.1-1 - Update to upstream 2.18.1, many bug fixes From than at fedoraproject.org Mon May 4 21:37:54 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 4 May 2009 21:37:54 +0000 (UTC) Subject: rpms/kdelibs/F-11 kdelibs-4.2.3-strcasestr-glibc2.9.patch, NONE, 1.1 kdelibs.spec, 1.475, 1.476 kdelibs-4.2.0-gcc44-misc.patch, 1.1, NONE kdelibs-4.2.0-gcc44-workaround.patch, 1.1, NONE Message-ID: <20090504213754.4B044700DB@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6676 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.3-strcasestr-glibc2.9.patch Removed Files: kdelibs-4.2.0-gcc44-misc.patch kdelibs-4.2.0-gcc44-workaround.patch Log Message: - better fix for strcasestr detection kdelibs-4.2.3-strcasestr-glibc2.9.patch: --- NEW FILE kdelibs-4.2.3-strcasestr-glibc2.9.patch --- --- kdelibs/cmake/modules/CheckCXXSymbolExists.cmake (Revision 0) +++ kdelibs/cmake/modules/CheckCXXSymbolExists.cmake (Revision 963449) @@ -0,0 +1,71 @@ +# - Check if the symbol exists in include files, in C++ mode +# Forked off cmake's CheckSymbolExists.cmake +# CHECK_CXX_SYMBOL_EXISTS(SYMBOL FILES VARIABLE) +# +# SYMBOL - symbol +# FILES - include files to check +# VARIABLE - variable to return result +# +# The following variables may be set before calling this macro to +# modify the way the check is run: +# +# CMAKE_REQUIRED_FLAGS = string of compile command line flags +# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) +# CMAKE_REQUIRED_INCLUDES = list of include directories +# CMAKE_REQUIRED_LIBRARIES = list of libraries to link + +MACRO(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE) + IF("${VARIABLE}" MATCHES "^${VARIABLE}$") + SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n") + SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS}) + IF(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_SYMBOL_EXISTS_LIBS + "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") + ELSE(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_SYMBOL_EXISTS_LIBS) + ENDIF(CMAKE_REQUIRED_LIBRARIES) + IF(CMAKE_REQUIRED_INCLUDES) + SET(CMAKE_SYMBOL_EXISTS_INCLUDES + "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") + ELSE(CMAKE_REQUIRED_INCLUDES) + SET(CMAKE_SYMBOL_EXISTS_INCLUDES) + ENDIF(CMAKE_REQUIRED_INCLUDES) + FOREACH(FILE ${FILES}) + SET(CMAKE_CONFIGURABLE_FILE_CONTENT + "${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n") + ENDFOREACH(FILE) + SET(CMAKE_CONFIGURABLE_FILE_CONTENT + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\nvoid cmakeRequireSymbol(int dummy,...){(void)dummy;}\nint main()\n{\n#ifndef ${SYMBOL}\n cmakeRequireSymbol(0,&${SYMBOL});\n#endif\n return 0;\n}\n") + + CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in" + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" @ONLY) + + MESSAGE(STATUS "Looking for ${SYMBOL}") + TRY_COMPILE(${VARIABLE} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx + COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} + CMAKE_FLAGS + -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS} + "${CHECK_SYMBOL_EXISTS_LIBS}" + "${CMAKE_SYMBOL_EXISTS_INCLUDES}" + OUTPUT_VARIABLE OUTPUT) + IF(${VARIABLE}) + MESSAGE(STATUS "Looking for ${SYMBOL} - found") + SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if the ${SYMBOL} " + "exist passed with the following output:\n" + "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n" + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n") + ELSE(${VARIABLE}) + MESSAGE(STATUS "Looking for ${SYMBOL} - not found.") + SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if the ${SYMBOL} " + "exist failed with the following output:\n" + "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n" + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n") + ENDIF(${VARIABLE}) + ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$") +ENDMACRO(CHECK_CXX_SYMBOL_EXISTS) --- kdelibs/ConfigureChecks.cmake (Revision 963448) +++ kdelibs/ConfigureChecks.cmake (Revision 963449) @@ -6,6 +6,7 @@ include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckSymbolExists) +include(CheckCXXSymbolExists) include(CheckFunctionExists) include(CheckLibraryExists) include(CheckPrototypeExists) @@ -230,7 +231,15 @@ check_function_exists(random HAVE_RANDOM) # kdecore/fakes.c check_function_exists(strlcpy HAVE_STRLCPY) # kdecore/fakes.c check_function_exists(strlcat HAVE_STRLCAT) # kdecore/fakes.c -check_function_exists(strcasestr HAVE_STRCASESTR) # kdecore/fakes.c +check_cxx_symbol_exists(__CORRECT_ISO_CPP_STRING_H_PROTO "string.h" HAVE_STRCASESTR_OVERLOAD) # glibc-2.9 strangeness +if (HAVE_STRCASESTR_OVERLOAD) + message(STATUS "string.h defines __CORRECT_ISO_CPP_STRING_H_PROTO") + set(HAVE_STRCASESTR 1) + set(HAVE_STRCASESTR_PROTO 1) +else() + check_function_exists(strcasestr HAVE_STRCASESTR) # kdecore/fakes.c + check_prototype_exists(strcasestr string.h HAVE_STRCASESTR_PROTO) +endif() check_function_exists(setenv HAVE_SETENV) # kdecore/fakes.c check_function_exists(seteuid HAVE_SETEUID) # kdecore/fakes.c check_function_exists(setmntent HAVE_SETMNTENT) # solid, kio, kdecore @@ -243,7 +252,6 @@ check_prototype_exists(mkdtemp "stdlib.h;unistd.h" HAVE_MKDTEMP_PROTO) check_prototype_exists(mkstemp "stdlib.h;unistd.h" HAVE_MKSTEMP_PROTO) check_prototype_exists(strlcat string.h HAVE_STRLCAT_PROTO) -check_prototype_exists(strcasestr string.h HAVE_STRCASESTR_PROTO) check_prototype_exists(strlcpy string.h HAVE_STRLCPY_PROTO) check_prototype_exists(random stdlib.h HAVE_RANDOM_PROTO) check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO) Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v retrieving revision 1.475 retrieving revision 1.476 diff -u -p -r1.475 -r1.476 --- kdelibs.spec 3 May 2009 21:56:18 -0000 1.475 +++ kdelibs.spec 4 May 2009 21:37:23 -0000 1.476 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,11 +79,10 @@ Patch14: kdelibs-4.0.85-libexecdir.patch Patch18: kdelibs-4.1.72-kstandarddirs.patch Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch -Patch23: kdelibs-4.2.0-gcc44-workaround.patch -Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch +Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -217,11 +216,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi %patch18 -p1 -b .kstandarddirs %patch20 -p1 -b .xxcmake %patch22 -p1 -b .kdepimlibs-cmake -%patch23 -p1 -b .gcc44 -%patch25 -p1 -b .gcc44-misc # upstream patches # 4.2 +%patch100 -p1 -b .strcasestr-glibc2.9 # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -407,6 +405,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-2 +- better fix for strcasestr detection + * Sun May 03 2009 Than Ngo - 4.2.3-1 - 4.2.3 --- kdelibs-4.2.0-gcc44-misc.patch DELETED --- --- kdelibs-4.2.0-gcc44-workaround.patch DELETED --- From than at fedoraproject.org Mon May 4 21:41:10 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 4 May 2009 21:41:10 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs.spec, 1.424, 1.425 kdelibs-4.2.0-gcc44-misc.patch, 1.1, NONE kdelibs-4.2.0-gcc44-workaround.patch, 1.1, NONE Message-ID: <20090504214110.394A8700DB@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7292 Modified Files: kdelibs.spec Removed Files: kdelibs-4.2.0-gcc44-misc.patch kdelibs-4.2.0-gcc44-workaround.patch Log Message: better fix for strcasestr detection Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.424 retrieving revision 1.425 diff -u -p -r1.424 -r1.425 --- kdelibs.spec 4 May 2009 14:22:24 -0000 1.424 +++ kdelibs.spec 4 May 2009 21:40:39 -0000 1.425 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,11 +79,10 @@ Patch14: kdelibs-4.0.85-libexecdir.patch Patch18: kdelibs-4.1.72-kstandarddirs.patch Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch -Patch23: kdelibs-4.2.0-gcc44-workaround.patch -Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch +Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -217,11 +216,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi %patch18 -p1 -b .kstandarddirs %patch20 -p1 -b .xxcmake %patch22 -p1 -b .kdepimlibs-cmake -%patch23 -p1 -b .gcc44 -%patch25 -p1 -b .gcc44-misc # upstream patches # 4.2 +%patch100 -p1 -b .strcasestr-glibc2.9 # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -407,6 +405,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-2 +- better fix for strcasestr detection + * Sun May 03 2009 Than Ngo - 4.2.3-1 - 4.2.3 --- kdelibs-4.2.0-gcc44-misc.patch DELETED --- --- kdelibs-4.2.0-gcc44-workaround.patch DELETED --- From than at fedoraproject.org Mon May 4 21:43:35 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 4 May 2009 21:43:35 +0000 (UTC) Subject: rpms/kdelibs/F-9 kdelibs.spec, 1.399, 1.400 kdelibs-4.2.0-gcc44-misc.patch, 1.1, NONE kdelibs-4.2.0-gcc44-workaround.patch, 1.1, NONE Message-ID: <20090504214335.BA66470131@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7801 Modified Files: kdelibs.spec Removed Files: kdelibs-4.2.0-gcc44-misc.patch kdelibs-4.2.0-gcc44-workaround.patch Log Message: - better fix for strcasestr detection Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.399 retrieving revision 1.400 diff -u -p -r1.399 -r1.400 --- kdelibs.spec 4 May 2009 14:22:25 -0000 1.399 +++ kdelibs.spec 4 May 2009 21:43:05 -0000 1.400 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,11 +79,10 @@ Patch14: kdelibs-4.0.85-libexecdir.patch Patch18: kdelibs-4.1.72-kstandarddirs.patch Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch -Patch23: kdelibs-4.2.0-gcc44-workaround.patch -Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch +Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -217,11 +216,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi %patch18 -p1 -b .kstandarddirs %patch20 -p1 -b .xxcmake %patch22 -p1 -b .kdepimlibs-cmake -%patch23 -p1 -b .gcc44 -%patch25 -p1 -b .gcc44-misc # upstream patches # 4.2 +%patch100 -p1 -b .strcasestr-glibc2.9 # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -407,6 +405,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-2 +- better fix for strcasestr detection + * Sun May 03 2009 Than Ngo - 4.2.3-1 - 4.2.3 --- kdelibs-4.2.0-gcc44-misc.patch DELETED --- --- kdelibs-4.2.0-gcc44-workaround.patch DELETED --- From than at fedoraproject.org Mon May 4 21:46:55 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 4 May 2009 21:46:55 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs-4.2.3-strcasestr-glibc2.9.patch,NONE,1.1 Message-ID: <20090504214655.A4885700DB@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8959 Added Files: kdelibs-4.2.3-strcasestr-glibc2.9.patch Log Message: better fix for strcasestr detection kdelibs-4.2.3-strcasestr-glibc2.9.patch: --- NEW FILE kdelibs-4.2.3-strcasestr-glibc2.9.patch --- --- kdelibs/cmake/modules/CheckCXXSymbolExists.cmake (Revision 0) +++ kdelibs/cmake/modules/CheckCXXSymbolExists.cmake (Revision 963449) @@ -0,0 +1,71 @@ +# - Check if the symbol exists in include files, in C++ mode +# Forked off cmake's CheckSymbolExists.cmake +# CHECK_CXX_SYMBOL_EXISTS(SYMBOL FILES VARIABLE) +# +# SYMBOL - symbol +# FILES - include files to check +# VARIABLE - variable to return result +# +# The following variables may be set before calling this macro to +# modify the way the check is run: +# +# CMAKE_REQUIRED_FLAGS = string of compile command line flags +# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) +# CMAKE_REQUIRED_INCLUDES = list of include directories +# CMAKE_REQUIRED_LIBRARIES = list of libraries to link + +MACRO(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE) + IF("${VARIABLE}" MATCHES "^${VARIABLE}$") + SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n") + SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS}) + IF(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_SYMBOL_EXISTS_LIBS + "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") + ELSE(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_SYMBOL_EXISTS_LIBS) + ENDIF(CMAKE_REQUIRED_LIBRARIES) + IF(CMAKE_REQUIRED_INCLUDES) + SET(CMAKE_SYMBOL_EXISTS_INCLUDES + "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") + ELSE(CMAKE_REQUIRED_INCLUDES) + SET(CMAKE_SYMBOL_EXISTS_INCLUDES) + ENDIF(CMAKE_REQUIRED_INCLUDES) + FOREACH(FILE ${FILES}) + SET(CMAKE_CONFIGURABLE_FILE_CONTENT + "${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n") + ENDFOREACH(FILE) + SET(CMAKE_CONFIGURABLE_FILE_CONTENT + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\nvoid cmakeRequireSymbol(int dummy,...){(void)dummy;}\nint main()\n{\n#ifndef ${SYMBOL}\n cmakeRequireSymbol(0,&${SYMBOL});\n#endif\n return 0;\n}\n") + + CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in" + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" @ONLY) + + MESSAGE(STATUS "Looking for ${SYMBOL}") + TRY_COMPILE(${VARIABLE} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx + COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} + CMAKE_FLAGS + -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS} + "${CHECK_SYMBOL_EXISTS_LIBS}" + "${CMAKE_SYMBOL_EXISTS_INCLUDES}" + OUTPUT_VARIABLE OUTPUT) + IF(${VARIABLE}) + MESSAGE(STATUS "Looking for ${SYMBOL} - found") + SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if the ${SYMBOL} " + "exist passed with the following output:\n" + "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n" + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n") + ELSE(${VARIABLE}) + MESSAGE(STATUS "Looking for ${SYMBOL} - not found.") + SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if the ${SYMBOL} " + "exist failed with the following output:\n" + "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n" + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n") + ENDIF(${VARIABLE}) + ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$") +ENDMACRO(CHECK_CXX_SYMBOL_EXISTS) --- kdelibs/ConfigureChecks.cmake (Revision 963448) +++ kdelibs/ConfigureChecks.cmake (Revision 963449) @@ -6,6 +6,7 @@ include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckSymbolExists) +include(CheckCXXSymbolExists) include(CheckFunctionExists) include(CheckLibraryExists) include(CheckPrototypeExists) @@ -230,7 +231,15 @@ check_function_exists(random HAVE_RANDOM) # kdecore/fakes.c check_function_exists(strlcpy HAVE_STRLCPY) # kdecore/fakes.c check_function_exists(strlcat HAVE_STRLCAT) # kdecore/fakes.c -check_function_exists(strcasestr HAVE_STRCASESTR) # kdecore/fakes.c +check_cxx_symbol_exists(__CORRECT_ISO_CPP_STRING_H_PROTO "string.h" HAVE_STRCASESTR_OVERLOAD) # glibc-2.9 strangeness +if (HAVE_STRCASESTR_OVERLOAD) + message(STATUS "string.h defines __CORRECT_ISO_CPP_STRING_H_PROTO") + set(HAVE_STRCASESTR 1) + set(HAVE_STRCASESTR_PROTO 1) +else() + check_function_exists(strcasestr HAVE_STRCASESTR) # kdecore/fakes.c + check_prototype_exists(strcasestr string.h HAVE_STRCASESTR_PROTO) +endif() check_function_exists(setenv HAVE_SETENV) # kdecore/fakes.c check_function_exists(seteuid HAVE_SETEUID) # kdecore/fakes.c check_function_exists(setmntent HAVE_SETMNTENT) # solid, kio, kdecore @@ -243,7 +252,6 @@ check_prototype_exists(mkdtemp "stdlib.h;unistd.h" HAVE_MKDTEMP_PROTO) check_prototype_exists(mkstemp "stdlib.h;unistd.h" HAVE_MKSTEMP_PROTO) check_prototype_exists(strlcat string.h HAVE_STRLCAT_PROTO) -check_prototype_exists(strcasestr string.h HAVE_STRCASESTR_PROTO) check_prototype_exists(strlcpy string.h HAVE_STRLCPY_PROTO) check_prototype_exists(random stdlib.h HAVE_RANDOM_PROTO) check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO) From than at fedoraproject.org Mon May 4 21:48:08 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 4 May 2009 21:48:08 +0000 (UTC) Subject: rpms/kdelibs/F-9 kdelibs-4.2.3-strcasestr-glibc2.9.patch,NONE,1.1 Message-ID: <20090504214808.A1BEC700DB@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9215 Added Files: kdelibs-4.2.3-strcasestr-glibc2.9.patch Log Message: - better fix for strcasestr detection kdelibs-4.2.3-strcasestr-glibc2.9.patch: --- NEW FILE kdelibs-4.2.3-strcasestr-glibc2.9.patch --- --- kdelibs/cmake/modules/CheckCXXSymbolExists.cmake (Revision 0) +++ kdelibs/cmake/modules/CheckCXXSymbolExists.cmake (Revision 963449) @@ -0,0 +1,71 @@ +# - Check if the symbol exists in include files, in C++ mode +# Forked off cmake's CheckSymbolExists.cmake +# CHECK_CXX_SYMBOL_EXISTS(SYMBOL FILES VARIABLE) +# +# SYMBOL - symbol +# FILES - include files to check +# VARIABLE - variable to return result +# +# The following variables may be set before calling this macro to +# modify the way the check is run: +# +# CMAKE_REQUIRED_FLAGS = string of compile command line flags +# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) +# CMAKE_REQUIRED_INCLUDES = list of include directories +# CMAKE_REQUIRED_LIBRARIES = list of libraries to link + +MACRO(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE) + IF("${VARIABLE}" MATCHES "^${VARIABLE}$") + SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n") + SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS}) + IF(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_SYMBOL_EXISTS_LIBS + "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") + ELSE(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_SYMBOL_EXISTS_LIBS) + ENDIF(CMAKE_REQUIRED_LIBRARIES) + IF(CMAKE_REQUIRED_INCLUDES) + SET(CMAKE_SYMBOL_EXISTS_INCLUDES + "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") + ELSE(CMAKE_REQUIRED_INCLUDES) + SET(CMAKE_SYMBOL_EXISTS_INCLUDES) + ENDIF(CMAKE_REQUIRED_INCLUDES) + FOREACH(FILE ${FILES}) + SET(CMAKE_CONFIGURABLE_FILE_CONTENT + "${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n") + ENDFOREACH(FILE) + SET(CMAKE_CONFIGURABLE_FILE_CONTENT + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\nvoid cmakeRequireSymbol(int dummy,...){(void)dummy;}\nint main()\n{\n#ifndef ${SYMBOL}\n cmakeRequireSymbol(0,&${SYMBOL});\n#endif\n return 0;\n}\n") + + CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in" + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" @ONLY) + + MESSAGE(STATUS "Looking for ${SYMBOL}") + TRY_COMPILE(${VARIABLE} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx + COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} + CMAKE_FLAGS + -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS} + "${CHECK_SYMBOL_EXISTS_LIBS}" + "${CMAKE_SYMBOL_EXISTS_INCLUDES}" + OUTPUT_VARIABLE OUTPUT) + IF(${VARIABLE}) + MESSAGE(STATUS "Looking for ${SYMBOL} - found") + SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if the ${SYMBOL} " + "exist passed with the following output:\n" + "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n" + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n") + ELSE(${VARIABLE}) + MESSAGE(STATUS "Looking for ${SYMBOL} - not found.") + SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if the ${SYMBOL} " + "exist failed with the following output:\n" + "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n" + "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n") + ENDIF(${VARIABLE}) + ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$") +ENDMACRO(CHECK_CXX_SYMBOL_EXISTS) --- kdelibs/ConfigureChecks.cmake (Revision 963448) +++ kdelibs/ConfigureChecks.cmake (Revision 963449) @@ -6,6 +6,7 @@ include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckSymbolExists) +include(CheckCXXSymbolExists) include(CheckFunctionExists) include(CheckLibraryExists) include(CheckPrototypeExists) @@ -230,7 +231,15 @@ check_function_exists(random HAVE_RANDOM) # kdecore/fakes.c check_function_exists(strlcpy HAVE_STRLCPY) # kdecore/fakes.c check_function_exists(strlcat HAVE_STRLCAT) # kdecore/fakes.c -check_function_exists(strcasestr HAVE_STRCASESTR) # kdecore/fakes.c +check_cxx_symbol_exists(__CORRECT_ISO_CPP_STRING_H_PROTO "string.h" HAVE_STRCASESTR_OVERLOAD) # glibc-2.9 strangeness +if (HAVE_STRCASESTR_OVERLOAD) + message(STATUS "string.h defines __CORRECT_ISO_CPP_STRING_H_PROTO") + set(HAVE_STRCASESTR 1) + set(HAVE_STRCASESTR_PROTO 1) +else() + check_function_exists(strcasestr HAVE_STRCASESTR) # kdecore/fakes.c + check_prototype_exists(strcasestr string.h HAVE_STRCASESTR_PROTO) +endif() check_function_exists(setenv HAVE_SETENV) # kdecore/fakes.c check_function_exists(seteuid HAVE_SETEUID) # kdecore/fakes.c check_function_exists(setmntent HAVE_SETMNTENT) # solid, kio, kdecore @@ -243,7 +252,6 @@ check_prototype_exists(mkdtemp "stdlib.h;unistd.h" HAVE_MKDTEMP_PROTO) check_prototype_exists(mkstemp "stdlib.h;unistd.h" HAVE_MKSTEMP_PROTO) check_prototype_exists(strlcat string.h HAVE_STRLCAT_PROTO) -check_prototype_exists(strcasestr string.h HAVE_STRCASESTR_PROTO) check_prototype_exists(strlcpy string.h HAVE_STRLCPY_PROTO) check_prototype_exists(random stdlib.h HAVE_RANDOM_PROTO) check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO) From denisarnaud at fedoraproject.org Mon May 4 21:56:12 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 21:56:12 +0000 (UTC) Subject: rpms/soci/devel import.log, NONE, 1.1 soci-3.0.0-fix-gcc43-compatibility.patch, NONE, 1.1 soci-3.0.0-fix-gnu-autotools-compatibility.patch, NONE, 1.1 soci.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504215612.E16F9700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10405/devel Modified Files: .cvsignore sources Added Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Mon May 04 2009 Denis Arnaud 3.0.0-6 - First import into Fedora --- NEW FILE import.log --- soci-3_0_0-6_fc10:HEAD:soci-3.0.0-6.fc10.src.rpm:1241473915 soci-3.0.0-fix-gcc43-compatibility.patch: --- NEW FILE soci-3.0.0-fix-gcc43-compatibility.patch --- diff -u -r soci-3.0.0_ref/src/backends/mysql/common.h soci-3.0.0_working/src/backends/mysql/common.h --- soci-3.0.0_ref/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/common.h 2009-03-26 15:33:33.000000000 +0100 @@ -10,6 +10,7 @@ #include #include "soci-mysql.h" +#include namespace soci { diff -u -r soci-3.0.0_ref/src/backends/mysql/session.cpp soci-3.0.0_working/src/backends/mysql/session.cpp --- soci-3.0.0_ref/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/session.cpp 2009-03-26 15:34:50.000000000 +0100 @@ -11,7 +11,8 @@ #include #include #include - +#include +#include #ifdef _MSC_VER #pragma warning(disable:4355) diff -u -r soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp --- soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp 2009-03-26 15:34:09.000000000 +0100 @@ -12,6 +12,8 @@ #include "common.h" #include #include +#include +#include #ifdef _MSC_VER #pragma warning(disable:4355) diff -u -r soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp --- soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp 2009-03-26 15:33:14.000000000 +0100 @@ -13,6 +13,7 @@ #include #include #include +#include #ifdef _MSC_VER #pragma warning(disable:4355) soci-3.0.0-fix-gnu-autotools-compatibility.patch: --- NEW FILE soci-3.0.0-fix-gnu-autotools-compatibility.patch --- diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/aclocal.m4 2009-05-03 00:20:33.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +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-*- + +# serial 52 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL + + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) [...59819 lines suppressed...] +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-mysql = %{version}-%{release} +Requires: mysql-devel >= 5.0 + +%description mysql-devel +This package contains the MySQL backend for %{name}, i.e., header +files and dynamic libraries specific to the MySQL database. If you +would like to develop programs using %{name} and MySQL, you will need +to install %{name}-mysql.} + +%{?with_postgresql:%package postgresql-devel +Summary: PostGreSQL backend for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-postgresql = %{version}-%{release} +Requires: postgresql-devel >= 7.1 + +%description postgresql-devel +This package contains the PostGreSQL backend for %{name}, i.e., header +files and dynamic libraries specific to the PostGreSQL database. If +you would like to develop programs using %{name} and PostGreSQL, you +will need to install %{name}-postgresql.} + +%{?with_oracle:%package oracle-devel +Summary: Oracle backend for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-oracle = %{version}-%{release} + +%description oracle-devel +This package contains the Oracle backend for %{name}, i.e., header +files and dynamic libraries specific to the Oracle database. If you +would like to develop programs using %{name} and Oracle, you will need +to install %{name}-oracle.} + + +%package doc +Summary: HTML documentation for the @PACKAGE_NAME@ library +Group: Documentation +BuildArch: noarch +BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript + +%description doc +This package contains the documentation in the HTML format of the @PACKAGE_NAME@ +library. The documentation is the same as at the @PACKAGE_NAME@ web page. + + +%prep +%setup -q +# Rename change-log and license file, so that they comply with +# packaging standard +mv CHANGES ChangeLog +mv LICENSE_1_0.txt COPYING +rm -f INSTALL +# Apply the g++ 4.3 compatibility patch +%patch0 -p1 +# Remove MacOSX compatibility building files +rm -f build/unix/._*.tcl +rm -f ._Makefile ._configure +rm -f soci/core/._*.h soci/core/._*.cpp +rm -f soci/backends/postgresql/._*.h +rm -f doc/._*.html +# Rename the source code directory, so that the files (e.g, header +# files) can be exported correctly into {_standard_dir}/%{name} +mv src %{name} +# Apply the GNU Autotools compatibility patch +%patch1 -p1 +# Fix some permissions and formats +find ./doc -type f -perm 755 -exec chmod 644 {} \; +chmod -x AUTHORS ChangeLog COPYING NEWS README +# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; + + +%build +%configure --disable-static \ +%{?with_mysql:--enable-backend-mysql} \ +%{?with_postgresql:--enable-backend-postgresql} \ +%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +## +# Remove unpackaged files from the buildroot +rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la +## +## +# Duplicate the header files, so as to keep the compatibility, for +# developers using the SOCI library, with the non-packaged version of +# that library. +for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do + cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} +done +%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} +%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} +%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%{?with_mysql:%post mysql -p /sbin/ldconfig + +%postun mysql -p /sbin/ldconfig} + +%{?with_postgresql:%post postgresql -p /sbin/ldconfig + +%postun postgresql -p /sbin/ldconfig} + +%{?with_oracle:%post oracle -p /sbin/ldconfig + +%postun oracle -p /sbin/ldconfig} + + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_core.so.* + +%{?with_mysql:%files mysql +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_mysql.so.*} + +%{?with_postgresql:%files postgresql +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_postgresql.so.*} + +%{?with_oracle:%files oracle +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_oracle.so.*} + + +%files devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/*.h +%{_includedir}/%{name}/core +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}_core.so +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/aclocal/%{name}.m4 +%{_mandir}/man1/%{name}-config.1.* + +%{?with_mysql:%files mysql-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/mysql +%{_libdir}/lib%{name}_mysql.so} + +%{?with_postgresql:%files postgresql-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/postgresql +%{_libdir}/lib%{name}_postgresql.so} + +%{?with_oracle:%files oracle-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/oracle +%{_libdir}/lib%{name}_oracle.so} + + +%files doc +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README doc + + +%changelog +* Sat May 02 2009 Denis Arnaud 3.0.0-6 +- Removed the unused build conditionals + +* Tue Apr 28 2009 Denis Arnaud 3.0.0-5 +- Simplified the conditional build rules within the RPM specification file + +* Sat Apr 18 2009 Denis Arnaud 3.0.0-4 +- Fixed an issue about OPTFLAGS compilation + +* Tue Apr 14 2009 Denis Arnaud 3.0.0-3 +- Restarted from pristine version 3.0.0 of upstream (SOCI) project + +* Sat Apr 4 2009 Denis Arnaud 3.0.0-2 +- Specific RPM for each backend + +* Fri Mar 27 2009 Denis Arnaud 3.0.0-1 +- First RPM release --- NEW FILE soci.spec --- # ## # Default values are --with mysql --with postgresql --without oracle # Note that, for Oracle, when enabled, the following options should # also be given: # --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public # --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib # If the macros are defined, redefine them with the correct compilation flags. %bcond_without mysql %bcond_without postgresql %bcond_with oracle %define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1 %{!?_with_oracle_incdir: %define _with_oracle_incdir --with-oracle-include=%{_default_oracle_dir}/rdbms/public} %{!?_with_oracle_libdir: %define _with_oracle_libdir --with-oracle-lib=%{_default_oracle_dir}/lib} # ## # Name: soci Version: 3.0.0 Release: 6%{?dist} Summary: The database access library for C++ programmers Group: System Environment/Libraries License: Boost URL: http://%{name}.sourceforge.net Source0: http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz # That patch will be submitted upstream Patch0: %{name}-%{version}-fix-gcc43-compatibility.patch # That patch will be submitted upstream Patch1: %{name}-%{version}-fix-gnu-autotools-compatibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 BuildRequires: libtool #Requires: %description SOCI is a C++ database access library that provides the illusion of embedding SQL in regular C++ code, staying entirely within the C++ standard. %{?with_mysql:%package mysql Summary: MySQL backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: mysql-devel >= 5.0 %description mysql This package contains the MySQL backend for SOCI, i.e., dynamic library specific to the MySQL database. If you would like to use SOCI in your programs with MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql Summary: PostGreSQL backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: postgresql-devel >= 7.1 %description postgresql This package contains the PostGreSQL backend for SOCI, i.e., dynamic library specific to the PostGreSQL database. If you would like to use SOCI in your programs with PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle Summary: Oracle backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description oracle This package contains the Oracle backend for SOCI, i.e., dynamic library specific to the Oracle database. If you would like to use SOCI in your programs with Oracle, you will need to install %{name}-oracle.} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the header files, dynamic libraries and development documentation for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. %{?with_mysql:%package mysql-devel Summary: MySQL backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-mysql = %{version}-%{release} Requires: mysql-devel >= 5.0 %description mysql-devel This package contains the MySQL backend for %{name}, i.e., header files and dynamic libraries specific to the MySQL database. If you would like to develop programs using %{name} and MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql-devel Summary: PostGreSQL backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-postgresql = %{version}-%{release} Requires: postgresql-devel >= 7.1 %description postgresql-devel This package contains the PostGreSQL backend for %{name}, i.e., header files and dynamic libraries specific to the PostGreSQL database. If you would like to develop programs using %{name} and PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle-devel Summary: Oracle backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-oracle = %{version}-%{release} %description oracle-devel This package contains the Oracle backend for %{name}, i.e., header files and dynamic libraries specific to the Oracle database. If you would like to develop programs using %{name} and Oracle, you will need to install %{name}-oracle.} %package doc Summary: HTML documentation for the SOCI library Group: Documentation BuildArch: noarch BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript %description doc This package contains the documentation in the HTML format of the SOCI library. The documentation is the same as at the SOCI web page. %prep %setup -q # Rename change-log and license file, so that they comply with # packaging standard mv CHANGES ChangeLog mv LICENSE_1_0.txt COPYING rm -f INSTALL # Apply the g++ 4.3 compatibility patch %patch0 -p1 # Remove MacOSX compatibility building files rm -f build/unix/._*.tcl rm -f ._Makefile ._configure rm -f soci/core/._*.h soci/core/._*.cpp rm -f soci/backends/postgresql/._*.h rm -f doc/._*.html # Rename the source code directory, so that the files (e.g, header # files) can be exported correctly into {_standard_dir}/%{name} mv src %{name} # Apply the GNU Autotools compatibility patch %patch1 -p1 # Fix some permissions and formats find ./doc -type f -perm 755 -exec chmod 644 {} \; chmod -x AUTHORS ChangeLog COPYING NEWS README # find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; %build %configure --disable-static \ %{?with_mysql:--enable-backend-mysql} \ %{?with_postgresql:--enable-backend-postgresql} \ %{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ## # Remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la ## ## # Duplicate the header files, so as to keep the compatibility, for # developers using the SOCI library, with the non-packaged version of # that library. for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} done %{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %{?with_mysql:%post mysql -p /sbin/ldconfig %postun mysql -p /sbin/ldconfig} %{?with_postgresql:%post postgresql -p /sbin/ldconfig %postun postgresql -p /sbin/ldconfig} %{?with_oracle:%post oracle -p /sbin/ldconfig %postun oracle -p /sbin/ldconfig} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_core.so.* %{?with_mysql:%files mysql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_mysql.so.*} %{?with_postgresql:%files postgresql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_postgresql.so.*} %{?with_oracle:%files oracle %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_oracle.so.*} %files devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/%{name}/core %{_bindir}/%{name}-config %{_libdir}/lib%{name}_core.so %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/aclocal/%{name}.m4 %{_mandir}/man1/%{name}-config.1.* %{?with_mysql:%files mysql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/mysql %{_libdir}/lib%{name}_mysql.so} %{?with_postgresql:%files postgresql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/postgresql %{_libdir}/lib%{name}_postgresql.so} %{?with_oracle:%files oracle-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/oracle %{_libdir}/lib%{name}_oracle.so} %files doc %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README doc %changelog * Sat May 02 2009 Denis Arnaud 3.0.0-6 - Removed the unused build conditionals * Tue Apr 28 2009 Denis Arnaud 3.0.0-5 - Simplified the conditional build rules within the RPM specification file * Sat Apr 18 2009 Denis Arnaud 3.0.0-4 - Fixed an issue about OPTFLAGS compilation * Tue Apr 14 2009 Denis Arnaud 3.0.0-3 - Restarted from pristine version 3.0.0 of upstream (SOCI) project * Sat Apr 4 2009 Denis Arnaud 3.0.0-2 - Specific RPM for each backend * Fri Mar 27 2009 Denis Arnaud 3.0.0-1 - First RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:41:53 -0000 1.1 +++ .cvsignore 4 May 2009 21:56:11 -0000 1.2 @@ -0,0 +1 @@ +soci-3.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:41:53 -0000 1.1 +++ sources 4 May 2009 21:56:11 -0000 1.2 @@ -0,0 +1 @@ +1bf7dd244764e53557c1ecc01fdfac96 soci-3.0.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 22:02:37 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 22:02:37 +0000 (UTC) Subject: rpms/soci/F-10 import.log, NONE, 1.1 soci-3.0.0-fix-gcc43-compatibility.patch, NONE, 1.1 soci-3.0.0-fix-gnu-autotools-compatibility.patch, NONE, 1.1 soci.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504220237.792C7700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11867/F-10 Modified Files: .cvsignore sources Added Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 04 2009 Denis Arnaud 3.0.0-6 - First import into Fedora --- NEW FILE import.log --- soci-3_0_0-6_fc10:F-10:soci-3.0.0-6.fc10.src.rpm:1241474307 soci-3.0.0-fix-gcc43-compatibility.patch: --- NEW FILE soci-3.0.0-fix-gcc43-compatibility.patch --- diff -u -r soci-3.0.0_ref/src/backends/mysql/common.h soci-3.0.0_working/src/backends/mysql/common.h --- soci-3.0.0_ref/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/common.h 2009-03-26 15:33:33.000000000 +0100 @@ -10,6 +10,7 @@ #include #include "soci-mysql.h" +#include namespace soci { diff -u -r soci-3.0.0_ref/src/backends/mysql/session.cpp soci-3.0.0_working/src/backends/mysql/session.cpp --- soci-3.0.0_ref/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/session.cpp 2009-03-26 15:34:50.000000000 +0100 @@ -11,7 +11,8 @@ #include #include #include - +#include +#include #ifdef _MSC_VER #pragma warning(disable:4355) diff -u -r soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp --- soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp 2009-03-26 15:34:09.000000000 +0100 @@ -12,6 +12,8 @@ #include "common.h" #include #include +#include +#include #ifdef _MSC_VER #pragma warning(disable:4355) diff -u -r soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp --- soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp 2009-03-26 15:33:14.000000000 +0100 @@ -13,6 +13,7 @@ #include #include #include +#include #ifdef _MSC_VER #pragma warning(disable:4355) soci-3.0.0-fix-gnu-autotools-compatibility.patch: --- NEW FILE soci-3.0.0-fix-gnu-autotools-compatibility.patch --- diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/aclocal.m4 2009-05-03 00:20:33.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +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-*- + +# serial 52 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL + + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) [...59819 lines suppressed...] +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-mysql = %{version}-%{release} +Requires: mysql-devel >= 5.0 + +%description mysql-devel +This package contains the MySQL backend for %{name}, i.e., header +files and dynamic libraries specific to the MySQL database. If you +would like to develop programs using %{name} and MySQL, you will need +to install %{name}-mysql.} + +%{?with_postgresql:%package postgresql-devel +Summary: PostGreSQL backend for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-postgresql = %{version}-%{release} +Requires: postgresql-devel >= 7.1 + +%description postgresql-devel +This package contains the PostGreSQL backend for %{name}, i.e., header +files and dynamic libraries specific to the PostGreSQL database. If +you would like to develop programs using %{name} and PostGreSQL, you +will need to install %{name}-postgresql.} + +%{?with_oracle:%package oracle-devel +Summary: Oracle backend for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-oracle = %{version}-%{release} + +%description oracle-devel +This package contains the Oracle backend for %{name}, i.e., header +files and dynamic libraries specific to the Oracle database. If you +would like to develop programs using %{name} and Oracle, you will need +to install %{name}-oracle.} + + +%package doc +Summary: HTML documentation for the @PACKAGE_NAME@ library +Group: Documentation +BuildArch: noarch +BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript + +%description doc +This package contains the documentation in the HTML format of the @PACKAGE_NAME@ +library. The documentation is the same as at the @PACKAGE_NAME@ web page. + + +%prep +%setup -q +# Rename change-log and license file, so that they comply with +# packaging standard +mv CHANGES ChangeLog +mv LICENSE_1_0.txt COPYING +rm -f INSTALL +# Apply the g++ 4.3 compatibility patch +%patch0 -p1 +# Remove MacOSX compatibility building files +rm -f build/unix/._*.tcl +rm -f ._Makefile ._configure +rm -f soci/core/._*.h soci/core/._*.cpp +rm -f soci/backends/postgresql/._*.h +rm -f doc/._*.html +# Rename the source code directory, so that the files (e.g, header +# files) can be exported correctly into {_standard_dir}/%{name} +mv src %{name} +# Apply the GNU Autotools compatibility patch +%patch1 -p1 +# Fix some permissions and formats +find ./doc -type f -perm 755 -exec chmod 644 {} \; +chmod -x AUTHORS ChangeLog COPYING NEWS README +# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; + + +%build +%configure --disable-static \ +%{?with_mysql:--enable-backend-mysql} \ +%{?with_postgresql:--enable-backend-postgresql} \ +%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +## +# Remove unpackaged files from the buildroot +rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la +## +## +# Duplicate the header files, so as to keep the compatibility, for +# developers using the SOCI library, with the non-packaged version of +# that library. +for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do + cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} +done +%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} +%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} +%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%{?with_mysql:%post mysql -p /sbin/ldconfig + +%postun mysql -p /sbin/ldconfig} + +%{?with_postgresql:%post postgresql -p /sbin/ldconfig + +%postun postgresql -p /sbin/ldconfig} + +%{?with_oracle:%post oracle -p /sbin/ldconfig + +%postun oracle -p /sbin/ldconfig} + + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_core.so.* + +%{?with_mysql:%files mysql +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_mysql.so.*} + +%{?with_postgresql:%files postgresql +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_postgresql.so.*} + +%{?with_oracle:%files oracle +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_oracle.so.*} + + +%files devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/*.h +%{_includedir}/%{name}/core +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}_core.so +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/aclocal/%{name}.m4 +%{_mandir}/man1/%{name}-config.1.* + +%{?with_mysql:%files mysql-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/mysql +%{_libdir}/lib%{name}_mysql.so} + +%{?with_postgresql:%files postgresql-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/postgresql +%{_libdir}/lib%{name}_postgresql.so} + +%{?with_oracle:%files oracle-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/oracle +%{_libdir}/lib%{name}_oracle.so} + + +%files doc +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README doc + + +%changelog +* Sat May 02 2009 Denis Arnaud 3.0.0-6 +- Removed the unused build conditionals + +* Tue Apr 28 2009 Denis Arnaud 3.0.0-5 +- Simplified the conditional build rules within the RPM specification file + +* Sat Apr 18 2009 Denis Arnaud 3.0.0-4 +- Fixed an issue about OPTFLAGS compilation + +* Tue Apr 14 2009 Denis Arnaud 3.0.0-3 +- Restarted from pristine version 3.0.0 of upstream (SOCI) project + +* Sat Apr 4 2009 Denis Arnaud 3.0.0-2 +- Specific RPM for each backend + +* Fri Mar 27 2009 Denis Arnaud 3.0.0-1 +- First RPM release --- NEW FILE soci.spec --- # ## # Default values are --with mysql --with postgresql --without oracle # Note that, for Oracle, when enabled, the following options should # also be given: # --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public # --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib # If the macros are defined, redefine them with the correct compilation flags. %bcond_without mysql %bcond_without postgresql %bcond_with oracle %define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1 %{!?_with_oracle_incdir: %define _with_oracle_incdir --with-oracle-include=%{_default_oracle_dir}/rdbms/public} %{!?_with_oracle_libdir: %define _with_oracle_libdir --with-oracle-lib=%{_default_oracle_dir}/lib} # ## # Name: soci Version: 3.0.0 Release: 6%{?dist} Summary: The database access library for C++ programmers Group: System Environment/Libraries License: Boost URL: http://%{name}.sourceforge.net Source0: http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz # That patch will be submitted upstream Patch0: %{name}-%{version}-fix-gcc43-compatibility.patch # That patch will be submitted upstream Patch1: %{name}-%{version}-fix-gnu-autotools-compatibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 BuildRequires: libtool #Requires: %description SOCI is a C++ database access library that provides the illusion of embedding SQL in regular C++ code, staying entirely within the C++ standard. %{?with_mysql:%package mysql Summary: MySQL backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: mysql-devel >= 5.0 %description mysql This package contains the MySQL backend for SOCI, i.e., dynamic library specific to the MySQL database. If you would like to use SOCI in your programs with MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql Summary: PostGreSQL backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: postgresql-devel >= 7.1 %description postgresql This package contains the PostGreSQL backend for SOCI, i.e., dynamic library specific to the PostGreSQL database. If you would like to use SOCI in your programs with PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle Summary: Oracle backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description oracle This package contains the Oracle backend for SOCI, i.e., dynamic library specific to the Oracle database. If you would like to use SOCI in your programs with Oracle, you will need to install %{name}-oracle.} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the header files, dynamic libraries and development documentation for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. %{?with_mysql:%package mysql-devel Summary: MySQL backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-mysql = %{version}-%{release} Requires: mysql-devel >= 5.0 %description mysql-devel This package contains the MySQL backend for %{name}, i.e., header files and dynamic libraries specific to the MySQL database. If you would like to develop programs using %{name} and MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql-devel Summary: PostGreSQL backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-postgresql = %{version}-%{release} Requires: postgresql-devel >= 7.1 %description postgresql-devel This package contains the PostGreSQL backend for %{name}, i.e., header files and dynamic libraries specific to the PostGreSQL database. If you would like to develop programs using %{name} and PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle-devel Summary: Oracle backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-oracle = %{version}-%{release} %description oracle-devel This package contains the Oracle backend for %{name}, i.e., header files and dynamic libraries specific to the Oracle database. If you would like to develop programs using %{name} and Oracle, you will need to install %{name}-oracle.} %package doc Summary: HTML documentation for the SOCI library Group: Documentation BuildArch: noarch BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript %description doc This package contains the documentation in the HTML format of the SOCI library. The documentation is the same as at the SOCI web page. %prep %setup -q # Rename change-log and license file, so that they comply with # packaging standard mv CHANGES ChangeLog mv LICENSE_1_0.txt COPYING rm -f INSTALL # Apply the g++ 4.3 compatibility patch %patch0 -p1 # Remove MacOSX compatibility building files rm -f build/unix/._*.tcl rm -f ._Makefile ._configure rm -f soci/core/._*.h soci/core/._*.cpp rm -f soci/backends/postgresql/._*.h rm -f doc/._*.html # Rename the source code directory, so that the files (e.g, header # files) can be exported correctly into {_standard_dir}/%{name} mv src %{name} # Apply the GNU Autotools compatibility patch %patch1 -p1 # Fix some permissions and formats find ./doc -type f -perm 755 -exec chmod 644 {} \; chmod -x AUTHORS ChangeLog COPYING NEWS README # find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; %build %configure --disable-static \ %{?with_mysql:--enable-backend-mysql} \ %{?with_postgresql:--enable-backend-postgresql} \ %{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ## # Remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la ## ## # Duplicate the header files, so as to keep the compatibility, for # developers using the SOCI library, with the non-packaged version of # that library. for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} done %{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %{?with_mysql:%post mysql -p /sbin/ldconfig %postun mysql -p /sbin/ldconfig} %{?with_postgresql:%post postgresql -p /sbin/ldconfig %postun postgresql -p /sbin/ldconfig} %{?with_oracle:%post oracle -p /sbin/ldconfig %postun oracle -p /sbin/ldconfig} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_core.so.* %{?with_mysql:%files mysql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_mysql.so.*} %{?with_postgresql:%files postgresql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_postgresql.so.*} %{?with_oracle:%files oracle %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_oracle.so.*} %files devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/%{name}/core %{_bindir}/%{name}-config %{_libdir}/lib%{name}_core.so %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/aclocal/%{name}.m4 %{_mandir}/man1/%{name}-config.1.* %{?with_mysql:%files mysql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/mysql %{_libdir}/lib%{name}_mysql.so} %{?with_postgresql:%files postgresql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/postgresql %{_libdir}/lib%{name}_postgresql.so} %{?with_oracle:%files oracle-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/oracle %{_libdir}/lib%{name}_oracle.so} %files doc %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README doc %changelog * Sat May 02 2009 Denis Arnaud 3.0.0-6 - Removed the unused build conditionals * Tue Apr 28 2009 Denis Arnaud 3.0.0-5 - Simplified the conditional build rules within the RPM specification file * Sat Apr 18 2009 Denis Arnaud 3.0.0-4 - Fixed an issue about OPTFLAGS compilation * Tue Apr 14 2009 Denis Arnaud 3.0.0-3 - Restarted from pristine version 3.0.0 of upstream (SOCI) project * Sat Apr 4 2009 Denis Arnaud 3.0.0-2 - Specific RPM for each backend * Fri Mar 27 2009 Denis Arnaud 3.0.0-1 - First RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:41:53 -0000 1.1 +++ .cvsignore 4 May 2009 22:02:36 -0000 1.2 @@ -0,0 +1 @@ +soci-3.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:41:53 -0000 1.1 +++ sources 4 May 2009 22:02:37 -0000 1.2 @@ -0,0 +1 @@ +1bf7dd244764e53557c1ecc01fdfac96 soci-3.0.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 22:08:23 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 22:08:23 +0000 (UTC) Subject: rpms/soci/F-11 import.log, NONE, 1.1 soci-3.0.0-fix-gcc43-compatibility.patch, NONE, 1.1 soci-3.0.0-fix-gnu-autotools-compatibility.patch, NONE, 1.1 soci.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504220823.8FB5C700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13135/F-11 Modified Files: .cvsignore sources Added Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 04 2009 Denis Arnaud 3.0.0-6 - First import into Fedora --- NEW FILE import.log --- soci-3_0_0-6_fc10:F-11:soci-3.0.0-6.fc10.src.rpm:1241474667 soci-3.0.0-fix-gcc43-compatibility.patch: --- NEW FILE soci-3.0.0-fix-gcc43-compatibility.patch --- diff -u -r soci-3.0.0_ref/src/backends/mysql/common.h soci-3.0.0_working/src/backends/mysql/common.h --- soci-3.0.0_ref/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/common.h 2009-03-26 15:33:33.000000000 +0100 @@ -10,6 +10,7 @@ #include #include "soci-mysql.h" +#include namespace soci { diff -u -r soci-3.0.0_ref/src/backends/mysql/session.cpp soci-3.0.0_working/src/backends/mysql/session.cpp --- soci-3.0.0_ref/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/session.cpp 2009-03-26 15:34:50.000000000 +0100 @@ -11,7 +11,8 @@ #include #include #include - +#include +#include #ifdef _MSC_VER #pragma warning(disable:4355) diff -u -r soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp --- soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp 2009-03-26 15:34:09.000000000 +0100 @@ -12,6 +12,8 @@ #include "common.h" #include #include +#include +#include #ifdef _MSC_VER #pragma warning(disable:4355) diff -u -r soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp --- soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp 2009-03-26 15:33:14.000000000 +0100 @@ -13,6 +13,7 @@ #include #include #include +#include #ifdef _MSC_VER #pragma warning(disable:4355) soci-3.0.0-fix-gnu-autotools-compatibility.patch: --- NEW FILE soci-3.0.0-fix-gnu-autotools-compatibility.patch --- diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/aclocal.m4 2009-05-03 00:20:33.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +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-*- + +# serial 52 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL + + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) [...59819 lines suppressed...] +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-mysql = %{version}-%{release} +Requires: mysql-devel >= 5.0 + +%description mysql-devel +This package contains the MySQL backend for %{name}, i.e., header +files and dynamic libraries specific to the MySQL database. If you +would like to develop programs using %{name} and MySQL, you will need +to install %{name}-mysql.} + +%{?with_postgresql:%package postgresql-devel +Summary: PostGreSQL backend for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-postgresql = %{version}-%{release} +Requires: postgresql-devel >= 7.1 + +%description postgresql-devel +This package contains the PostGreSQL backend for %{name}, i.e., header +files and dynamic libraries specific to the PostGreSQL database. If +you would like to develop programs using %{name} and PostGreSQL, you +will need to install %{name}-postgresql.} + +%{?with_oracle:%package oracle-devel +Summary: Oracle backend for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-oracle = %{version}-%{release} + +%description oracle-devel +This package contains the Oracle backend for %{name}, i.e., header +files and dynamic libraries specific to the Oracle database. If you +would like to develop programs using %{name} and Oracle, you will need +to install %{name}-oracle.} + + +%package doc +Summary: HTML documentation for the @PACKAGE_NAME@ library +Group: Documentation +BuildArch: noarch +BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript + +%description doc +This package contains the documentation in the HTML format of the @PACKAGE_NAME@ +library. The documentation is the same as at the @PACKAGE_NAME@ web page. + + +%prep +%setup -q +# Rename change-log and license file, so that they comply with +# packaging standard +mv CHANGES ChangeLog +mv LICENSE_1_0.txt COPYING +rm -f INSTALL +# Apply the g++ 4.3 compatibility patch +%patch0 -p1 +# Remove MacOSX compatibility building files +rm -f build/unix/._*.tcl +rm -f ._Makefile ._configure +rm -f soci/core/._*.h soci/core/._*.cpp +rm -f soci/backends/postgresql/._*.h +rm -f doc/._*.html +# Rename the source code directory, so that the files (e.g, header +# files) can be exported correctly into {_standard_dir}/%{name} +mv src %{name} +# Apply the GNU Autotools compatibility patch +%patch1 -p1 +# Fix some permissions and formats +find ./doc -type f -perm 755 -exec chmod 644 {} \; +chmod -x AUTHORS ChangeLog COPYING NEWS README +# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; + + +%build +%configure --disable-static \ +%{?with_mysql:--enable-backend-mysql} \ +%{?with_postgresql:--enable-backend-postgresql} \ +%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +## +# Remove unpackaged files from the buildroot +rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la +## +## +# Duplicate the header files, so as to keep the compatibility, for +# developers using the SOCI library, with the non-packaged version of +# that library. +for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do + cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} +done +%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} +%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} +%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%{?with_mysql:%post mysql -p /sbin/ldconfig + +%postun mysql -p /sbin/ldconfig} + +%{?with_postgresql:%post postgresql -p /sbin/ldconfig + +%postun postgresql -p /sbin/ldconfig} + +%{?with_oracle:%post oracle -p /sbin/ldconfig + +%postun oracle -p /sbin/ldconfig} + + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_core.so.* + +%{?with_mysql:%files mysql +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_mysql.so.*} + +%{?with_postgresql:%files postgresql +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_postgresql.so.*} + +%{?with_oracle:%files oracle +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_oracle.so.*} + + +%files devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/*.h +%{_includedir}/%{name}/core +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}_core.so +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/aclocal/%{name}.m4 +%{_mandir}/man1/%{name}-config.1.* + +%{?with_mysql:%files mysql-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/mysql +%{_libdir}/lib%{name}_mysql.so} + +%{?with_postgresql:%files postgresql-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/postgresql +%{_libdir}/lib%{name}_postgresql.so} + +%{?with_oracle:%files oracle-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/oracle +%{_libdir}/lib%{name}_oracle.so} + + +%files doc +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README doc + + +%changelog +* Sat May 02 2009 Denis Arnaud 3.0.0-6 +- Removed the unused build conditionals + +* Tue Apr 28 2009 Denis Arnaud 3.0.0-5 +- Simplified the conditional build rules within the RPM specification file + +* Sat Apr 18 2009 Denis Arnaud 3.0.0-4 +- Fixed an issue about OPTFLAGS compilation + +* Tue Apr 14 2009 Denis Arnaud 3.0.0-3 +- Restarted from pristine version 3.0.0 of upstream (SOCI) project + +* Sat Apr 4 2009 Denis Arnaud 3.0.0-2 +- Specific RPM for each backend + +* Fri Mar 27 2009 Denis Arnaud 3.0.0-1 +- First RPM release --- NEW FILE soci.spec --- # ## # Default values are --with mysql --with postgresql --without oracle # Note that, for Oracle, when enabled, the following options should # also be given: # --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public # --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib # If the macros are defined, redefine them with the correct compilation flags. %bcond_without mysql %bcond_without postgresql %bcond_with oracle %define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1 %{!?_with_oracle_incdir: %define _with_oracle_incdir --with-oracle-include=%{_default_oracle_dir}/rdbms/public} %{!?_with_oracle_libdir: %define _with_oracle_libdir --with-oracle-lib=%{_default_oracle_dir}/lib} # ## # Name: soci Version: 3.0.0 Release: 6%{?dist} Summary: The database access library for C++ programmers Group: System Environment/Libraries License: Boost URL: http://%{name}.sourceforge.net Source0: http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz # That patch will be submitted upstream Patch0: %{name}-%{version}-fix-gcc43-compatibility.patch # That patch will be submitted upstream Patch1: %{name}-%{version}-fix-gnu-autotools-compatibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 BuildRequires: libtool #Requires: %description SOCI is a C++ database access library that provides the illusion of embedding SQL in regular C++ code, staying entirely within the C++ standard. %{?with_mysql:%package mysql Summary: MySQL backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: mysql-devel >= 5.0 %description mysql This package contains the MySQL backend for SOCI, i.e., dynamic library specific to the MySQL database. If you would like to use SOCI in your programs with MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql Summary: PostGreSQL backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: postgresql-devel >= 7.1 %description postgresql This package contains the PostGreSQL backend for SOCI, i.e., dynamic library specific to the PostGreSQL database. If you would like to use SOCI in your programs with PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle Summary: Oracle backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description oracle This package contains the Oracle backend for SOCI, i.e., dynamic library specific to the Oracle database. If you would like to use SOCI in your programs with Oracle, you will need to install %{name}-oracle.} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the header files, dynamic libraries and development documentation for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. %{?with_mysql:%package mysql-devel Summary: MySQL backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-mysql = %{version}-%{release} Requires: mysql-devel >= 5.0 %description mysql-devel This package contains the MySQL backend for %{name}, i.e., header files and dynamic libraries specific to the MySQL database. If you would like to develop programs using %{name} and MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql-devel Summary: PostGreSQL backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-postgresql = %{version}-%{release} Requires: postgresql-devel >= 7.1 %description postgresql-devel This package contains the PostGreSQL backend for %{name}, i.e., header files and dynamic libraries specific to the PostGreSQL database. If you would like to develop programs using %{name} and PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle-devel Summary: Oracle backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-oracle = %{version}-%{release} %description oracle-devel This package contains the Oracle backend for %{name}, i.e., header files and dynamic libraries specific to the Oracle database. If you would like to develop programs using %{name} and Oracle, you will need to install %{name}-oracle.} %package doc Summary: HTML documentation for the SOCI library Group: Documentation BuildArch: noarch BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript %description doc This package contains the documentation in the HTML format of the SOCI library. The documentation is the same as at the SOCI web page. %prep %setup -q # Rename change-log and license file, so that they comply with # packaging standard mv CHANGES ChangeLog mv LICENSE_1_0.txt COPYING rm -f INSTALL # Apply the g++ 4.3 compatibility patch %patch0 -p1 # Remove MacOSX compatibility building files rm -f build/unix/._*.tcl rm -f ._Makefile ._configure rm -f soci/core/._*.h soci/core/._*.cpp rm -f soci/backends/postgresql/._*.h rm -f doc/._*.html # Rename the source code directory, so that the files (e.g, header # files) can be exported correctly into {_standard_dir}/%{name} mv src %{name} # Apply the GNU Autotools compatibility patch %patch1 -p1 # Fix some permissions and formats find ./doc -type f -perm 755 -exec chmod 644 {} \; chmod -x AUTHORS ChangeLog COPYING NEWS README # find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; %build %configure --disable-static \ %{?with_mysql:--enable-backend-mysql} \ %{?with_postgresql:--enable-backend-postgresql} \ %{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ## # Remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la ## ## # Duplicate the header files, so as to keep the compatibility, for # developers using the SOCI library, with the non-packaged version of # that library. for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} done %{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %{?with_mysql:%post mysql -p /sbin/ldconfig %postun mysql -p /sbin/ldconfig} %{?with_postgresql:%post postgresql -p /sbin/ldconfig %postun postgresql -p /sbin/ldconfig} %{?with_oracle:%post oracle -p /sbin/ldconfig %postun oracle -p /sbin/ldconfig} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_core.so.* %{?with_mysql:%files mysql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_mysql.so.*} %{?with_postgresql:%files postgresql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_postgresql.so.*} %{?with_oracle:%files oracle %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_oracle.so.*} %files devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/%{name}/core %{_bindir}/%{name}-config %{_libdir}/lib%{name}_core.so %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/aclocal/%{name}.m4 %{_mandir}/man1/%{name}-config.1.* %{?with_mysql:%files mysql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/mysql %{_libdir}/lib%{name}_mysql.so} %{?with_postgresql:%files postgresql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/postgresql %{_libdir}/lib%{name}_postgresql.so} %{?with_oracle:%files oracle-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/oracle %{_libdir}/lib%{name}_oracle.so} %files doc %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README doc %changelog * Sat May 02 2009 Denis Arnaud 3.0.0-6 - Removed the unused build conditionals * Tue Apr 28 2009 Denis Arnaud 3.0.0-5 - Simplified the conditional build rules within the RPM specification file * Sat Apr 18 2009 Denis Arnaud 3.0.0-4 - Fixed an issue about OPTFLAGS compilation * Tue Apr 14 2009 Denis Arnaud 3.0.0-3 - Restarted from pristine version 3.0.0 of upstream (SOCI) project * Sat Apr 4 2009 Denis Arnaud 3.0.0-2 - Specific RPM for each backend * Fri Mar 27 2009 Denis Arnaud 3.0.0-1 - First RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:41:53 -0000 1.1 +++ .cvsignore 4 May 2009 22:08:22 -0000 1.2 @@ -0,0 +1 @@ +soci-3.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:41:53 -0000 1.1 +++ sources 4 May 2009 22:08:23 -0000 1.2 @@ -0,0 +1 @@ +1bf7dd244764e53557c1ecc01fdfac96 soci-3.0.0.tar.gz From denisarnaud at fedoraproject.org Mon May 4 22:16:20 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Mon, 4 May 2009 22:16:20 +0000 (UTC) Subject: rpms/soci/EL-5 import.log, NONE, 1.1 soci-3.0.0-fix-gcc43-compatibility.patch, NONE, 1.1 soci-3.0.0-fix-gnu-autotools-compatibility.patch, NONE, 1.1 soci.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504221620.A8256700DB@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14919/EL-5 Modified Files: .cvsignore sources Added Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 04 2009 Denis Arnaud 3.0.0-6 - First import into Fedora --- NEW FILE import.log --- soci-3_0_0-6_fc10:EL-5:soci-3.0.0-6.fc10.src.rpm:1241475130 soci-3.0.0-fix-gcc43-compatibility.patch: --- NEW FILE soci-3.0.0-fix-gcc43-compatibility.patch --- diff -u -r soci-3.0.0_ref/src/backends/mysql/common.h soci-3.0.0_working/src/backends/mysql/common.h --- soci-3.0.0_ref/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/common.h 2009-03-26 15:33:33.000000000 +0100 @@ -10,6 +10,7 @@ #include #include "soci-mysql.h" +#include namespace soci { diff -u -r soci-3.0.0_ref/src/backends/mysql/session.cpp soci-3.0.0_working/src/backends/mysql/session.cpp --- soci-3.0.0_ref/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/session.cpp 2009-03-26 15:34:50.000000000 +0100 @@ -11,7 +11,8 @@ #include #include #include - +#include +#include #ifdef _MSC_VER #pragma warning(disable:4355) diff -u -r soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp --- soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp 2009-03-26 15:34:09.000000000 +0100 @@ -12,6 +12,8 @@ #include "common.h" #include #include +#include +#include #ifdef _MSC_VER #pragma warning(disable:4355) diff -u -r soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp --- soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 +++ soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp 2009-03-26 15:33:14.000000000 +0100 @@ -13,6 +13,7 @@ #include #include #include +#include #ifdef _MSC_VER #pragma warning(disable:4355) soci-3.0.0-fix-gnu-autotools-compatibility.patch: --- NEW FILE soci-3.0.0-fix-gnu-autotools-compatibility.patch --- diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/aclocal.m4 2009-05-03 00:20:33.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +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-*- + +# serial 52 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL + + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) [...59819 lines suppressed...] +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-mysql = %{version}-%{release} +Requires: mysql-devel >= 5.0 + +%description mysql-devel +This package contains the MySQL backend for %{name}, i.e., header +files and dynamic libraries specific to the MySQL database. If you +would like to develop programs using %{name} and MySQL, you will need +to install %{name}-mysql.} + +%{?with_postgresql:%package postgresql-devel +Summary: PostGreSQL backend for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-postgresql = %{version}-%{release} +Requires: postgresql-devel >= 7.1 + +%description postgresql-devel +This package contains the PostGreSQL backend for %{name}, i.e., header +files and dynamic libraries specific to the PostGreSQL database. If +you would like to develop programs using %{name} and PostGreSQL, you +will need to install %{name}-postgresql.} + +%{?with_oracle:%package oracle-devel +Summary: Oracle backend for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-oracle = %{version}-%{release} + +%description oracle-devel +This package contains the Oracle backend for %{name}, i.e., header +files and dynamic libraries specific to the Oracle database. If you +would like to develop programs using %{name} and Oracle, you will need +to install %{name}-oracle.} + + +%package doc +Summary: HTML documentation for the @PACKAGE_NAME@ library +Group: Documentation +BuildArch: noarch +BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript + +%description doc +This package contains the documentation in the HTML format of the @PACKAGE_NAME@ +library. The documentation is the same as at the @PACKAGE_NAME@ web page. + + +%prep +%setup -q +# Rename change-log and license file, so that they comply with +# packaging standard +mv CHANGES ChangeLog +mv LICENSE_1_0.txt COPYING +rm -f INSTALL +# Apply the g++ 4.3 compatibility patch +%patch0 -p1 +# Remove MacOSX compatibility building files +rm -f build/unix/._*.tcl +rm -f ._Makefile ._configure +rm -f soci/core/._*.h soci/core/._*.cpp +rm -f soci/backends/postgresql/._*.h +rm -f doc/._*.html +# Rename the source code directory, so that the files (e.g, header +# files) can be exported correctly into {_standard_dir}/%{name} +mv src %{name} +# Apply the GNU Autotools compatibility patch +%patch1 -p1 +# Fix some permissions and formats +find ./doc -type f -perm 755 -exec chmod 644 {} \; +chmod -x AUTHORS ChangeLog COPYING NEWS README +# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; + + +%build +%configure --disable-static \ +%{?with_mysql:--enable-backend-mysql} \ +%{?with_postgresql:--enable-backend-postgresql} \ +%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +## +# Remove unpackaged files from the buildroot +rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h +rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la +## +## +# Duplicate the header files, so as to keep the compatibility, for +# developers using the SOCI library, with the non-packaged version of +# that library. +for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do + cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} +done +%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} +%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} +%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%{?with_mysql:%post mysql -p /sbin/ldconfig + +%postun mysql -p /sbin/ldconfig} + +%{?with_postgresql:%post postgresql -p /sbin/ldconfig + +%postun postgresql -p /sbin/ldconfig} + +%{?with_oracle:%post oracle -p /sbin/ldconfig + +%postun oracle -p /sbin/ldconfig} + + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_core.so.* + +%{?with_mysql:%files mysql +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_mysql.so.*} + +%{?with_postgresql:%files postgresql +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_postgresql.so.*} + +%{?with_oracle:%files oracle +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_oracle.so.*} + + +%files devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/*.h +%{_includedir}/%{name}/core +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}_core.so +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/aclocal/%{name}.m4 +%{_mandir}/man1/%{name}-config.1.* + +%{?with_mysql:%files mysql-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/mysql +%{_libdir}/lib%{name}_mysql.so} + +%{?with_postgresql:%files postgresql-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/postgresql +%{_libdir}/lib%{name}_postgresql.so} + +%{?with_oracle:%files oracle-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/backends/oracle +%{_libdir}/lib%{name}_oracle.so} + + +%files doc +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README doc + + +%changelog +* Sat May 02 2009 Denis Arnaud 3.0.0-6 +- Removed the unused build conditionals + +* Tue Apr 28 2009 Denis Arnaud 3.0.0-5 +- Simplified the conditional build rules within the RPM specification file + +* Sat Apr 18 2009 Denis Arnaud 3.0.0-4 +- Fixed an issue about OPTFLAGS compilation + +* Tue Apr 14 2009 Denis Arnaud 3.0.0-3 +- Restarted from pristine version 3.0.0 of upstream (SOCI) project + +* Sat Apr 4 2009 Denis Arnaud 3.0.0-2 +- Specific RPM for each backend + +* Fri Mar 27 2009 Denis Arnaud 3.0.0-1 +- First RPM release --- NEW FILE soci.spec --- # ## # Default values are --with mysql --with postgresql --without oracle # Note that, for Oracle, when enabled, the following options should # also be given: # --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public # --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib # If the macros are defined, redefine them with the correct compilation flags. %bcond_without mysql %bcond_without postgresql %bcond_with oracle %define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1 %{!?_with_oracle_incdir: %define _with_oracle_incdir --with-oracle-include=%{_default_oracle_dir}/rdbms/public} %{!?_with_oracle_libdir: %define _with_oracle_libdir --with-oracle-lib=%{_default_oracle_dir}/lib} # ## # Name: soci Version: 3.0.0 Release: 6%{?dist} Summary: The database access library for C++ programmers Group: System Environment/Libraries License: Boost URL: http://%{name}.sourceforge.net Source0: http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz # That patch will be submitted upstream Patch0: %{name}-%{version}-fix-gcc43-compatibility.patch # That patch will be submitted upstream Patch1: %{name}-%{version}-fix-gnu-autotools-compatibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel >= 1.34 BuildRequires: cppunit-devel >= 1.10 BuildRequires: libtool #Requires: %description SOCI is a C++ database access library that provides the illusion of embedding SQL in regular C++ code, staying entirely within the C++ standard. %{?with_mysql:%package mysql Summary: MySQL backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: mysql-devel >= 5.0 %description mysql This package contains the MySQL backend for SOCI, i.e., dynamic library specific to the MySQL database. If you would like to use SOCI in your programs with MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql Summary: PostGreSQL backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: postgresql-devel >= 7.1 %description postgresql This package contains the PostGreSQL backend for SOCI, i.e., dynamic library specific to the PostGreSQL database. If you would like to use SOCI in your programs with PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle Summary: Oracle backend for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description oracle This package contains the Oracle backend for SOCI, i.e., dynamic library specific to the Oracle database. If you would like to use SOCI in your programs with Oracle, you will need to install %{name}-oracle.} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the header files, dynamic libraries and development documentation for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. %{?with_mysql:%package mysql-devel Summary: MySQL backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-mysql = %{version}-%{release} Requires: mysql-devel >= 5.0 %description mysql-devel This package contains the MySQL backend for %{name}, i.e., header files and dynamic libraries specific to the MySQL database. If you would like to develop programs using %{name} and MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql-devel Summary: PostGreSQL backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-postgresql = %{version}-%{release} Requires: postgresql-devel >= 7.1 %description postgresql-devel This package contains the PostGreSQL backend for %{name}, i.e., header files and dynamic libraries specific to the PostGreSQL database. If you would like to develop programs using %{name} and PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle-devel Summary: Oracle backend for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-oracle = %{version}-%{release} %description oracle-devel This package contains the Oracle backend for %{name}, i.e., header files and dynamic libraries specific to the Oracle database. If you would like to develop programs using %{name} and Oracle, you will need to install %{name}-oracle.} %package doc Summary: HTML documentation for the SOCI library Group: Documentation BuildArch: noarch BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript %description doc This package contains the documentation in the HTML format of the SOCI library. The documentation is the same as at the SOCI web page. %prep %setup -q # Rename change-log and license file, so that they comply with # packaging standard mv CHANGES ChangeLog mv LICENSE_1_0.txt COPYING rm -f INSTALL # Apply the g++ 4.3 compatibility patch %patch0 -p1 # Remove MacOSX compatibility building files rm -f build/unix/._*.tcl rm -f ._Makefile ._configure rm -f soci/core/._*.h soci/core/._*.cpp rm -f soci/backends/postgresql/._*.h rm -f doc/._*.html # Rename the source code directory, so that the files (e.g, header # files) can be exported correctly into {_standard_dir}/%{name} mv src %{name} # Apply the GNU Autotools compatibility patch %patch1 -p1 # Fix some permissions and formats find ./doc -type f -perm 755 -exec chmod 644 {} \; chmod -x AUTHORS ChangeLog COPYING NEWS README # find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; %build %configure --disable-static \ %{?with_mysql:--enable-backend-mysql} \ %{?with_postgresql:--enable-backend-postgresql} \ %{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ## # Remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la ## ## # Duplicate the header files, so as to keep the compatibility, for # developers using the SOCI library, with the non-packaged version of # that library. for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} done %{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %{?with_mysql:%post mysql -p /sbin/ldconfig %postun mysql -p /sbin/ldconfig} %{?with_postgresql:%post postgresql -p /sbin/ldconfig %postun postgresql -p /sbin/ldconfig} %{?with_oracle:%post oracle -p /sbin/ldconfig %postun oracle -p /sbin/ldconfig} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_core.so.* %{?with_mysql:%files mysql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_mysql.so.*} %{?with_postgresql:%files postgresql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_postgresql.so.*} %{?with_oracle:%files oracle %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_oracle.so.*} %files devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/%{name}/core %{_bindir}/%{name}-config %{_libdir}/lib%{name}_core.so %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/aclocal/%{name}.m4 %{_mandir}/man1/%{name}-config.1.* %{?with_mysql:%files mysql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/mysql %{_libdir}/lib%{name}_mysql.so} %{?with_postgresql:%files postgresql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/postgresql %{_libdir}/lib%{name}_postgresql.so} %{?with_oracle:%files oracle-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} %{_includedir}/%{name}/backends/oracle %{_libdir}/lib%{name}_oracle.so} %files doc %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README doc %changelog * Sat May 02 2009 Denis Arnaud 3.0.0-6 - Removed the unused build conditionals * Tue Apr 28 2009 Denis Arnaud 3.0.0-5 - Simplified the conditional build rules within the RPM specification file * Sat Apr 18 2009 Denis Arnaud 3.0.0-4 - Fixed an issue about OPTFLAGS compilation * Tue Apr 14 2009 Denis Arnaud 3.0.0-3 - Restarted from pristine version 3.0.0 of upstream (SOCI) project * Sat Apr 4 2009 Denis Arnaud 3.0.0-2 - Specific RPM for each backend * Fri Mar 27 2009 Denis Arnaud 3.0.0-1 - First RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:41:53 -0000 1.1 +++ .cvsignore 4 May 2009 22:16:19 -0000 1.2 @@ -0,0 +1 @@ +soci-3.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:41:53 -0000 1.1 +++ sources 4 May 2009 22:16:20 -0000 1.2 @@ -0,0 +1 @@ +1bf7dd244764e53557c1ecc01fdfac96 soci-3.0.0.tar.gz From jkeating at fedoraproject.org Mon May 4 22:39:54 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Mon, 4 May 2009 22:39:54 +0000 (UTC) Subject: comps comps-f11.xml.in,1.211,1.212 Message-ID: <20090504223954.ACB8C700DB@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19496 Modified Files: comps-f11.xml.in Log Message: Make evince-dvi optional. Drags in texlive. Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.211 retrieving revision 1.212 diff -u -p -r1.211 -r1.212 --- comps-f11.xml.in 4 May 2009 21:18:49 -0000 1.211 +++ comps-f11.xml.in 4 May 2009 22:39:22 -0000 1.212 @@ -2257,7 +2257,6 @@ eog evince evince-djvu - evince-dvi file-roller gcalctool gdm @@ -2302,6 +2301,7 @@ byzanz deskbar-applet esc + evince-dvi file-browser-applet gconf-editor gdesklets From cweyl at fedoraproject.org Mon May 4 22:40:39 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 4 May 2009 22:40:39 +0000 (UTC) Subject: rpms/perl-Any-Moose/devel import.log, NONE, 1.1 perl-Any-Moose.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504224039.E7769700DB@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Any-Moose/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19911/devel Modified Files: .cvsignore sources Added Files: import.log perl-Any-Moose.spec Log Message: initial import --- NEW FILE import.log --- perl-Any-Moose-0_07-1_fc10:HEAD:perl-Any-Moose-0.07-1.fc10.src.rpm:1241476798 --- NEW FILE perl-Any-Moose.spec --- Name: perl-Any-Moose Version: 0.07 Release: 1%{?dist} # lib/Any/Moose.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Use Moose or Mouse automagically Source: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Any-Moose-%{version}.tar.gz Url: http://search.cpan.org/dist/Any-Moose BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch # not automagically picked up Requires: perl(Mouse) >= 0.20 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Mouse) >= 0.20 # tests BuildRequires: perl(Test::More) BuildRequires: perl(Moose) BuildRequires: perl(MooseX::Types) BuildRequires: perl(MouseX::Types) %description This module allows one to take advantage of the features Moose/Mouse provides, while allowing one to let the program author determine if Moose or Mouse should be used; when use'd, we load Mouse if Moose isn't already loaded, otherwise we go with Moose. %prep %setup -q -n Any-Moose-%{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 {} ';' 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 %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun May 03 2009 Chris Weyl 0.07-1 - submission * Sun May 03 2009 Chris Weyl 0.07-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Any-Moose/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:40:29 -0000 1.1 +++ .cvsignore 4 May 2009 22:40:08 -0000 1.2 @@ -0,0 +1 @@ +Any-Moose-0.07.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Any-Moose/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:40:29 -0000 1.1 +++ sources 4 May 2009 22:40:09 -0000 1.2 @@ -0,0 +1 @@ +42db620f669d878ac4bf797415acbd06 Any-Moose-0.07.tar.gz From cweyl at fedoraproject.org Mon May 4 22:42:32 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 4 May 2009 22:42:32 +0000 (UTC) Subject: rpms/perl-Term-Completion/devel import.log, NONE, 1.1 perl-Term-Completion.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504224232.2B6BC700DB@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Term-Completion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20447/devel Modified Files: .cvsignore sources Added Files: import.log perl-Term-Completion.spec Log Message: initial import --- NEW FILE import.log --- perl-Term-Completion-0_91-1_fc10:HEAD:perl-Term-Completion-0.91-1.fc10.src.rpm:1241476911 --- NEW FILE perl-Term-Completion.spec --- Name: perl-Term-Completion Version: 0.91 Release: 1%{?dist} # lib/Term/Completion.pm -> GPL+ or Artistic # lib/Term/Completion/_POSIX.pm -> GPL+ or Artistic # lib/Term/Completion/_readkey.pm -> GPL+ or Artistic # lib/Term/Completion/_stty.pm -> GPL+ or Artistic # lib/Term/Completion/_termsize.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Read one line of user input, with convenience functions Source: http://search.cpan.org/CPAN/authors/id/M/MA/MAREKR/Term-Completion-%{version}.tar.gz Url: http://search.cpan.org/dist/Term-Completion 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(IO::Handle) BuildRequires: perl(Term::ReadKey) >= 2.3 # test BuildRequires: perl(IO::String) BuildRequires: perl(POSIX) BuildRequires: perl(Test::More) BuildRequires: perl(Term::Size) %description Term::Completion is an extensible, highly configurable replacement for the venerable Term::Complete package. It is object-oriented and thus allows subclassing. Two derived classes are Term::Completion::Multi and Term::Completion::Path. A prompt is printed and the user may enter one line of input, submitting the answer by pressing the ENTER key. %prep %setup -q -n Term-Completion-%{version} find . -type f -exec chmod -c -x {} \; perl -pi -e 's|^#!/opt/perl_5.8.8/bin/perl|#!%{__perl}|' devel/tget.pl %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 # needed for testing... export COLUMNS=80 export LINES=25 make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README devel/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri May 01 2009 Chris Weyl 0.91-1 - submission * Fri May 01 2009 Chris Weyl 0.91-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Term-Completion/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:52:25 -0000 1.1 +++ .cvsignore 4 May 2009 22:42:01 -0000 1.2 @@ -0,0 +1 @@ +Term-Completion-0.91.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Term-Completion/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:52:26 -0000 1.1 +++ sources 4 May 2009 22:42:01 -0000 1.2 @@ -0,0 +1 @@ +6f5920facb98b20923559f57608bb6ef Term-Completion-0.91.tar.gz From bskeggs at fedoraproject.org Mon May 4 22:44:12 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 4 May 2009 22:44:12 +0000 (UTC) Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.44, 1.45 kernel.spec, 1.1588, 1.1589 Message-ID: <20090504224412.B3C8B700DB@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20857 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Tue May 05 2009 Ben Skeggs 2.6.29.2-127 - drm-nouveau.patch: bump dac load detection delay to match ddx drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- drm-nouveau.patch 3 May 2009 02:25:34 -0000 1.44 +++ drm-nouveau.patch 4 May 2009 22:44:10 -0000 1.45 @@ -23842,7 +23842,7 @@ index 0000000..87c6213 +} diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c new file mode 100644 -index 0000000..a83ee1b +index 0000000..771c7ab --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_connector.c @@ -0,0 +1,498 @@ @@ -24184,7 +24184,7 @@ index 0000000..a83ee1b + if (!obj) + continue; + encoder = to_nouveau_encoder(obj_to_encoder(obj)); -+ NV_ERROR(dev, " %d: %d", i, encoder->dcb->type); ++ NV_ERROR(dev, " %d: %d\n", i, encoder->dcb->type); + } + + return MODE_BAD; @@ -25309,7 +25309,7 @@ index 0000000..763cffe + diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c new file mode 100644 -index 0000000..e64c314 +index 0000000..9cebff4 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_dac.c @@ -0,0 +1,280 @@ @@ -25409,7 +25409,7 @@ index 0000000..e64c314 + + nv_wr32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or), + NV50_PDISPLAY_DAC_REGS_LOAD_CTRL_ACTIVE | load_pattern); -+ udelay(10000); /* give it some time to process */ ++ udelay(45000); /* give it some time to process */ + load_state = nv_rd32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or)); + + nv_wr32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or), 0); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1588 retrieving revision 1.1589 diff -u -p -r1.1588 -r1.1589 --- kernel.spec 4 May 2009 08:22:26 -0000 1.1588 +++ kernel.spec 4 May 2009 22:44:11 -0000 1.1589 @@ -1967,6 +1967,9 @@ fi # and build. %changelog +* Tue May 05 2009 Ben Skeggs 2.6.29.2-127 +- drm-nouveau.patch: bump dac load detection delay to match ddx + * Mon May 04 2009 Ben Skeggs 2.6.29.2-126 - Explicitly enable CONFIG_FB_MODE_HELPERS to fix build.. From bskeggs at fedoraproject.org Mon May 4 22:47:48 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 4 May 2009 22:47:48 +0000 (UTC) Subject: rpms/kernel/F-11 drm-nouveau.patch,1.45,1.46 Message-ID: <20090504224748.0D68370131@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21959 Modified Files: drm-nouveau.patch Log Message: drm-nouveau.patch: use mdelay instead.. drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- drm-nouveau.patch 4 May 2009 22:44:10 -0000 1.45 +++ drm-nouveau.patch 4 May 2009 22:47:47 -0000 1.46 @@ -25309,7 +25309,7 @@ index 0000000..763cffe + diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c new file mode 100644 -index 0000000..9cebff4 +index 0000000..ecd16d2 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_dac.c @@ -0,0 +1,280 @@ @@ -25409,7 +25409,7 @@ index 0000000..9cebff4 + + nv_wr32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or), + NV50_PDISPLAY_DAC_REGS_LOAD_CTRL_ACTIVE | load_pattern); -+ udelay(45000); /* give it some time to process */ ++ mdelay(45); /* give it some time to process */ + load_state = nv_rd32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or)); + + nv_wr32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or), 0); From iarnell at fedoraproject.org Mon May 4 23:13:30 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:13:30 +0000 (UTC) Subject: rpms/perl-Data-FormValidator-Constraints-DateTime/F-10 perl-Data-FormValidator-Constraints-DateTime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231331.31F1670139@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25815/F-10 Modified Files: .cvsignore sources Added Files: perl-Data-FormValidator-Constraints-DateTime.spec Log Message: initial import --- NEW FILE perl-Data-FormValidator-Constraints-DateTime.spec --- Name: perl-Data-FormValidator-Constraints-DateTime Version: 1.09 Release: 1%{?dist} Summary: D::FV constraints for dates and times License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-FormValidator-Constraints-DateTime/ Source0: http://www.cpan.org/authors/id/W/WO/WONKO/Data-FormValidator-Constraints-DateTime-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Data::FormValidator) BuildRequires: perl(DateTime) BuildRequires: perl(DateTime::Format::Builder) BuildRequires: perl(DateTime::Format::MySQL) BuildRequires: perl(DateTime::Format::Pg) BuildRequires: perl(DateTime::Format::Strptime) BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # undetected requires Requires: perl(DateTime::Format::MySQL) Requires: perl(DateTime::Format::Pg) %description This package provides constraint routines for Data::FormValidator for dealing with dates and times. It provides an easy mechanism for validating dates of any format (using strptime(3)) and transforming those dates (as long as you 'untaint' the fields) into valid DateTime objects, or into strings that would be properly formatted for various database engines. %prep %setup -q -n Data-FormValidator-Constraints-DateTime-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 1.09-1 - Specfile autogenerated by cpanspec 1.77. - Tweak requires/buildrequires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:47:35 -0000 1.1 +++ .cvsignore 4 May 2009 23:12:58 -0000 1.2 @@ -0,0 +1 @@ +Data-FormValidator-Constraints-DateTime-1.09.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:47:35 -0000 1.1 +++ sources 4 May 2009 23:12:58 -0000 1.2 @@ -0,0 +1 @@ +adec700adf05d817e09e890d99d9a339 Data-FormValidator-Constraints-DateTime-1.09.tar.gz From iarnell at fedoraproject.org Mon May 4 23:13:30 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:13:30 +0000 (UTC) Subject: rpms/perl-Data-FormValidator-Constraints-DateTime/devel perl-Data-FormValidator-Constraints-DateTime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231331.2A0AB70131@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25815/devel Modified Files: .cvsignore sources Added Files: perl-Data-FormValidator-Constraints-DateTime.spec Log Message: initial import --- NEW FILE perl-Data-FormValidator-Constraints-DateTime.spec --- Name: perl-Data-FormValidator-Constraints-DateTime Version: 1.09 Release: 1%{?dist} Summary: D::FV constraints for dates and times License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-FormValidator-Constraints-DateTime/ Source0: http://www.cpan.org/authors/id/W/WO/WONKO/Data-FormValidator-Constraints-DateTime-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Data::FormValidator) BuildRequires: perl(DateTime) BuildRequires: perl(DateTime::Format::Builder) BuildRequires: perl(DateTime::Format::MySQL) BuildRequires: perl(DateTime::Format::Pg) BuildRequires: perl(DateTime::Format::Strptime) BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # undetected requires Requires: perl(DateTime::Format::MySQL) Requires: perl(DateTime::Format::Pg) %description This package provides constraint routines for Data::FormValidator for dealing with dates and times. It provides an easy mechanism for validating dates of any format (using strptime(3)) and transforming those dates (as long as you 'untaint' the fields) into valid DateTime objects, or into strings that would be properly formatted for various database engines. %prep %setup -q -n Data-FormValidator-Constraints-DateTime-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 1.09-1 - Specfile autogenerated by cpanspec 1.77. - Tweak requires/buildrequires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:47:35 -0000 1.1 +++ .cvsignore 4 May 2009 23:13:00 -0000 1.2 @@ -0,0 +1 @@ +Data-FormValidator-Constraints-DateTime-1.09.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:47:35 -0000 1.1 +++ sources 4 May 2009 23:13:00 -0000 1.2 @@ -0,0 +1 @@ +adec700adf05d817e09e890d99d9a339 Data-FormValidator-Constraints-DateTime-1.09.tar.gz From iarnell at fedoraproject.org Mon May 4 23:13:30 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:13:30 +0000 (UTC) Subject: rpms/perl-Data-FormValidator-Constraints-DateTime/F-11 perl-Data-FormValidator-Constraints-DateTime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231331.211A8700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25815/F-11 Modified Files: .cvsignore sources Added Files: perl-Data-FormValidator-Constraints-DateTime.spec Log Message: initial import --- NEW FILE perl-Data-FormValidator-Constraints-DateTime.spec --- Name: perl-Data-FormValidator-Constraints-DateTime Version: 1.09 Release: 1%{?dist} Summary: D::FV constraints for dates and times License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-FormValidator-Constraints-DateTime/ Source0: http://www.cpan.org/authors/id/W/WO/WONKO/Data-FormValidator-Constraints-DateTime-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Data::FormValidator) BuildRequires: perl(DateTime) BuildRequires: perl(DateTime::Format::Builder) BuildRequires: perl(DateTime::Format::MySQL) BuildRequires: perl(DateTime::Format::Pg) BuildRequires: perl(DateTime::Format::Strptime) BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # undetected requires Requires: perl(DateTime::Format::MySQL) Requires: perl(DateTime::Format::Pg) %description This package provides constraint routines for Data::FormValidator for dealing with dates and times. It provides an easy mechanism for validating dates of any format (using strptime(3)) and transforming those dates (as long as you 'untaint' the fields) into valid DateTime objects, or into strings that would be properly formatted for various database engines. %prep %setup -q -n Data-FormValidator-Constraints-DateTime-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 1.09-1 - Specfile autogenerated by cpanspec 1.77. - Tweak requires/buildrequires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:47:35 -0000 1.1 +++ .cvsignore 4 May 2009 23:12:59 -0000 1.2 @@ -0,0 +1 @@ +Data-FormValidator-Constraints-DateTime-1.09.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:47:35 -0000 1.1 +++ sources 4 May 2009 23:12:59 -0000 1.2 @@ -0,0 +1 @@ +adec700adf05d817e09e890d99d9a339 Data-FormValidator-Constraints-DateTime-1.09.tar.gz From iarnell at fedoraproject.org Mon May 4 23:16:23 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:16:23 +0000 (UTC) Subject: rpms/perl-Class-Mix/F-10 perl-Class-Mix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231623.5E8F0700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Class-Mix/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26526/F-10 Modified Files: .cvsignore sources Added Files: perl-Class-Mix.spec Log Message: initial import --- NEW FILE perl-Class-Mix.spec --- Name: perl-Class-Mix Version: 0.002 Release: 1%{?dist} Summary: Dynamic class mixing License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Mix/ Source0: http://www.cpan.org/authors/id/Z/ZE/ZEFRAM/Class-Mix-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The mix_class function provided by this module dynamically generates 'anonymous' classes with specified inheritance. %prep %setup -q -n Class-Mix-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 0.002-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Mix/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:49:18 -0000 1.1 +++ .cvsignore 4 May 2009 23:15:52 -0000 1.2 @@ -0,0 +1 @@ +Class-Mix-0.002.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Mix/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:49:18 -0000 1.1 +++ sources 4 May 2009 23:15:53 -0000 1.2 @@ -0,0 +1 @@ +7773c6342f20370c4b40d468da031016 Class-Mix-0.002.tar.gz From iarnell at fedoraproject.org Mon May 4 23:16:23 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:16:23 +0000 (UTC) Subject: rpms/perl-Class-Mix/F-11 perl-Class-Mix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231623.A62E4700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Class-Mix/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26526/F-11 Modified Files: .cvsignore sources Added Files: perl-Class-Mix.spec Log Message: initial import --- NEW FILE perl-Class-Mix.spec --- Name: perl-Class-Mix Version: 0.002 Release: 1%{?dist} Summary: Dynamic class mixing License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Mix/ Source0: http://www.cpan.org/authors/id/Z/ZE/ZEFRAM/Class-Mix-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The mix_class function provided by this module dynamically generates 'anonymous' classes with specified inheritance. %prep %setup -q -n Class-Mix-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 0.002-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Mix/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:49:18 -0000 1.1 +++ .cvsignore 4 May 2009 23:15:53 -0000 1.2 @@ -0,0 +1 @@ +Class-Mix-0.002.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Mix/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:49:18 -0000 1.1 +++ sources 4 May 2009 23:15:53 -0000 1.2 @@ -0,0 +1 @@ +7773c6342f20370c4b40d468da031016 Class-Mix-0.002.tar.gz From iarnell at fedoraproject.org Mon May 4 23:16:24 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:16:24 +0000 (UTC) Subject: rpms/perl-Class-Mix/devel perl-Class-Mix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231624.1E2A9700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Class-Mix/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26526/devel Modified Files: .cvsignore sources Added Files: perl-Class-Mix.spec Log Message: initial import --- NEW FILE perl-Class-Mix.spec --- Name: perl-Class-Mix Version: 0.002 Release: 1%{?dist} Summary: Dynamic class mixing License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Mix/ Source0: http://www.cpan.org/authors/id/Z/ZE/ZEFRAM/Class-Mix-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The mix_class function provided by this module dynamically generates 'anonymous' classes with specified inheritance. %prep %setup -q -n Class-Mix-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 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 Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 0.002-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Mix/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:49:18 -0000 1.1 +++ .cvsignore 4 May 2009 23:15:53 -0000 1.2 @@ -0,0 +1 @@ +Class-Mix-0.002.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Mix/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:49:18 -0000 1.1 +++ sources 4 May 2009 23:15:53 -0000 1.2 @@ -0,0 +1 @@ +7773c6342f20370c4b40d468da031016 Class-Mix-0.002.tar.gz From iarnell at fedoraproject.org Mon May 4 23:19:27 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:19:27 +0000 (UTC) Subject: rpms/perl-Module-Pluggable-Ordered/F-10 perl-Module-Pluggable-Ordered.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231927.E31F770135@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27368/F-10 Modified Files: .cvsignore sources Added Files: perl-Module-Pluggable-Ordered.spec Log Message: initial import --- NEW FILE perl-Module-Pluggable-Ordered.spec --- Name: perl-Module-Pluggable-Ordered Version: 1.5 Release: 1%{?dist} Summary: Call module plugins in a specified order License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Pluggable-Ordered/ Source0: http://www.cpan.org/authors/id/A/AP/APEIRON/Module-Pluggable-Ordered-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Pluggable) >= 1.9 BuildRequires: perl(Test::More) BuildRequires: perl(UNIVERSAL::require) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module behaves exactly the same as Module::Pluggable, supporting all of its options, but also mixes in the call_plugins and plugins_ordered methods to your class. call_plugins acts a little like Class::Trigger; it takes the name of a method, and some parameters. Let's say we call it like so: %prep %setup -q -n Module-Pluggable-Ordered-%{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 * Mon May 04 2009 Iain Arnell 1.5-1 - Specfile autogenerated by cpanspec 1.77. - remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:50:07 -0000 1.1 +++ .cvsignore 4 May 2009 23:18:57 -0000 1.2 @@ -0,0 +1 @@ +Module-Pluggable-Ordered-1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:50:08 -0000 1.1 +++ sources 4 May 2009 23:18:57 -0000 1.2 @@ -0,0 +1 @@ +a9a33859fa3ff61a845035d44a2f73e8 Module-Pluggable-Ordered-1.5.tar.gz From iarnell at fedoraproject.org Mon May 4 23:19:28 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:19:28 +0000 (UTC) Subject: rpms/perl-Module-Pluggable-Ordered/F-11 perl-Module-Pluggable-Ordered.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231928.59EA770135@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27368/F-11 Modified Files: .cvsignore sources Added Files: perl-Module-Pluggable-Ordered.spec Log Message: initial import --- NEW FILE perl-Module-Pluggable-Ordered.spec --- Name: perl-Module-Pluggable-Ordered Version: 1.5 Release: 1%{?dist} Summary: Call module plugins in a specified order License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Pluggable-Ordered/ Source0: http://www.cpan.org/authors/id/A/AP/APEIRON/Module-Pluggable-Ordered-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Pluggable) >= 1.9 BuildRequires: perl(Test::More) BuildRequires: perl(UNIVERSAL::require) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module behaves exactly the same as Module::Pluggable, supporting all of its options, but also mixes in the call_plugins and plugins_ordered methods to your class. call_plugins acts a little like Class::Trigger; it takes the name of a method, and some parameters. Let's say we call it like so: %prep %setup -q -n Module-Pluggable-Ordered-%{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 * Mon May 04 2009 Iain Arnell 1.5-1 - Specfile autogenerated by cpanspec 1.77. - remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:50:07 -0000 1.1 +++ .cvsignore 4 May 2009 23:18:57 -0000 1.2 @@ -0,0 +1 @@ +Module-Pluggable-Ordered-1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:50:08 -0000 1.1 +++ sources 4 May 2009 23:18:57 -0000 1.2 @@ -0,0 +1 @@ +a9a33859fa3ff61a845035d44a2f73e8 Module-Pluggable-Ordered-1.5.tar.gz From iarnell at fedoraproject.org Mon May 4 23:19:28 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:19:28 +0000 (UTC) Subject: rpms/perl-Module-Pluggable-Ordered/devel perl-Module-Pluggable-Ordered.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504231929.0044470135@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27368/devel Modified Files: .cvsignore sources Added Files: perl-Module-Pluggable-Ordered.spec Log Message: initial import --- NEW FILE perl-Module-Pluggable-Ordered.spec --- Name: perl-Module-Pluggable-Ordered Version: 1.5 Release: 1%{?dist} Summary: Call module plugins in a specified order License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Pluggable-Ordered/ Source0: http://www.cpan.org/authors/id/A/AP/APEIRON/Module-Pluggable-Ordered-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Pluggable) >= 1.9 BuildRequires: perl(Test::More) BuildRequires: perl(UNIVERSAL::require) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module behaves exactly the same as Module::Pluggable, supporting all of its options, but also mixes in the call_plugins and plugins_ordered methods to your class. call_plugins acts a little like Class::Trigger; it takes the name of a method, and some parameters. Let's say we call it like so: %prep %setup -q -n Module-Pluggable-Ordered-%{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 * Mon May 04 2009 Iain Arnell 1.5-1 - Specfile autogenerated by cpanspec 1.77. - remove explicit requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:50:07 -0000 1.1 +++ .cvsignore 4 May 2009 23:18:58 -0000 1.2 @@ -0,0 +1 @@ +Module-Pluggable-Ordered-1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:50:08 -0000 1.1 +++ sources 4 May 2009 23:18:58 -0000 1.2 @@ -0,0 +1 @@ +a9a33859fa3ff61a845035d44a2f73e8 Module-Pluggable-Ordered-1.5.tar.gz From iarnell at fedoraproject.org Mon May 4 23:21:03 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:21:03 +0000 (UTC) Subject: rpms/perl-Text-Context-EitherSide/F-11 perl-Text-Context-EitherSide.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504232103.386B9700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Text-Context-EitherSide/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28221/F-11 Modified Files: .cvsignore sources Added Files: perl-Text-Context-EitherSide.spec Log Message: initial import --- NEW FILE perl-Text-Context-EitherSide.spec --- Name: perl-Text-Context-EitherSide Version: 1.4 Release: 1%{?dist} Summary: Get n words either side of search keywords License: Artistic 2.0 Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Context-EitherSide/ Source0: http://www.cpan.org/authors/id/T/TM/TMTM/Text-Context-EitherSide-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Suppose you have a large piece of text - typically, say, a web page or a mail message. And now suppose you've done some kind of full-text search on that text for a bunch of keywords, and you want to display the context in which you found the keywords inside the body of the text. %prep %setup -q -n Text-Context-EitherSide-%{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 * Mon May 04 2009 Iain Arnell 1.4-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Context-EitherSide/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:51:54 -0000 1.1 +++ .cvsignore 4 May 2009 23:20:32 -0000 1.2 @@ -0,0 +1 @@ +Text-Context-EitherSide-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Context-EitherSide/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:51:54 -0000 1.1 +++ sources 4 May 2009 23:20:32 -0000 1.2 @@ -0,0 +1 @@ +5b4c816c9df69cd717393fbeab846ea1 Text-Context-EitherSide-1.4.tar.gz From iarnell at fedoraproject.org Mon May 4 23:21:02 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:21:02 +0000 (UTC) Subject: rpms/perl-Text-Context-EitherSide/F-10 perl-Text-Context-EitherSide.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504232102.B45DF700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Text-Context-EitherSide/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28221/F-10 Modified Files: .cvsignore sources Added Files: perl-Text-Context-EitherSide.spec Log Message: initial import --- NEW FILE perl-Text-Context-EitherSide.spec --- Name: perl-Text-Context-EitherSide Version: 1.4 Release: 1%{?dist} Summary: Get n words either side of search keywords License: Artistic 2.0 Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Context-EitherSide/ Source0: http://www.cpan.org/authors/id/T/TM/TMTM/Text-Context-EitherSide-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Suppose you have a large piece of text - typically, say, a web page or a mail message. And now suppose you've done some kind of full-text search on that text for a bunch of keywords, and you want to display the context in which you found the keywords inside the body of the text. %prep %setup -q -n Text-Context-EitherSide-%{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 * Mon May 04 2009 Iain Arnell 1.4-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Context-EitherSide/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:51:54 -0000 1.1 +++ .cvsignore 4 May 2009 23:20:32 -0000 1.2 @@ -0,0 +1 @@ +Text-Context-EitherSide-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Context-EitherSide/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:51:54 -0000 1.1 +++ sources 4 May 2009 23:20:32 -0000 1.2 @@ -0,0 +1 @@ +5b4c816c9df69cd717393fbeab846ea1 Text-Context-EitherSide-1.4.tar.gz From iarnell at fedoraproject.org Mon May 4 23:21:03 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:21:03 +0000 (UTC) Subject: rpms/perl-Text-Context-EitherSide/devel perl-Text-Context-EitherSide.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504232103.956EB70135@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Text-Context-EitherSide/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28221/devel Modified Files: .cvsignore sources Added Files: perl-Text-Context-EitherSide.spec Log Message: initial import --- NEW FILE perl-Text-Context-EitherSide.spec --- Name: perl-Text-Context-EitherSide Version: 1.4 Release: 1%{?dist} Summary: Get n words either side of search keywords License: Artistic 2.0 Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Context-EitherSide/ Source0: http://www.cpan.org/authors/id/T/TM/TMTM/Text-Context-EitherSide-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Suppose you have a large piece of text - typically, say, a web page or a mail message. And now suppose you've done some kind of full-text search on that text for a bunch of keywords, and you want to display the context in which you found the keywords inside the body of the text. %prep %setup -q -n Text-Context-EitherSide-%{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 * Mon May 04 2009 Iain Arnell 1.4-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Context-EitherSide/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:51:54 -0000 1.1 +++ .cvsignore 4 May 2009 23:20:33 -0000 1.2 @@ -0,0 +1 @@ +Text-Context-EitherSide-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Context-EitherSide/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:51:54 -0000 1.1 +++ sources 4 May 2009 23:20:33 -0000 1.2 @@ -0,0 +1 @@ +5b4c816c9df69cd717393fbeab846ea1 Text-Context-EitherSide-1.4.tar.gz From iarnell at fedoraproject.org Mon May 4 23:24:19 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:24:19 +0000 (UTC) Subject: rpms/perl-HTML-Toc/F-10 man3pods.patch, NONE, 1.1 perl-HTML-Toc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504232419.AD362700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-Toc/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29089/F-10 Modified Files: .cvsignore sources Added Files: man3pods.patch perl-HTML-Toc.spec Log Message: initial import man3pods.patch: --- NEW FILE man3pods.patch --- diff -up HTML-Toc-1.11/Makefile.PL.orig HTML-Toc-1.11/Makefile.PL --- HTML-Toc-1.11/Makefile.PL.orig 2009-04-13 09:09:41.000000000 +0200 +++ HTML-Toc-1.11/Makefile.PL 2009-05-04 15:28:30.000000000 +0200 @@ -6,7 +6,7 @@ WriteMakefile( AUTHOR => 'Freddy Vulto (fvulto at gmail.com)', ABSTRACT => 'Generate, insert and update HTML Table of Contents', PREREQ_PM => {'HTML::Parser' => 0}, - MAN3PODS => {}, +# MAN3PODS => {}, ); package MY; # so that "SUPER" works right --- NEW FILE perl-HTML-Toc.spec --- Name: perl-HTML-Toc Version: 1.11 Release: 1%{?dist} Summary: Generate, insert and update HTML Table of Contents License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-Toc/ Source0: http://www.cpan.org/authors/id/F/FV/FVULTO/HTML-Toc-%{version}.tar.gz # don't skip man pages Patch0: man3pods.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Parser) BuildRequires: perl(Test::Differences) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Generate, insert and update HTML Table of Contents (ToC). %prep %setup -q -n HTML-Toc-%{version} %patch0 -p 1 find . -type f | xargs chmod 0644 cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(HTML::_/d' EOF %global __perl_provides %{_builddir}/HTML-Toc-%{version}/%{name}-prov chmod +x %{__perl_provides} %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 %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 1.11-1 - Specfile autogenerated by cpanspec 1.77. - Ensure that man pages are generated - Filter private provides Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Toc/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:52:40 -0000 1.1 +++ .cvsignore 4 May 2009 23:23:49 -0000 1.2 @@ -0,0 +1 @@ +HTML-Toc-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Toc/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:52:40 -0000 1.1 +++ sources 4 May 2009 23:23:49 -0000 1.2 @@ -0,0 +1 @@ +65474641c6294ff64e1d065fe0843d9a HTML-Toc-1.11.tar.gz From iarnell at fedoraproject.org Mon May 4 23:24:19 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:24:19 +0000 (UTC) Subject: rpms/perl-HTML-Toc/F-11 man3pods.patch, NONE, 1.1 perl-HTML-Toc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504232419.ECC7C700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-Toc/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29089/F-11 Modified Files: .cvsignore sources Added Files: man3pods.patch perl-HTML-Toc.spec Log Message: initial import man3pods.patch: --- NEW FILE man3pods.patch --- diff -up HTML-Toc-1.11/Makefile.PL.orig HTML-Toc-1.11/Makefile.PL --- HTML-Toc-1.11/Makefile.PL.orig 2009-04-13 09:09:41.000000000 +0200 +++ HTML-Toc-1.11/Makefile.PL 2009-05-04 15:28:30.000000000 +0200 @@ -6,7 +6,7 @@ WriteMakefile( AUTHOR => 'Freddy Vulto (fvulto at gmail.com)', ABSTRACT => 'Generate, insert and update HTML Table of Contents', PREREQ_PM => {'HTML::Parser' => 0}, - MAN3PODS => {}, +# MAN3PODS => {}, ); package MY; # so that "SUPER" works right --- NEW FILE perl-HTML-Toc.spec --- Name: perl-HTML-Toc Version: 1.11 Release: 1%{?dist} Summary: Generate, insert and update HTML Table of Contents License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-Toc/ Source0: http://www.cpan.org/authors/id/F/FV/FVULTO/HTML-Toc-%{version}.tar.gz # don't skip man pages Patch0: man3pods.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Parser) BuildRequires: perl(Test::Differences) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Generate, insert and update HTML Table of Contents (ToC). %prep %setup -q -n HTML-Toc-%{version} %patch0 -p 1 find . -type f | xargs chmod 0644 cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(HTML::_/d' EOF %global __perl_provides %{_builddir}/HTML-Toc-%{version}/%{name}-prov chmod +x %{__perl_provides} %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 %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 1.11-1 - Specfile autogenerated by cpanspec 1.77. - Ensure that man pages are generated - Filter private provides Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Toc/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:52:40 -0000 1.1 +++ .cvsignore 4 May 2009 23:23:49 -0000 1.2 @@ -0,0 +1 @@ +HTML-Toc-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Toc/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:52:40 -0000 1.1 +++ sources 4 May 2009 23:23:49 -0000 1.2 @@ -0,0 +1 @@ +65474641c6294ff64e1d065fe0843d9a HTML-Toc-1.11.tar.gz From iarnell at fedoraproject.org Mon May 4 23:24:20 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:24:20 +0000 (UTC) Subject: rpms/perl-HTML-Toc/devel man3pods.patch, NONE, 1.1 perl-HTML-Toc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504232420.76C35700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-Toc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29089/devel Modified Files: .cvsignore sources Added Files: man3pods.patch perl-HTML-Toc.spec Log Message: initial import man3pods.patch: --- NEW FILE man3pods.patch --- diff -up HTML-Toc-1.11/Makefile.PL.orig HTML-Toc-1.11/Makefile.PL --- HTML-Toc-1.11/Makefile.PL.orig 2009-04-13 09:09:41.000000000 +0200 +++ HTML-Toc-1.11/Makefile.PL 2009-05-04 15:28:30.000000000 +0200 @@ -6,7 +6,7 @@ WriteMakefile( AUTHOR => 'Freddy Vulto (fvulto at gmail.com)', ABSTRACT => 'Generate, insert and update HTML Table of Contents', PREREQ_PM => {'HTML::Parser' => 0}, - MAN3PODS => {}, +# MAN3PODS => {}, ); package MY; # so that "SUPER" works right --- NEW FILE perl-HTML-Toc.spec --- Name: perl-HTML-Toc Version: 1.11 Release: 1%{?dist} Summary: Generate, insert and update HTML Table of Contents License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-Toc/ Source0: http://www.cpan.org/authors/id/F/FV/FVULTO/HTML-Toc-%{version}.tar.gz # don't skip man pages Patch0: man3pods.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::Parser) BuildRequires: perl(Test::Differences) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Generate, insert and update HTML Table of Contents (ToC). %prep %setup -q -n HTML-Toc-%{version} %patch0 -p 1 find . -type f | xargs chmod 0644 cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(HTML::_/d' EOF %global __perl_provides %{_builddir}/HTML-Toc-%{version}/%{name}-prov chmod +x %{__perl_provides} %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 %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 1.11-1 - Specfile autogenerated by cpanspec 1.77. - Ensure that man pages are generated - Filter private provides Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Toc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:52:40 -0000 1.1 +++ .cvsignore 4 May 2009 23:23:49 -0000 1.2 @@ -0,0 +1 @@ +HTML-Toc-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Toc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:52:40 -0000 1.1 +++ sources 4 May 2009 23:23:50 -0000 1.2 @@ -0,0 +1 @@ +65474641c6294ff64e1d065fe0843d9a HTML-Toc-1.11.tar.gz From iarnell at fedoraproject.org Mon May 4 23:25:45 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:25:45 +0000 (UTC) Subject: rpms/perl-XML-TokeParser/F-10 perl-XML-TokeParser.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504232545.D6118700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-XML-TokeParser/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29469/F-10 Modified Files: sources Added Files: perl-XML-TokeParser.spec Log Message: initial import --- NEW FILE perl-XML-TokeParser.spec --- Name: perl-XML-TokeParser Version: 0.05 Release: 1%{?dist} Summary: Simplified interface to XML::Parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/XML-TokeParser/ Source0: http://www.cpan.org/authors/id/P/PO/PODMASTER/XML-TokeParser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(XML::Parser) >= 2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description XML::TokeParser provides a procedural ("pull mode") interface to XML::Parser in much the same way that Gisle Aas' HTML::TokeParser provides a procedural interface to HTML::Parser. XML::TokeParser splits its XML input up into "tokens," each corresponding to an XML::Parser event. %prep %setup -q -n XML-TokeParser-%{version} find . -type f | xargs sed -i -e 's/\r//' find . -type f | xargs chmod 0644 %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 TODO TokeParser.xml %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 0.05-1 - Specfile autogenerated by cpanspec 1.77. - Fix line-endings and permissions Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-TokeParser/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:53:36 -0000 1.1 +++ sources 4 May 2009 23:25:15 -0000 1.2 @@ -0,0 +1 @@ +a886ac451d99dca522df20d7cf7b28b4 XML-TokeParser-0.05.tar.gz From iarnell at fedoraproject.org Mon May 4 23:25:46 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:25:46 +0000 (UTC) Subject: rpms/perl-XML-TokeParser/F-11 perl-XML-TokeParser.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090504232546.4403C700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-XML-TokeParser/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29469/F-11 Modified Files: sources Added Files: perl-XML-TokeParser.spec Log Message: initial import --- NEW FILE perl-XML-TokeParser.spec --- Name: perl-XML-TokeParser Version: 0.05 Release: 1%{?dist} Summary: Simplified interface to XML::Parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/XML-TokeParser/ Source0: http://www.cpan.org/authors/id/P/PO/PODMASTER/XML-TokeParser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(XML::Parser) >= 2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description XML::TokeParser provides a procedural ("pull mode") interface to XML::Parser in much the same way that Gisle Aas' HTML::TokeParser provides a procedural interface to HTML::Parser. XML::TokeParser splits its XML input up into "tokens," each corresponding to an XML::Parser event. %prep %setup -q -n XML-TokeParser-%{version} find . -type f | xargs sed -i -e 's/\r//' find . -type f | xargs chmod 0644 %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 TODO TokeParser.xml %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 0.05-1 - Specfile autogenerated by cpanspec 1.77. - Fix line-endings and permissions Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-TokeParser/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:53:36 -0000 1.1 +++ sources 4 May 2009 23:25:15 -0000 1.2 @@ -0,0 +1 @@ +a886ac451d99dca522df20d7cf7b28b4 XML-TokeParser-0.05.tar.gz From iarnell at fedoraproject.org Mon May 4 23:25:46 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Mon, 4 May 2009 23:25:46 +0000 (UTC) Subject: rpms/perl-XML-TokeParser/devel perl-XML-TokeParser.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090504232546.B0EFB700DB@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-XML-TokeParser/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29469/devel Modified Files: .cvsignore sources Added Files: perl-XML-TokeParser.spec Log Message: initial import --- NEW FILE perl-XML-TokeParser.spec --- Name: perl-XML-TokeParser Version: 0.05 Release: 1%{?dist} Summary: Simplified interface to XML::Parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/XML-TokeParser/ Source0: http://www.cpan.org/authors/id/P/PO/PODMASTER/XML-TokeParser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(XML::Parser) >= 2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description XML::TokeParser provides a procedural ("pull mode") interface to XML::Parser in much the same way that Gisle Aas' HTML::TokeParser provides a procedural interface to HTML::Parser. XML::TokeParser splits its XML input up into "tokens," each corresponding to an XML::Parser event. %prep %setup -q -n XML-TokeParser-%{version} find . -type f | xargs sed -i -e 's/\r//' find . -type f | xargs chmod 0644 %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 TODO TokeParser.xml %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 04 2009 Iain Arnell 0.05-1 - Specfile autogenerated by cpanspec 1.77. - Fix line-endings and permissions Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-TokeParser/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:53:36 -0000 1.1 +++ .cvsignore 4 May 2009 23:25:16 -0000 1.2 @@ -0,0 +1 @@ +XML-TokeParser-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-TokeParser/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:53:36 -0000 1.1 +++ sources 4 May 2009 23:25:16 -0000 1.2 @@ -0,0 +1 @@ +a886ac451d99dca522df20d7cf7b28b4 XML-TokeParser-0.05.tar.gz From whot at fedoraproject.org Mon May 4 23:42:36 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Mon, 4 May 2009 23:42:36 +0000 (UTC) Subject: rpms/xorg-x11-drv-synaptics/F-11 synaptics-1.1.0-edges.patch, NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.28, 1.29 Message-ID: <20090504234236.4C924700DB@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31631 Modified Files: xorg-x11-drv-synaptics.spec Added Files: synaptics-1.1.0-edges.patch Log Message: * Tue May 05 2009 Peter Hutterer 1.1.0-4 - synaptics-1.1.0-edges.patch: Set default edge sizes depending on model (#494766). synaptics-1.1.0-edges.patch: --- NEW FILE synaptics-1.1.0-edges.patch --- >From 52e72fb741f469d82c6c859e17e055d8cb77bcfa Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 1 May 2009 13:37:44 +1000 Subject: [PATCH] Add TouchpadModel specifier and scale the edges accordingly. (#21214) ALPS models need different edge settings than synaptics pads to make the edges work propertly. So try to auto-detect the model (eventcomm anyway) and set the edges accordingly. New edge defaults are: synaptics: 7% of the total width alps: 15% of the total width unknown: 4% of the total width (see Synaptics UI guide) X.Org Bug 21214 Signed-off-by: Peter Hutterer --- src/eventcomm.c | 19 +++++++++++++++++++ src/synaptics.c | 20 +++++++++++++++++--- src/synapticsstr.h | 8 ++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/eventcomm.c b/src/eventcomm.c index 3e4c074..3b03695 100644 --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -115,6 +115,24 @@ event_query_is_touchpad(int fd) return TRUE; } +static void +event_query_info(LocalDevicePtr local) +{ + SynapticsPrivate *priv = (SynapticsPrivate *)local->private; + short id[4]; + int rc; + + SYSCALL(rc = ioctl(local->fd, EVIOCGID, id)); + if (rc < 0) + return; + + if (id[ID_VENDOR] == 0x2 && id[ID_PRODUCT] == 0x7) + priv->model = MODEL_SYNAPTICS; + else if (id[ID_VENDOR] == 0x2 && id[ID_PRODUCT] == 0x8) + priv->model = MODEL_ALPS; + +} + /* Query device for axis ranges */ static void event_query_axis_ranges(LocalDevicePtr local) @@ -360,6 +378,7 @@ EventReadDevDimensions(LocalDevicePtr local) { if (event_query_is_touchpad(local->fd)) event_query_axis_ranges(local); + event_query_info(local); } static Bool diff --git a/src/synaptics.c b/src/synaptics.c index 2383c38..ee1239a 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -318,7 +318,10 @@ static void set_default_parameters(LocalDevicePtr local) /* The synaptics specs specify typical edge widths of 4% on x, and 5.4% on * y (page 7) [Synaptics TouchPad Interfacing Guide, 510-000080 - A * Second Edition, http://www.synaptics.com/support/dev_support.cfm, 8 Sep - * 2008] + * 2008]. We use 7% for both instead for synaptics devices, and 15% for + * ALPS models. + * http://bugs.freedesktop.org/show_bug.cgi?id=21214 + * * If the range was autodetected, apply these edge widths to all four * sides. */ @@ -330,8 +333,19 @@ static void set_default_parameters(LocalDevicePtr local) width = abs(priv->maxx - priv->minx); height = abs(priv->maxy - priv->miny); diag = sqrt(width * width + height * height); - ewidth = width * .04; - eheight = height * .055; + if (priv->model == MODEL_SYNAPTICS) + { + ewidth = width * .07; + eheight = height * .07; + } else if (priv->model == MODEL_ALPS) + { + ewidth = width * .15; + eheight = height * .15; + } else + { + ewidth = width * .04; + eheight = height * .04; + } l = priv->minx + ewidth; r = priv->maxx - ewidth; diff --git a/src/synapticsstr.h b/src/synapticsstr.h index 688167c..f518c11 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -79,6 +79,12 @@ enum TapButtonState { TBS_BUTTON_DOWN_UP /* Send button down event + set up state */ }; +enum TouchpadModel { + MODEL_UNKNOWN = 0, + MODEL_SYNAPTICS, + MODEL_ALPS +}; + typedef struct _SynapticsPrivateRec { SynapticsSHM synpara_default; /* Default parameter settings, read from @@ -146,6 +152,8 @@ typedef struct _SynapticsPrivateRec Bool has_double; /* double click detected for this device */ Bool has_triple; /* triple click detected for this device */ Bool has_pressure; /* device reports pressure */ + + enum TouchpadModel model; /* The detected model */ } SynapticsPrivate; #endif /* _SYNAPTICSSTR_H_ */ -- 1.6.3.rc1.1.g81c43.dirty Index: xorg-x11-drv-synaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11/xorg-x11-drv-synaptics.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- xorg-x11-drv-synaptics.spec 15 Apr 2009 21:47:07 -0000 1.28 +++ xorg-x11-drv-synaptics.spec 4 May 2009 23:42:04 -0000 1.29 @@ -7,7 +7,7 @@ Name: xorg-x11-drv-synaptics Summary: Xorg X11 Synaptics touchpad input driver Version: 1.1.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -20,6 +20,7 @@ Source2: make-git-snapshot.sh Patch1: synaptics-1.1.0-synclient-64.patch Patch2: synaptics-1.1.0-allocate-timer-early.patch +Patch3: synaptics-1.1.0-edges.patch ExcludeArch: s390 s390x @@ -79,6 +80,7 @@ Features: %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf -v --install --force || exit 1 @@ -127,6 +129,10 @@ Development files for the Synaptics Touc %changelog +* Tue May 05 2009 Peter Hutterer 1.1.0-4 +- synaptics-1.1.0-edges.patch: Set default edge sizes depending on model + (#494766). + * Wed Apr 15 2009 Adam Jackson 1.1.0-3 - synaptics-1.1.0-allocate-timer-early.patch: Allocate the timer early so we don't try to malloc it within a sigio handler. From bkoz at fedoraproject.org Mon May 4 23:45:40 2009 From: bkoz at fedoraproject.org (Benjamin Kosnik) Date: Mon, 4 May 2009 23:45:40 +0000 (UTC) Subject: rpms/boost/devel boost.spec,1.59,1.60 Message-ID: <20090504234540.249B8700DB@cvs1.fedora.phx.redhat.com> Author: bkoz Update of /cvs/pkgs/rpms/boost/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31988 Modified Files: boost.spec Log Message: * Mon May 04 2009 Benjamin Kosnik - 1.37.0-7 - Rebuild for libicu bump. Index: boost.spec =================================================================== RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- boost.spec 23 Mar 2009 14:27:08 -0000 1.59 +++ boost.spec 4 May 2009 23:45:09 -0000 1.60 @@ -4,7 +4,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.37.0 -Release: 6%{?dist} +Release: 7%{?dist} License: Boost URL: http://www.boost.org/ Group: System Environment/Libraries @@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version} %changelog +* Mon May 04 2009 Benjamin Kosnik - 1.37.0-7 +- Rebuild for libicu bump. + * Mon Mar 23 2009 Petr Machata - 1.37.0-6 - Apply a SMP patch from Stefan Ring - Apply a workaround for "cannot appear in a constant-expression" in From cchance at fedoraproject.org Tue May 5 01:33:01 2009 From: cchance at fedoraproject.org (Caius Chance) Date: Tue, 5 May 2009 01:33:01 +0000 (UTC) Subject: rpms/cjkunifonts/F-10 CIDFnmap.zh_CN, 1.2, 1.3 CIDFnmap.zh_TW, 1.2, 1.3 FAPIcidfmap.zh_CN, 1.2, 1.3 FAPIcidfmap.zh_TW, 1.2, 1.3 cidfmap.zh_CN, 1.2, 1.3 cidfmap.zh_TW, 1.2, 1.3 cjkunifonts.spec, 1.25, 1.26 Message-ID: <20090505013301.D5A0770108@cvs1.fedora.phx.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/cjkunifonts/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13305 Modified Files: CIDFnmap.zh_CN CIDFnmap.zh_TW FAPIcidfmap.zh_CN FAPIcidfmap.zh_TW cidfmap.zh_CN cidfmap.zh_TW cjkunifonts.spec Log Message: resolves: rhbz#488398 update path name of cidpmaps Index: CIDFnmap.zh_CN =================================================================== RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/CIDFnmap.zh_CN,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- CIDFnmap.zh_CN 8 Apr 2009 06:24:45 -0000 1.2 +++ CIDFnmap.zh_CN 5 May 2009 01:32:30 -0000 1.3 @@ -25,8 +25,8 @@ % Adobe-GB1 -/BousungEG-Light-GB (/usr/share/fonts/cjkuni/uming.ttc) ; -/GBZenKai-Medium (/usr/share/fonts/cjkuni/ukai.ttc) ; +/BousungEG-Light-GB (/usr/share/fonts/cjkunifonts-uming/uming.ttc) ; +/GBZenKai-Medium (/usr/share/fonts/cjkunifonts-ukai/ukai.ttc) ; /Adobe-GB1 /BousungEG-Light-GB ; /MSungGBK-Light /BousungEG-Light-GB ; Index: CIDFnmap.zh_TW =================================================================== RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/CIDFnmap.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- CIDFnmap.zh_TW 8 Apr 2009 06:24:45 -0000 1.2 +++ CIDFnmap.zh_TW 5 May 2009 01:32:30 -0000 1.3 @@ -25,8 +25,8 @@ % Adobe-CNS1 -/ZenKai-Medium (/usr/share/fonts/cjkuni/ukai.ttc) ; -/ShanHeiSun-Light (/usr/share/fonts/cjkuni/uming.ttc) ; +/ZenKai-Medium (/usr/share/fonts/cjkunifonts-ukai/ukai.ttc) ; +/ShanHeiSun-Light (/usr/share/fonts/cjkunifonts-uming/uming.ttc) ; /Adobe-CNS1 /ShanHeiSun-Light ; Index: FAPIcidfmap.zh_CN =================================================================== RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/FAPIcidfmap.zh_CN,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- FAPIcidfmap.zh_CN 8 Apr 2009 06:24:45 -0000 1.2 +++ FAPIcidfmap.zh_CN 5 May 2009 01:32:30 -0000 1.3 @@ -22,8 +22,8 @@ % % Use regular Postscript syntax. % -/BousungEG-Light-GB << /Path (/usr/share/fonts/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; -/GBZenKai-Medium << /Path (/usr/share/fonts/cjkuni/ukai.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; +/BousungEG-Light-GB << /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; +/GBZenKai-Medium << /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; % -/MSungGBK-Light << /Path (/usr/share/fonts/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; -/Adobe-GB1 << /Path (/usr/share/fonts/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; +/MSungGBK-Light << /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; +/Adobe-GB1 << /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; Index: FAPIcidfmap.zh_TW =================================================================== RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/FAPIcidfmap.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- FAPIcidfmap.zh_TW 8 Apr 2009 06:24:45 -0000 1.2 +++ FAPIcidfmap.zh_TW 5 May 2009 01:32:30 -0000 1.3 @@ -22,7 +22,7 @@ % % Use regular Postscript syntax. % -/ZenKai-Medium << /Path (/usr/share/fonts/chinese/cjkuni/ukai.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; -/ShanHeiSun-Light << /Path (/usr/share/fonts/chinese/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; +/ZenKai-Medium << /Path (/usr/share/fonts/chinese/cjkunifonts-ukai/ukai.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; +/ShanHeiSun-Light << /Path (/usr/share/fonts/chinese/cjkunifonts-uming/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; % -/Adobe-CNS1 << /Path (/usr/share/fonts/chinese/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; +/Adobe-CNS1 << /Path (/usr/share/fonts/chinese/cjkunifonts-uming/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; Index: cidfmap.zh_CN =================================================================== RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/cidfmap.zh_CN,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- cidfmap.zh_CN 8 Apr 2009 06:24:45 -0000 1.2 +++ cidfmap.zh_CN 5 May 2009 01:32:30 -0000 1.3 @@ -1,5 +1,5 @@ -/BousungEG-Light-GB << /FileType /TrueType /Path (/usr/share/fonts/cjkuni/uming.ttc) /CSI [(GB1) 4] >> ; -/GBZenKai-Medium << /FileType /TrueType /Path (/usr/share/fonts/cjkuni/ukai.ttc) /CSI [(GB1) 4] >> ; +/BousungEG-Light-GB << /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttc) /CSI [(GB1) 4] >> ; +/GBZenKai-Medium << /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttc) /CSI [(GB1) 4] >> ; /MSungGBK-Light /BousungEG-Light-GB ; /Adobe-GB1 /BousungEG-Light-GB ; Index: cidfmap.zh_TW =================================================================== RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/cidfmap.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- cidfmap.zh_TW 8 Apr 2009 06:24:45 -0000 1.2 +++ cidfmap.zh_TW 5 May 2009 01:32:30 -0000 1.3 @@ -1,4 +1,4 @@ -/ZenKai-Medium << /FileType /TrueType /Path (/usr/share/fonts/cjkuni/ukai.ttc) /CSI [(CNS1) 4] >> ; -/ShanHeiSun-Light << /FileType /TrueType /Path (/usr/share/fonts/cjkuni/uming.ttc) /CSI [(CNS1) 4] >> ; +/ZenKai-Medium << /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttc) /CSI [(CNS1) 4] >> ; +/ShanHeiSun-Light << /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttc) /CSI [(CNS1) 4] >> ; /Adobe-CNS1 /ShanHeiSun-Light ; Index: cjkunifonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/cjkunifonts.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- cjkunifonts.spec 8 Apr 2009 06:29:46 -0000 1.25 +++ cjkunifonts.spec 5 May 2009 01:32:30 -0000 1.26 @@ -9,7 +9,7 @@ Name: cjkunifonts Version: 0.2.20080216.1 -Release: 12.fc10 +Release: 13.fc10 Summary: Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face License: Arphic Group: User Interface/X @@ -203,6 +203,10 @@ fi %{catalogue}/%{name}-ukai %changelog +* Tue May 05 2009 Caius 'kaio' Chance - + 0.2.20080216.1-13.fc10 +- Resolves: rhbz#488398 Updated path name of cidfmaps. + * Wed Apr 08 2009 Caius 'kaio' Chance - 0.2.20080216.1-12.fc10 - Resolves: rhbz#488398 Fixed ghostscript files referred to outdated font info. From dcantrel at fedoraproject.org Tue May 5 01:38:49 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Tue, 5 May 2009 01:38:49 +0000 (UTC) Subject: rpms/anaconda/F-11 .cvsignore, 1.639, 1.640 anaconda.spec, 1.790, 1.791 sources, 1.773, 1.774 Message-ID: <20090505013849.4614A70108@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/anaconda/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14071 Modified Files: .cvsignore anaconda.spec sources Log Message: * Mon May 04 2009 David Cantrell - 11.5.0.49-1 - Collect network interfaces from NetworkManager (#493995) (dcantrell) - Handle fstab entries whose filesystem we don't recognize.(#498120) (dlehman) - Add an error signifying an unrecognized entry in /etc/fstab. (dlehman) - Don't drop discovered format with unknown devices when parsing fstab. (dlehman) - Fix display of paths for device-mapper device in bootloader widget. (dlehman) - Don't call udevDeviceFormat if we're just going to clear the device (#497323). (clumens) - Pass clearPartType to the devicetree as well. (clumens) - Break the complex should-clear logic out of clearPartitions. (clumens) - Handle clearpart in the early kickstart pass too. (clumens) - Correct setting the SELinux context on mountpoints (#494995). (clumens) - make resetFileContext return the context set (wwoods) - Allow editing of the hdiso source partition so it can be mounted (#498591). (clumens) - Add a ignoreProtected= parameter to deviceImmutable that does the obvious. (clumens) - Be more aggressive unmounting before install starts (#498260) (katzj) - Add %{?dist} to the release number in the spec file. (dcantrell) - Configure network in kickstartNetworkUp() iff NM is not connected (#490518) (dcantrell) - Don't segfault with "ks someotherparam" (#498307). (clumens) - Fix the arch upgrade check in yuminstall.py, too (#498280). (clumens) - Move _resetRpmDb into iutil so we can access it everywhere. (clumens) - Don't mount bind mounts last, that makes /dev break. (pjones) - Pass anaconda to storage.FSSet.turnOnSwap. (dlehman) - Ignore spurious formatting on partitioned devices. (dlehman) - Revert "DeviceError only returns a message, not (message, device) tuple (#496343)." (dlehman) - Fix action sorting for partitions on the same disk. (#498064) (dlehman) - Fix traceback in second editing of existing raid dev (#497234). (rvykydal) - Allow existing LVs with filesystems to be resized (#490913) (dcantrell) - Rate limit pulse() calls to ProgressWindow. (pjones) - Don't populate flags.cmdline with "True" values when no = is used. (pjones) - Add "nomodeset" to the list of command line arguments copied to grub.conf (pjones) - Use device.format.mountType insead of device.format.type for fstab. (pjones) - Initialize x86 class variables before efiBootloaderInfo.__init__() (pjones) - Fix a segfault on nfs+kickstart (pjones) - Fix an error when raising FormatCreateException. (clumens) - Add more windows to the rescue interface class (#498014). (clumens) - Remove requirement for EFI machines to be x86, since IA64 is too (#497934). (clumens) - Fix the kernel package selection on ppc64 machines (#497264). (clumens) - Include fsck.ext4 and mkfs.ext4 in the images (#497996). (clumens) - Properly restore SIGCHLD if X startup fails (wwoods) - Fix kickstart PV references handling for lvm on raid (#497352). (rvykydal) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/.cvsignore,v retrieving revision 1.639 retrieving revision 1.640 diff -u -p -r1.639 -r1.640 --- .cvsignore 1 May 2009 00:19:30 -0000 1.639 +++ .cvsignore 5 May 2009 01:38:18 -0000 1.640 @@ -1 +1 @@ -anaconda-11.5.0.48.tar.bz2 +anaconda-11.5.0.49.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda.spec,v retrieving revision 1.790 retrieving revision 1.791 diff -u -p -r1.790 -r1.791 --- anaconda.spec 1 May 2009 00:20:43 -0000 1.790 +++ anaconda.spec 5 May 2009 01:38:18 -0000 1.791 @@ -2,8 +2,8 @@ Summary: Graphical system installer Name: anaconda -Version: 11.5.0.48 -Release: 2 +Version: 11.5.0.49 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -213,8 +213,57 @@ update-desktop-database &> /dev/null || %endif %changelog -* Thu Apr 30 2009 Jesse Keating - 11.5.0.48-2 -- Bump release to be able to tag. +* Mon May 04 2009 David Cantrell - 11.5.0.49-1 +- Collect network interfaces from NetworkManager (#493995) (dcantrell) +- Handle fstab entries whose filesystem we don't recognize.(#498120) + (dlehman) +- Add an error signifying an unrecognized entry in /etc/fstab. (dlehman) +- Don't drop discovered format with unknown devices when parsing fstab. + (dlehman) +- Fix display of paths for device-mapper device in bootloader widget. + (dlehman) +- Don't call udevDeviceFormat if we're just going to clear the device + (#497323). (clumens) +- Pass clearPartType to the devicetree as well. (clumens) +- Break the complex should-clear logic out of clearPartitions. (clumens) +- Handle clearpart in the early kickstart pass too. (clumens) +- Correct setting the SELinux context on mountpoints (#494995). (clumens) +- make resetFileContext return the context set (wwoods) +- Allow editing of the hdiso source partition so it can be mounted + (#498591). (clumens) +- Add a ignoreProtected= parameter to deviceImmutable that does the obvious. + (clumens) +- Be more aggressive unmounting before install starts (#498260) (katzj) +- Add %%{?dist} to the release number in the spec file. (dcantrell) +- Configure network in kickstartNetworkUp() iff NM is not connected + (#490518) (dcantrell) +- Don't segfault with "ks someotherparam" (#498307). (clumens) +- Fix the arch upgrade check in yuminstall.py, too (#498280). (clumens) +- Move _resetRpmDb into iutil so we can access it everywhere. (clumens) +- Don't mount bind mounts last, that makes /dev break. (pjones) +- Pass anaconda to storage.FSSet.turnOnSwap. (dlehman) +- Ignore spurious formatting on partitioned devices. (dlehman) +- Revert "DeviceError only returns a message, not (message, device) tuple + (#496343)." (dlehman) +- Fix action sorting for partitions on the same disk. (#498064) (dlehman) +- Fix traceback in second editing of existing raid dev (#497234). (rvykydal) +- Allow existing LVs with filesystems to be resized (#490913) (dcantrell) +- Rate limit pulse() calls to ProgressWindow. (pjones) +- Don't populate flags.cmdline with "True" values when no = is used. (pjones) +- Add "nomodeset" to the list of command line arguments copied to grub.conf + (pjones) +- Use device.format.mountType insead of device.format.type for fstab. + (pjones) +- Initialize x86 class variables before efiBootloaderInfo.__init__() (pjones) +- Fix a segfault on nfs+kickstart (pjones) +- Fix an error when raising FormatCreateException. (clumens) +- Add more windows to the rescue interface class (#498014). (clumens) +- Remove requirement for EFI machines to be x86, since IA64 is too + (#497934). (clumens) +- Fix the kernel package selection on ppc64 machines (#497264). (clumens) +- Include fsck.ext4 and mkfs.ext4 in the images (#497996). (clumens) +- Properly restore SIGCHLD if X startup fails (wwoods) +- Fix kickstart PV references handling for lvm on raid (#497352). (rvykydal) * Fri Apr 24 2009 Chris Lumens - 11.5.0.48-1 - Fix handling of swap files. (#496529) (dlehman) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/sources,v retrieving revision 1.773 retrieving revision 1.774 diff -u -p -r1.773 -r1.774 --- sources 1 May 2009 00:19:31 -0000 1.773 +++ sources 5 May 2009 01:38:18 -0000 1.774 @@ -1 +1 @@ -934d124c37c45d6ac04e43c692d5fce8 anaconda-11.5.0.48.tar.bz2 +13414124ca22903979310067aea1cfd8 anaconda-11.5.0.49.tar.bz2 From dcantrel at fedoraproject.org Tue May 5 01:52:52 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Tue, 5 May 2009 01:52:52 +0000 (UTC) Subject: rpms/anaconda/devel .cvsignore, 1.638, 1.639 anaconda.spec, 1.786, 1.787 sources, 1.772, 1.773 Message-ID: <20090505015252.116C170108@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15597 Modified Files: .cvsignore anaconda.spec sources Log Message: * Mon May 04 2009 David Cantrell - 11.5.0.49-1 - Collect network interfaces from NetworkManager (#493995) (dcantrell) - Handle fstab entries whose filesystem we don't recognize.(#498120) (dlehman) - Add an error signifying an unrecognized entry in /etc/fstab. (dlehman) - Don't drop discovered format with unknown devices when parsing fstab. (dlehman) - Fix display of paths for device-mapper device in bootloader widget. (dlehman) - Don't call udevDeviceFormat if we're just going to clear the device (#497323). (clumens) - Pass clearPartType to the devicetree as well. (clumens) - Break the complex should-clear logic out of clearPartitions. (clumens) - Handle clearpart in the early kickstart pass too. (clumens) - Correct setting the SELinux context on mountpoints (#494995). (clumens) - make resetFileContext return the context set (wwoods) - Allow editing of the hdiso source partition so it can be mounted (#498591). (clumens) - Add a ignoreProtected= parameter to deviceImmutable that does the obvious. (clumens) - Be more aggressive unmounting before install starts (#498260) (katzj) - Add %{?dist} to the release number in the spec file. (dcantrell) - Configure network in kickstartNetworkUp() iff NM is not connected (#490518) (dcantrell) - Don't segfault with "ks someotherparam" (#498307). (clumens) - Fix the arch upgrade check in yuminstall.py, too (#498280). (clumens) - Move _resetRpmDb into iutil so we can access it everywhere. (clumens) - Don't mount bind mounts last, that makes /dev break. (pjones) - Pass anaconda to storage.FSSet.turnOnSwap. (dlehman) - Ignore spurious formatting on partitioned devices. (dlehman) - Revert "DeviceError only returns a message, not (message, device) tuple (#496343)." (dlehman) - Fix action sorting for partitions on the same disk. (#498064) (dlehman) - Fix traceback in second editing of existing raid dev (#497234). (rvykydal) - Allow existing LVs with filesystems to be resized (#490913) (dcantrell) - Rate limit pulse() calls to ProgressWindow. (pjones) - Don't populate flags.cmdline with "True" values when no = is used. (pjones) - Add "nomodeset" to the list of command line arguments copied to grub.conf (pjones) - Use device.format.mountType insead of device.format.type for fstab. (pjones) - Initialize x86 class variables before efiBootloaderInfo.__init__() (pjones) - Fix a segfault on nfs+kickstart (pjones) - Fix an error when raising FormatCreateException. (clumens) - Add more windows to the rescue interface class (#498014). (clumens) - Remove requirement for EFI machines to be x86, since IA64 is too (#497934). (clumens) - Fix the kernel package selection on ppc64 machines (#497264). (clumens) - Include fsck.ext4 and mkfs.ext4 in the images (#497996). (clumens) - Properly restore SIGCHLD if X startup fails (wwoods) - Fix kickstart PV references handling for lvm on raid (#497352). (rvykydal) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.638 retrieving revision 1.639 diff -u -p -r1.638 -r1.639 --- .cvsignore 24 Apr 2009 21:12:38 -0000 1.638 +++ .cvsignore 5 May 2009 01:52:20 -0000 1.639 @@ -1,3 +1 @@ -clog -anaconda-11.5.0.46.tar.bz2 -anaconda-11.5.0.48.tar.bz2 +anaconda-11.5.0.49.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.786 retrieving revision 1.787 diff -u -p -r1.786 -r1.787 --- anaconda.spec 24 Apr 2009 21:12:38 -0000 1.786 +++ anaconda.spec 5 May 2009 01:52:21 -0000 1.787 @@ -2,8 +2,8 @@ Summary: Graphical system installer Name: anaconda -Version: 11.5.0.48 -Release: 1 +Version: 11.5.0.49 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -213,6 +213,58 @@ update-desktop-database &> /dev/null || %endif %changelog +* Mon May 04 2009 David Cantrell - 11.5.0.49-1 +- Collect network interfaces from NetworkManager (#493995) (dcantrell) +- Handle fstab entries whose filesystem we don't recognize.(#498120) + (dlehman) +- Add an error signifying an unrecognized entry in /etc/fstab. (dlehman) +- Don't drop discovered format with unknown devices when parsing fstab. + (dlehman) +- Fix display of paths for device-mapper device in bootloader widget. + (dlehman) +- Don't call udevDeviceFormat if we're just going to clear the device + (#497323). (clumens) +- Pass clearPartType to the devicetree as well. (clumens) +- Break the complex should-clear logic out of clearPartitions. (clumens) +- Handle clearpart in the early kickstart pass too. (clumens) +- Correct setting the SELinux context on mountpoints (#494995). (clumens) +- make resetFileContext return the context set (wwoods) +- Allow editing of the hdiso source partition so it can be mounted + (#498591). (clumens) +- Add a ignoreProtected= parameter to deviceImmutable that does the obvious. + (clumens) +- Be more aggressive unmounting before install starts (#498260) (katzj) +- Add %%{?dist} to the release number in the spec file. (dcantrell) +- Configure network in kickstartNetworkUp() iff NM is not connected + (#490518) (dcantrell) +- Don't segfault with "ks someotherparam" (#498307). (clumens) +- Fix the arch upgrade check in yuminstall.py, too (#498280). (clumens) +- Move _resetRpmDb into iutil so we can access it everywhere. (clumens) +- Don't mount bind mounts last, that makes /dev break. (pjones) +- Pass anaconda to storage.FSSet.turnOnSwap. (dlehman) +- Ignore spurious formatting on partitioned devices. (dlehman) +- Revert "DeviceError only returns a message, not (message, device) tuple + (#496343)." (dlehman) +- Fix action sorting for partitions on the same disk. (#498064) (dlehman) +- Fix traceback in second editing of existing raid dev (#497234). (rvykydal) +- Allow existing LVs with filesystems to be resized (#490913) (dcantrell) +- Rate limit pulse() calls to ProgressWindow. (pjones) +- Don't populate flags.cmdline with "True" values when no = is used. (pjones) +- Add "nomodeset" to the list of command line arguments copied to grub.conf + (pjones) +- Use device.format.mountType insead of device.format.type for fstab. + (pjones) +- Initialize x86 class variables before efiBootloaderInfo.__init__() (pjones) +- Fix a segfault on nfs+kickstart (pjones) +- Fix an error when raising FormatCreateException. (clumens) +- Add more windows to the rescue interface class (#498014). (clumens) +- Remove requirement for EFI machines to be x86, since IA64 is too + (#497934). (clumens) +- Fix the kernel package selection on ppc64 machines (#497264). (clumens) +- Include fsck.ext4 and mkfs.ext4 in the images (#497996). (clumens) +- Properly restore SIGCHLD if X startup fails (wwoods) +- Fix kickstart PV references handling for lvm on raid (#497352). (rvykydal) + * Fri Apr 24 2009 Chris Lumens - 11.5.0.48-1 - Fix handling of swap files. (#496529) (dlehman) - Pass anaconda to turnOnSwap so we can use swap files. (dlehman) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.772 retrieving revision 1.773 diff -u -p -r1.772 -r1.773 --- sources 24 Apr 2009 21:12:38 -0000 1.772 +++ sources 5 May 2009 01:52:21 -0000 1.773 @@ -1 +1 @@ -934d124c37c45d6ac04e43c692d5fce8 anaconda-11.5.0.48.tar.bz2 +13414124ca22903979310067aea1cfd8 anaconda-11.5.0.49.tar.bz2 From whot at fedoraproject.org Tue May 5 02:09:07 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Tue, 5 May 2009 02:09:07 +0000 (UTC) Subject: rpms/xorg-x11-drv-synaptics/F-11 synaptics-1.1.0-nograb-fail.patch, NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.29, 1.30 Message-ID: <20090505020907.CC5C170108@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18135 Modified Files: xorg-x11-drv-synaptics.spec Added Files: synaptics-1.1.0-nograb-fail.patch Log Message: * Tue May 05 2009 Peter Hutterer 1.1.0-5 - synaptics-1.1.0-nograb-fail.patch: fail if the device cannot be grabbed (#499058) synaptics-1.1.0-nograb-fail.patch: --- NEW FILE synaptics-1.1.0-nograb-fail.patch --- >From 28059f4290cd737235badc7fa59d3a7584fd8d6f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 30 Apr 2009 16:03:43 +1000 Subject: [PATCH] eventcomm: if we can't grab the device, assume it's not a touchpad. If a device is configured in the xorg.conf, it will get added once in the config, once through HAL. Since we grab the device, the second device will be mute. And confuses tools and users alike. So let's just assume that if we can't grab the device, it doesn't exist. Signed-off-by: Peter Hutterer This patch squashes in the following upstream patches: a9a4439 If QueryHardware failed, return that failure and clean up. 6dc7f5e Only try to free the timer if it's actually there. --- src/eventcomm.c | 57 +++++++++++++++++++++++++++++++++++++++------------ src/synaptics.c | 18 ++++++++++++++- src/synapticsstr.h | 1 + 3 files changed, 60 insertions(+), 16 deletions(-) diff --git a/src/eventcomm.c b/src/eventcomm.c index c0ca449..c1b1232 100644 --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -58,6 +58,14 @@ static void EventDeviceOnHook(LocalDevicePtr local, SynapticsSHM *para) { + SynapticsPrivate *priv = (SynapticsPrivate *)local->private; + BOOL *need_grab; + + if (!priv->proto_data) + priv->proto_data = xcalloc(1, sizeof(BOOL)); + + need_grab = (BOOL*)priv->proto_data; + if (para->grab_event_device) { /* Try to grab the event device so that data don't leak to /dev/input/mice */ int ret; @@ -67,6 +75,8 @@ EventDeviceOnHook(LocalDevicePtr local, SynapticsSHM *para) local->name, errno); } } + + *need_grab = FALSE; } static void @@ -75,44 +85,57 @@ EventDeviceOffHook(LocalDevicePtr local) } static Bool -event_query_is_touchpad(int fd) +event_query_is_touchpad(int fd, BOOL grab) { - int ret; + int ret = FALSE; unsigned long evbits[NBITS(EV_MAX)]; unsigned long absbits[NBITS(ABS_MAX)]; unsigned long keybits[NBITS(KEY_MAX)]; + if (grab) + { + SYSCALL(ret = ioctl(fd, EVIOCGRAB, (pointer)1)); + if (ret < 0) + return FALSE; + } + /* Check for ABS_X, ABS_Y, ABS_PRESSURE and BTN_TOOL_FINGER */ SYSCALL(ret = ioctl(fd, EVIOCGBIT(0, sizeof(evbits)), evbits)); if (ret < 0) - return FALSE; + goto unwind; if (!TEST_BIT(EV_SYN, evbits) || !TEST_BIT(EV_ABS, evbits) || !TEST_BIT(EV_KEY, evbits)) - return FALSE; + goto unwind; SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits)); if (ret < 0) - return FALSE; + goto unwind; if (!TEST_BIT(ABS_X, absbits) || !TEST_BIT(ABS_Y, absbits)) - return FALSE; + goto unwind; SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits)); if (ret < 0) - return FALSE; + goto unwind; /* we expect touchpad either report raw pressure or touches */ if (!TEST_BIT(ABS_PRESSURE, absbits) && !TEST_BIT(BTN_TOUCH, keybits)) - return FALSE; + goto unwind; /* all Synaptics-like touchpad report BTN_TOOL_FINGER */ if (!TEST_BIT(BTN_TOOL_FINGER, keybits)) - return FALSE; + goto unwind; if (TEST_BIT(BTN_TOOL_PEN, keybits)) - return FALSE; /* Don't match wacom tablets */ + goto unwind; /* Don't match wacom tablets */ - return TRUE; + ret = TRUE; + +unwind: + if (grab) + SYSCALL(ioctl(fd, EVIOCGRAB, (pointer)0)); + + return ret; } static void @@ -219,7 +242,10 @@ event_query_axis_ranges(LocalDevicePtr local) static Bool EventQueryHardware(LocalDevicePtr local, struct SynapticsHwInfo *synhw) { - if (!event_query_is_touchpad(local->fd)) + SynapticsPrivate *priv = (SynapticsPrivate *)local->private; + BOOL *need_grab = (BOOL*)priv->proto_data; + + if (!event_query_is_touchpad(local->fd, (need_grab) ? *need_grab : TRUE)) return FALSE; xf86Msg(X_PROBED, "%s touchpad found\n", local->name); @@ -376,7 +402,10 @@ static int EventDevOnly(const struct dirent *dir) { static void EventReadDevDimensions(LocalDevicePtr local) { - if (event_query_is_touchpad(local->fd)) + SynapticsPrivate *priv = (SynapticsPrivate *)local->private; + BOOL *need_grab = (BOOL*)priv->proto_data; + + if (event_query_is_touchpad(local->fd, (need_grab) ? *need_grab : TRUE)) event_query_axis_ranges(local); event_query_info(local); } @@ -412,7 +441,7 @@ EventAutoDevProbe(LocalDevicePtr local) if (fd < 0) continue; - if (event_query_is_touchpad(fd)) { + if (event_query_is_touchpad(fd, TRUE)) { touchpad_found = TRUE; xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n", local->name, fname); diff --git a/src/synaptics.c b/src/synaptics.c index ee1239a..1a241ae 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -637,6 +637,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) XisbFree(priv->comm.buffer); free_param_data(priv); xfree(priv->timer); + xfree(priv->proto_data); xfree(priv); local->private = NULL; return local; @@ -650,7 +651,11 @@ static void SynapticsUnInit(InputDriverPtr drv, InputInfoPtr local, int flags) { - xfree(((SynapticsPrivate *)local->private)->timer); + SynapticsPrivate *priv = ((SynapticsPrivate *)local->private); + if (priv && priv->timer) + xfree(priv->timer); + if (priv && priv->proto_data) + xfree(priv->proto_data); xfree(local->private); local->private = NULL; xf86DeleteInput(local, 0); @@ -727,7 +732,15 @@ DeviceOn(DeviceIntPtr dev) xf86FlushInput(local->fd); /* reinit the pad */ - QueryHardware(local); + if (!QueryHardware(local)) + { + XisbFree(priv->comm.buffer); + priv->comm.buffer = NULL; + xf86CloseSerial(local->fd); + local->fd = -1; + return !Success; + } + xf86AddEnabledDevice(local); dev->public.on = TRUE; @@ -2202,6 +2215,7 @@ QueryHardware(LocalDevicePtr local) } else { xf86Msg(X_PROBED, "%s: no supported touchpad found\n", local->name); priv->proto_ops->DeviceOffHook(local); + return FALSE; } return TRUE; diff --git a/src/synapticsstr.h b/src/synapticsstr.h index f518c11..b5083f2 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -92,6 +92,7 @@ typedef struct _SynapticsPrivateRec SynapticsSHM *synpara; /* Current parameter settings. Will point to shared memory if shm_config is true */ struct SynapticsProtocolOperations* proto_ops; + void *proto_data; struct SynapticsHwState hwState; -- 1.6.3.rc1.1.g81c43.dirty Index: xorg-x11-drv-synaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11/xorg-x11-drv-synaptics.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- xorg-x11-drv-synaptics.spec 4 May 2009 23:42:04 -0000 1.29 +++ xorg-x11-drv-synaptics.spec 5 May 2009 02:08:37 -0000 1.30 @@ -7,7 +7,7 @@ Name: xorg-x11-drv-synaptics Summary: Xorg X11 Synaptics touchpad input driver Version: 1.1.0 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -21,6 +21,8 @@ Source2: make-git-snapshot.sh Patch1: synaptics-1.1.0-synclient-64.patch Patch2: synaptics-1.1.0-allocate-timer-early.patch Patch3: synaptics-1.1.0-edges.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=499058 +Patch4: synaptics-1.1.0-nograb-fail.patch ExcludeArch: s390 s390x @@ -81,6 +83,7 @@ Features: %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build autoreconf -v --install --force || exit 1 @@ -129,6 +132,10 @@ Development files for the Synaptics Touc %changelog +* Tue May 05 2009 Peter Hutterer 1.1.0-5 +- synaptics-1.1.0-nograb-fail.patch: fail if the device cannot be grabbed + (#499058) + * Tue May 05 2009 Peter Hutterer 1.1.0-4 - synaptics-1.1.0-edges.patch: Set default edge sizes depending on model (#494766). From phuang at fedoraproject.org Tue May 5 02:12:10 2009 From: phuang at fedoraproject.org (Huang Peng) Date: Tue, 5 May 2009 02:12:10 +0000 (UTC) Subject: rpms/ibus/F-11 ibus.spec,1.69,1.70 Message-ID: <20090505021210.0A45A70108@cvs1.fedora.phx.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/ibus/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18705 Modified Files: ibus.spec Log Message: Fix bug 498141 Index: ibus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- ibus.spec 23 Apr 2009 07:37:27 -0000 1.69 +++ ibus.spec 5 May 2009 02:11:39 -0000 1.70 @@ -8,7 +8,7 @@ Name: ibus Version: 1.1.0.20090423 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries @@ -35,6 +35,7 @@ BuildRequires: intltool # BuildRequires: qt-devel Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-gtk = %{version}-%{release} Requires: pygtk2 Requires: notification-daemon @@ -97,12 +98,21 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel Requires: dbus-devel -Requires: gtk-doc %description devel The ibus-devel package contains the header files and developer docs for ibus. +%package devel-docs +Summary: Developer documents for ibus +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gtk-doc + +%description devel-docs +The ibus-devel-docs package contains developer documentation for ibus + + %prep %setup -q # %patch0 -p1 @@ -213,14 +223,20 @@ fi %defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/* -%{_datadir}/gtk-doc/html/* %{_libdir}/pkgconfig/* +%files devel-docs +%{_datadir}/gtk-doc/html/* + %changelog +* Tue May 05 2009 Huang Peng - 1.1.0.20090423-2 +- Fix bug 498141 - new ibus install needs gtk immodules +- Separate ibus document from ibus-devel to ibus-devel-docs + * Thu Apr 23 2009 Huang Peng - 1.1.0.20090423-1 - Update to ibus-1.1.0.20090423. -- Fix bug 497265 - [mai_IN] Maithili language name is not correct. -- Fix bug 497279 - IBus does not works with evolution correctly. +- Fix bug 497265 - [mai_IN] Maithili language name is not correct. +- Fix bug 497279 - IBus does not works with evolution correctly. - Enhance authentication both in daemon & clients * Fri Apr 17 2009 Huang Peng - 1.1.0.20090417-1 From cwickert at fedoraproject.org Tue May 5 02:54:51 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Tue, 5 May 2009 02:54:51 +0000 (UTC) Subject: rpms/lxpanel/devel .cvsignore, 1.12, 1.13 lxpanel.spec, 1.19, 1.20 sources, 1.12, 1.13 Message-ID: <20090505025451.851C670108@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxpanel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24311 Modified Files: .cvsignore lxpanel.spec sources Log Message: * Fri Apr 24 2009 Christoph Wickert 0.4.0-1 - Update to 0.4.0 final (fixes #496833) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxpanel/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 24 Apr 2009 19:44:16 -0000 1.12 +++ .cvsignore 5 May 2009 02:54:20 -0000 1.13 @@ -1 +1 @@ -lxpanel-0.4.0.tar.gz +lxpanel-0.4.1.tar.gz Index: lxpanel.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- lxpanel.spec 24 Apr 2009 19:44:17 -0000 1.19 +++ lxpanel.spec 5 May 2009 02:54:21 -0000 1.20 @@ -4,7 +4,7 @@ #define _default_patch_fuzz 0 Name: lxpanel -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: A lightweight X11 desktop panel @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Tue May 05 2009 Christoph Wickert 0.4.1-1 +- Update to 0.4.1 + * Fri Apr 24 2009 Christoph Wickert 0.4.0-1 - Update to 0.4.0 final (fixes #496833) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxpanel/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 24 Apr 2009 19:44:17 -0000 1.12 +++ sources 5 May 2009 02:54:21 -0000 1.13 @@ -1 +1 @@ -a03c7b21338a812207b035204f6dad6e lxpanel-0.4.0.tar.gz +cdc16f8126bc21c9a5f17f21433c1bf2 lxpanel-0.4.1.tar.gz From cebbert at fedoraproject.org Tue May 5 03:30:36 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Tue, 5 May 2009 03:30:36 +0000 (UTC) Subject: rpms/kernel/F-9 patch-2.6.27.22.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.837.2.11, 1.837.2.12 kernel.spec, 1.891.2.47, 1.891.2.48 sources, 1.798.2.11, 1.798.2.12 upstream, 1.717.2.11, 1.717.2.12 patch-2.6.27.21.bz2.sign, 1.1.2.1, NONE patch-2.6.27.22-rc1.bz2.sign, 1.1.2.1, NONE Message-ID: <20090505033037.3A6E570108@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30243 Modified Files: Tag: private-fedora-9-2_6_27-branch .cvsignore kernel.spec sources upstream Added Files: Tag: private-fedora-9-2_6_27-branch patch-2.6.27.22.bz2.sign Removed Files: Tag: private-fedora-9-2_6_27-branch patch-2.6.27.21.bz2.sign patch-2.6.27.22-rc1.bz2.sign Log Message: Linux 2.6.27.22 --- NEW FILE patch-2.6.27.22.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJ/KpMyGugalF9Dw4RAuJUAJ44ar7gBtl3cG+83S2Chail1WAB/ACeP8ax u2jmzSNJ1hZ6zeTipy34CTE= =nWfW -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v retrieving revision 1.837.2.11 retrieving revision 1.837.2.12 diff -u -p -r1.837.2.11 -r1.837.2.12 --- .cvsignore 30 Apr 2009 00:43:24 -0000 1.837.2.11 +++ .cvsignore 5 May 2009 03:30:04 -0000 1.837.2.12 @@ -4,5 +4,4 @@ kernel-2.6.*.config temp-* kernel-2.6.27 linux-2.6.27.tar.bz2 -patch-2.6.27.21.bz2 -patch-2.6.27.22-rc1.bz2 +patch-2.6.27.22.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.891.2.47 retrieving revision 1.891.2.48 diff -u -p -r1.891.2.47 -r1.891.2.48 --- kernel.spec 30 Apr 2009 04:41:29 -0000 1.891.2.47 +++ kernel.spec 5 May 2009 03:30:04 -0000 1.891.2.48 @@ -38,7 +38,7 @@ Summary: The Linux kernel # Do we have a -stable update to apply? %define stable_update 22 # Is it a -stable RC? -%define stable_rc 1 +%define stable_rc 0 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -1955,6 +1955,9 @@ fi %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 May 04 2009 Chuck Ebbert 2.6.27.22-78.2.48 +- Linux 2.6.27.22 + * Thu Apr 30 2009 Chuck Ebbert 2.6.27.22-78.2.47.rc1 - Revert netdevice_ops changes in the r8169 driver so it builds on 2.6.27. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v retrieving revision 1.798.2.11 retrieving revision 1.798.2.12 diff -u -p -r1.798.2.11 -r1.798.2.12 --- sources 30 Apr 2009 00:43:24 -0000 1.798.2.11 +++ sources 5 May 2009 03:30:05 -0000 1.798.2.12 @@ -1,3 +1,2 @@ b3e78977aa79d3754cb7f8143d7ddabd linux-2.6.27.tar.bz2 -9297d56c7e47f2977593d92e218228f2 patch-2.6.27.21.bz2 -175a830e359ac7968f52aa1212853dd9 patch-2.6.27.22-rc1.bz2 +3f2f55aef3f5555676f15d33f079e6ca patch-2.6.27.22.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v retrieving revision 1.717.2.11 retrieving revision 1.717.2.12 diff -u -p -r1.717.2.11 -r1.717.2.12 --- upstream 30 Apr 2009 00:43:24 -0000 1.717.2.11 +++ upstream 5 May 2009 03:30:05 -0000 1.717.2.12 @@ -1,3 +1,2 @@ linux-2.6.27.tar.bz2 -patch-2.6.27.21.bz2 -patch-2.6.27.22-rc1.bz2 +patch-2.6.27.22.bz2 --- patch-2.6.27.21.bz2.sign DELETED --- --- patch-2.6.27.22-rc1.bz2.sign DELETED --- From iefremov at fedoraproject.org Tue May 5 03:39:59 2009 From: iefremov at fedoraproject.org (Ivan Efremov) Date: Tue, 5 May 2009 03:39:59 +0000 (UTC) Subject: rpms/ugene/devel import.log, NONE, 1.1 ugene.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090505033959.1C37770108@cvs1.fedora.phx.redhat.com> Author: iefremov Update of /cvs/pkgs/rpms/ugene/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31145/devel Modified Files: .cvsignore sources Added Files: import.log ugene.spec Log Message: * Thu Apr 30 2009 Ivan Efremov - 1.4.1-2 - Initial commit --- NEW FILE import.log --- ugene-1_4_1-2_fc10:HEAD:ugene-1.4.1-2.fc10.src.rpm:1241063636 --- NEW FILE ugene.spec --- Name: ugene Summary: Integrated bioinformatics toolkit Version: 1.4.1 Release: 2%{?dist} #The entire source code is GPLv2+ except: #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2 #files in src/plugins_3rdparty/script_debuger/src/qtscriptdebug/ which are GPLv2 License: GPLv2+ and GPLv2 Group: Applications/Engineering URL: http://ugene.unipro.ru Source0: http://ugene.unipro.ru/downloads/%{name}-%{version}.tar.gz Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: qt-devel >= 4.4 zlib-devel #We need strict versions of qt for correct work of src/libs_3rdparty/qtbindings_* Requires: qt >= 4.4.3 qt-x11 >= 4.4.3 %description Unipro UGENE is a cross-platform visual environment for DNA and protein sequence analysis. UGENE integrates the most important bioinformatics computational algorithms and provides an easy-to-use GUI for performing complex analysis of the genomic data. One of the main features of UGENE is a designer for custom bioinformatics workflows. %prep %setup -q %build # replacing lrelease -> lrelease-qt4 for compatibility with fedora sed -i -e 's/lrelease/lrelease-qt4/g' src/qtranslate.cmd %_bindir/qmake-qt4 -r \ INSTALL_BINDIR=%{_bindir} \ INSTALL_LIBDIR=%{_libdir} \ INSTALL_DATADIR=%{_datadir} \ INSTALL_MANDIR=%{_mandir} make %{?_smp_mflags} %install rm -rf %{buildroot} make install INSTALL_ROOT=%{buildroot} desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/%{name}/ %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/%{name}/ %{_mandir}/man1/* %doc COPYRIGHT LICENSE %changelog * Tue Mar 24 2009 Ivan Efremov - 1.4.1-1 - Upstream version change * Fri Mar 06 2009 Ivan Efremov - 1.4.0-1 - Upstream version change * Mon Feb 02 2009 Ivan Efremov - 1.3.3-1 - Initial release of rpm Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ugene/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 21 Apr 2009 19:45:38 -0000 1.1 +++ .cvsignore 5 May 2009 03:39:28 -0000 1.2 @@ -0,0 +1 @@ +ugene-1.4.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ugene/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 21 Apr 2009 19:45:38 -0000 1.1 +++ sources 5 May 2009 03:39:28 -0000 1.2 @@ -0,0 +1 @@ +0b5539ccbee90d1bf80f313b709198df ugene-1.4.1.tar.gz From wart at fedoraproject.org Tue May 5 03:40:02 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Tue, 5 May 2009 03:40:02 +0000 (UTC) Subject: rpms/tong/devel tong.spec,1.6,1.7 Message-ID: <20090505034002.D074A70108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/tong/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31464 Modified Files: tong.spec Log Message: Mark -data subpackage as noarch. Index: tong.spec =================================================================== RCS file: /cvs/pkgs/rpms/tong/devel/tong.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- tong.spec 25 Feb 2009 21:20:04 -0000 1.6 +++ tong.spec 5 May 2009 03:39:32 -0000 1.7 @@ -1,6 +1,6 @@ Name: tong Version: 1.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A mixture of two classic games Group: Amusements/Games @@ -24,6 +24,7 @@ explosive chemical reaction out of it al %package data Summary: Data files for the Tong game Group: Amusements/Games +BuildArch: noarch %description data Data files for the Tong game. @@ -83,6 +84,9 @@ fi %{_datadir}/tong %changelog +* Mon May 4 2009 Fedora Release Engineering - 1.0-12 +- Mark -data subpackage as noarch + * Wed Feb 25 2009 Fedora Release Engineering - 1.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From iefremov at fedoraproject.org Tue May 5 03:52:26 2009 From: iefremov at fedoraproject.org (Ivan Efremov) Date: Tue, 5 May 2009 03:52:26 +0000 (UTC) Subject: rpms/ugene/F-10 import.log, NONE, 1.1 ugene.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090505035226.BAC6A70108@cvs1.fedora.phx.redhat.com> Author: iefremov Update of /cvs/pkgs/rpms/ugene/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32680/F-10 Modified Files: .cvsignore sources Added Files: import.log ugene.spec Log Message: * Thu Apr 30 2009 Ivan Efremov - 1.4.1-2 - Initial commit --- NEW FILE import.log --- ugene-1_4_1-2_fc10:F-10:ugene-1.4.1-2.fc10.src.rpm:1241065195 --- NEW FILE ugene.spec --- Name: ugene Summary: Integrated bioinformatics toolkit Version: 1.4.1 Release: 2%{?dist} #The entire source code is GPLv2+ except: #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2 #files in src/plugins_3rdparty/script_debuger/src/qtscriptdebug/ which are GPLv2 License: GPLv2+ and GPLv2 Group: Applications/Engineering URL: http://ugene.unipro.ru Source0: http://ugene.unipro.ru/downloads/%{name}-%{version}.tar.gz Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: qt-devel >= 4.4 zlib-devel #We need strict versions of qt for correct work of src/libs_3rdparty/qtbindings_* Requires: qt >= 4.4.3 qt-x11 >= 4.4.3 %description Unipro UGENE is a cross-platform visual environment for DNA and protein sequence analysis. UGENE integrates the most important bioinformatics computational algorithms and provides an easy-to-use GUI for performing complex analysis of the genomic data. One of the main features of UGENE is a designer for custom bioinformatics workflows. %prep %setup -q %build # replacing lrelease -> lrelease-qt4 for compatibility with fedora sed -i -e 's/lrelease/lrelease-qt4/g' src/qtranslate.cmd %_bindir/qmake-qt4 -r \ INSTALL_BINDIR=%{_bindir} \ INSTALL_LIBDIR=%{_libdir} \ INSTALL_DATADIR=%{_datadir} \ INSTALL_MANDIR=%{_mandir} make %{?_smp_mflags} %install rm -rf %{buildroot} make install INSTALL_ROOT=%{buildroot} desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/%{name}/ %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/%{name}/ %{_mandir}/man1/* %doc COPYRIGHT LICENSE %changelog * Tue Mar 24 2009 Ivan Efremov - 1.4.1-1 - Upstream version change * Fri Mar 06 2009 Ivan Efremov - 1.4.0-1 - Upstream version change * Mon Feb 02 2009 Ivan Efremov - 1.3.3-1 - Initial release of rpm Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ugene/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 21 Apr 2009 19:45:38 -0000 1.1 +++ .cvsignore 5 May 2009 03:51:56 -0000 1.2 @@ -0,0 +1 @@ +ugene-1.4.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ugene/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 21 Apr 2009 19:45:38 -0000 1.1 +++ sources 5 May 2009 03:51:56 -0000 1.2 @@ -0,0 +1 @@ +0b5539ccbee90d1bf80f313b709198df ugene-1.4.1.tar.gz From iefremov at fedoraproject.org Tue May 5 03:56:22 2009 From: iefremov at fedoraproject.org (Ivan Efremov) Date: Tue, 5 May 2009 03:56:22 +0000 (UTC) Subject: rpms/ugene/F-11 import.log, NONE, 1.1 ugene.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090505035622.24A2F70108@cvs1.fedora.phx.redhat.com> Author: iefremov Update of /cvs/pkgs/rpms/ugene/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv948/F-11 Modified Files: .cvsignore sources Added Files: import.log ugene.spec Log Message: * Thu Apr 30 2009 Ivan Efremov - 1.4.1-2 - Initial commit --- NEW FILE import.log --- ugene-1_4_1-2_fc10:F-11:ugene-1.4.1-2.fc10.src.rpm:1241065530 --- NEW FILE ugene.spec --- Name: ugene Summary: Integrated bioinformatics toolkit Version: 1.4.1 Release: 2%{?dist} #The entire source code is GPLv2+ except: #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2 #files in src/plugins_3rdparty/script_debuger/src/qtscriptdebug/ which are GPLv2 License: GPLv2+ and GPLv2 Group: Applications/Engineering URL: http://ugene.unipro.ru Source0: http://ugene.unipro.ru/downloads/%{name}-%{version}.tar.gz Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: qt-devel >= 4.4 zlib-devel #We need strict versions of qt for correct work of src/libs_3rdparty/qtbindings_* Requires: qt >= 4.4.3 qt-x11 >= 4.4.3 %description Unipro UGENE is a cross-platform visual environment for DNA and protein sequence analysis. UGENE integrates the most important bioinformatics computational algorithms and provides an easy-to-use GUI for performing complex analysis of the genomic data. One of the main features of UGENE is a designer for custom bioinformatics workflows. %prep %setup -q %build # replacing lrelease -> lrelease-qt4 for compatibility with fedora sed -i -e 's/lrelease/lrelease-qt4/g' src/qtranslate.cmd %_bindir/qmake-qt4 -r \ INSTALL_BINDIR=%{_bindir} \ INSTALL_LIBDIR=%{_libdir} \ INSTALL_DATADIR=%{_datadir} \ INSTALL_MANDIR=%{_mandir} make %{?_smp_mflags} %install rm -rf %{buildroot} make install INSTALL_ROOT=%{buildroot} desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/%{name}/ %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/%{name}/ %{_mandir}/man1/* %doc COPYRIGHT LICENSE %changelog * Tue Mar 24 2009 Ivan Efremov - 1.4.1-1 - Upstream version change * Fri Mar 06 2009 Ivan Efremov - 1.4.0-1 - Upstream version change * Mon Feb 02 2009 Ivan Efremov - 1.3.3-1 - Initial release of rpm Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ugene/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 21 Apr 2009 19:45:38 -0000 1.1 +++ .cvsignore 5 May 2009 03:55:51 -0000 1.2 @@ -0,0 +1 @@ +ugene-1.4.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ugene/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 21 Apr 2009 19:45:38 -0000 1.1 +++ sources 5 May 2009 03:55:51 -0000 1.2 @@ -0,0 +1 @@ +0b5539ccbee90d1bf80f313b709198df ugene-1.4.1.tar.gz From kevin at fedoraproject.org Tue May 5 04:25:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 5 May 2009 04:25:37 +0000 (UTC) Subject: rpms/heartbeat/devel heartbeat.spec,1.30,1.31 Message-ID: <20090505042537.561F370108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/heartbeat/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4363 Modified Files: heartbeat.spec Log Message: Move ldirector dep to subpackage (#493625) Add zlib-devel to BuildRequires (#497079) Add pygtk2-libglade (#497079) Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- heartbeat.spec 24 Feb 2009 19:33:29 -0000 1.30 +++ heartbeat.spec 5 May 2009 04:25:06 -0000 1.31 @@ -6,7 +6,7 @@ Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat Version: 2.1.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 and LGPLv2+ URL: http://linux-ha.org/ Group: System Environment/Daemons @@ -27,13 +27,13 @@ BuildRequires: libxml2-devel BuildRequires: gettext BuildRequires: bison BuildRequires: flex +BuildRequires: zlib-devel %if %{ENABLE_MGMT} BuildRequires: gnutls-devel BuildRequires: pam-devel BuildRequires: python-devel BuildRequires: swig %endif -Requires: ldirectord = %{version}-%{release} Requires: PyXML Requires(pre): shadow-utils Requires(post): /sbin/chkconfig @@ -68,6 +68,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Provides: ldirectord = %{version}-%{release} Obsoletes: ldirectord < 2.1.4-5 +Requires: ldirectord = %{version}-%{release} %description ldirectord ldirectord is a stand-alone daemon to monitor services of real @@ -117,7 +118,7 @@ Summary: Provides a gui interface to man Group: System Environment/Daemons Requires: heartbeat = %{version}-%{release} Requires: PyXML -Requires: pygtk2 >= 2.4 +Requires: pygtk2-libglade %description gui GUI client for Heartbeat clusters @@ -341,6 +342,11 @@ fi %{_bindir}/hb_gui %changelog +* Fri Apr 24 2009 Kevin Fenzi - 2.1.4-7 +- Move ldirector dep to subpackage (#493625) +- Add zlib-devel to BuildRequires (#497079) +- Add pygtk2-libglade (#497079) + * Tue Feb 24 2009 Kevin Fenzi - 2.1.4-6 - Remove symlink thats no longer needed. From lkundrak at fedoraproject.org Tue May 5 05:15:39 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Tue, 5 May 2009 05:15:39 +0000 (UTC) Subject: rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk-securitypatches.patch, 1.1, 1.2 Message-ID: <20090505051539.C184470108@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10761 Modified Files: java-1.6.0-openjdk-securitypatches.patch Log Message: Adjust the security patch to apply java-1.6.0-openjdk-securitypatches.patch: Index: java-1.6.0-openjdk-securitypatches.patch =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk-securitypatches.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- java-1.6.0-openjdk-securitypatches.patch 4 May 2009 19:00:53 -0000 1.1 +++ java-1.6.0-openjdk-securitypatches.patch 5 May 2009 05:15:09 -0000 1.2 @@ -63,198 +63,6 @@ diff -Nurp icedtea6-1.3.1/Makefile.am ic then \ echo Applying $$p ; \ $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ -diff -Nurp icedtea6-1.3.1/Makefile.am.orig icedtea6-1.3.1.patched/Makefile.am.orig ---- icedtea6-1.3.1/Makefile.am.orig 2008-10-22 19:20:45.000000000 +0200 -+++ icedtea6-1.3.1.patched/Makefile.am.orig 2009-05-04 18:49:16.000000000 +0200 -@@ -349,46 +349,6 @@ else - endif - endif - endif --if WITH_VISUALVM --if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP --else -- if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \ -- | $(MD5SUM) --check ; \ -- then \ -- if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \ -- then \ -- mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \ -- fi ; \ -- $(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \ -- -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \ -- fi --endif --if USE_ALT_NETBEANS_PROFILER_SRC_ZIP --else -- if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ -- | $(MD5SUM) --check ; \ -- then \ -- if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \ -- then \ -- mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \ -- fi ; \ -- $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \ -- -O $(NETBEANS_PROFILER_SRC_ZIP) ; \ -- fi --endif --if USE_ALT_VISUALVM_SRC_ZIP --else -- if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \ -- | $(MD5SUM) --check ; \ -- then \ -- if [ $(VISUALVM_SRC_ZIP) ] ; \ -- then \ -- mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \ -- fi ; \ -- $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \ -- fi --endif --endif - mkdir -p stamps - touch stamps/download.stamp - -@@ -561,7 +521,6 @@ stamps/extract.stamp: stamps/download.st - mkdir openjdk ; \ - $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ - chmod -R ug+w openjdk ; \ -- sh $(abs_top_srcdir)/fsg.sh ; \ - fi - if WITH_CACAO - if !USE_SYSTEM_CACAO -@@ -606,7 +565,7 @@ endif - clean-extract: - rm -f stamps/extract.stamp - --stamps/patch.stamp: stamps/patch-fsg.stamp -+stamps/patch.stamp: stamps/extract.stamp - mkdir -p stamps ; \ - rm -f stamps/patch.stamp.tmp ; \ - touch stamps/patch.stamp.tmp ; \ -diff -Nurp icedtea6-1.3.1/Makefile.in icedtea6-1.3.1.patched/Makefile.in ---- icedtea6-1.3.1/Makefile.in 2008-10-22 19:54:12.000000000 +0200 -+++ icedtea6-1.3.1.patched/Makefile.in 2009-05-04 19:31:33.572209706 +0200 -@@ -102,6 +102,7 @@ ALT_JAR_CMD = @ALT_JAR_CMD@ - ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP = @ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP@ - ALT_NETBEANS_PROFILER_SRC_ZIP = @ALT_NETBEANS_PROFILER_SRC_ZIP@ - ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@ -+ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@ - ALT_VISUALVM_SRC_ZIP = @ALT_VISUALVM_SRC_ZIP@ - AMTAR = @AMTAR@ - ANT = @ANT@ -@@ -283,6 +284,7 @@ sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - OPENJDK_DATE = 28_aug_2008 -@@ -536,8 +538,23 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ - patches/icedtea-jdk-use-ssize_t.patch \ - patches/icedtea-hotspot-use-idx_t.patch \ - patches/icedtea-hotspot-params-cast-size_t.patch \ -- patches/icedtea-clean-crypto.patch $(SHARK_PATCH) $(GCC_PATCH) \ -- patches/icedtea-arch.patch patches/icedtea-lc_ctype.patch \ -+ patches/icedtea-clean-crypto.patch \ -+ patches/icedtea-4486841.patch patches/icedtea-6484091.patch \ -+ patches/icedtea-6497740.patch patches/icedtea-6536193.patch \ -+ patches/icedtea-6588160.patch patches/icedtea-6592792.patch \ -+ patches/icedtea-6610888.patch patches/icedtea-6610896.patch \ -+ patches/icedtea-6630639.patch patches/icedtea-6632886.patch \ -+ patches/icedtea-6636360.patch patches/icedtea-6652463.patch \ -+ patches/icedtea-6656633.patch patches/icedtea-6658158.patch \ -+ patches/icedtea-6691246.patch patches/icedtea-6717680.patch \ -+ patches/icedtea-6721651.patch patches/icedtea-6721753.patch \ -+ patches/icedtea-6726779.patch patches/icedtea-6733959.patch \ -+ patches/icedtea-6734167.patch patches/icedtea-6737315.patch \ -+ patches/icedtea-6755943.patch patches/icedtea-6766136.patch \ -+ patches/icedtea-6792554.patch patches/icedtea-6804996.patch \ -+ patches/icedtea-6804997.patch patches/icedtea-6804998.patch \ -+ $(SHARK_PATCH) $(GCC_PATCH) patches/icedtea-arch.patch \ -+ patches/icedtea-lc_ctype.patch \ - patches/icedtea-messageutils.patch \ - patches/icedtea-6open-6616825.patch \ - patches/icedtea-6open-6651382.patch \ -@@ -953,35 +970,6 @@ stamps/download.stamp: - @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi ; \ - @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \ - @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ | $(MD5SUM) --check ; \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi ; \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ $(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \ -- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ | $(MD5SUM) --check ; \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi ; \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ -O $(NETBEANS_PROFILER_SRC_ZIP) ; \ -- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \ -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ | $(MD5SUM) --check ; \ -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if [ $(VISUALVM_SRC_ZIP) ] ; \ -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \ -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi ; \ -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \ -- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi - mkdir -p stamps - touch stamps/download.stamp - -@@ -1021,7 +1009,6 @@ stamps/extract.stamp: stamps/download.st - mkdir openjdk ; \ - $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ - chmod -R ug+w openjdk ; \ -- sh $(abs_top_srcdir)/fsg.sh ; \ - fi - @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! test -d cacao ; \ - @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \ -@@ -1060,7 +1047,7 @@ stamps/extract.stamp: stamps/download.st - clean-extract: - rm -f stamps/extract.stamp - --stamps/patch.stamp: stamps/patch-fsg.stamp -+stamps/patch.stamp: stamps/extract.stamp - mkdir -p stamps ; \ - rm -f stamps/patch.stamp.tmp ; \ - touch stamps/patch.stamp.tmp ; \ -@@ -1070,7 +1057,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta - if test x$${all_patches_ok} = "xyes" \ - && echo Checking $$p \ - && $(PATCH) -l -p0 --dry-run -s -t -f \ -- -F 0 < $(abs_top_srcdir)/$$p ; \ -+ < $(abs_top_srcdir)/$$p ; \ - then \ - echo Applying $$p ; \ - $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ -@@ -1136,7 +1123,7 @@ stamps/patch-fsg.stamp: stamps/extract.s - if test x$${all_patches_ok} = "xyes" \ - && echo Checking $$p \ - && $(PATCH) -l -p0 --dry-run -s -t -f \ -- -F 0 < $(abs_top_srcdir)/$$p ; \ -+ < $(abs_top_srcdir)/$$p ; \ - then \ - echo Applying $$p ; \ - $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ -@@ -1226,7 +1213,7 @@ stamps/patch-ecj.stamp: stamps/extract-e - if test x$${all_patches_ok} = "xyes" \ - && echo Checking $$p \ - && $(PATCH) -l -p0 --dry-run -s -t -f \ -- -F 0 < $(abs_top_srcdir)/$$p ; \ -+ < $(abs_top_srcdir)/$$p ; \ - then \ - echo Applying $$p ; \ - $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ diff -Nurp icedtea6-1.3.1/patches/icedtea-4486841.patch icedtea6-1.3.1.patched/patches/icedtea-4486841.patch --- icedtea6-1.3.1/patches/icedtea-4486841.patch 1970-01-01 01:00:00.000000000 +0100 +++ icedtea6-1.3.1.patched/patches/icedtea-4486841.patch 2009-05-04 18:59:01.000000000 +0200 @@ -6401,3 +6209,128 @@ diff -Nurp icedtea6-1.3.1/patches/icedte + if (blockh == 0 || raslineh == 0 + || prefixh == 0 || suffixh == 0 + || outCodeh == 0) +diff -up icedtea6-1.3.1/Makefile.in.automake icedtea6-1.3.1/Makefile.in +--- icedtea6-1.3.1/Makefile.in.automake 2009-05-05 07:11:46.880610608 +0200 ++++ icedtea6-1.3.1/Makefile.in 2009-05-05 07:11:54.380602188 +0200 +@@ -102,6 +102,7 @@ ALT_JAR_CMD = @ALT_JAR_CMD@ + ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP = @ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP@ + ALT_NETBEANS_PROFILER_SRC_ZIP = @ALT_NETBEANS_PROFILER_SRC_ZIP@ + ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@ ++ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@ + ALT_VISUALVM_SRC_ZIP = @ALT_VISUALVM_SRC_ZIP@ + AMTAR = @AMTAR@ + ANT = @ANT@ +@@ -283,6 +284,7 @@ sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + OPENJDK_DATE = 28_aug_2008 +@@ -536,8 +538,23 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ + patches/icedtea-jdk-use-ssize_t.patch \ + patches/icedtea-hotspot-use-idx_t.patch \ + patches/icedtea-hotspot-params-cast-size_t.patch \ +- patches/icedtea-clean-crypto.patch $(SHARK_PATCH) $(GCC_PATCH) \ +- patches/icedtea-arch.patch patches/icedtea-lc_ctype.patch \ ++ patches/icedtea-clean-crypto.patch \ ++ patches/icedtea-4486841.patch patches/icedtea-6484091.patch \ ++ patches/icedtea-6497740.patch patches/icedtea-6536193.patch \ ++ patches/icedtea-6588160.patch patches/icedtea-6592792.patch \ ++ patches/icedtea-6610888.patch patches/icedtea-6610896.patch \ ++ patches/icedtea-6630639.patch patches/icedtea-6632886.patch \ ++ patches/icedtea-6636360.patch patches/icedtea-6652463.patch \ ++ patches/icedtea-6656633.patch patches/icedtea-6658158.patch \ ++ patches/icedtea-6691246.patch patches/icedtea-6717680.patch \ ++ patches/icedtea-6721651.patch patches/icedtea-6721753.patch \ ++ patches/icedtea-6726779.patch patches/icedtea-6733959.patch \ ++ patches/icedtea-6734167.patch patches/icedtea-6737315.patch \ ++ patches/icedtea-6755943.patch patches/icedtea-6766136.patch \ ++ patches/icedtea-6792554.patch patches/icedtea-6804996.patch \ ++ patches/icedtea-6804997.patch patches/icedtea-6804998.patch \ ++ $(SHARK_PATCH) $(GCC_PATCH) patches/icedtea-arch.patch \ ++ patches/icedtea-lc_ctype.patch \ + patches/icedtea-messageutils.patch \ + patches/icedtea-6open-6616825.patch \ + patches/icedtea-6open-6651382.patch \ +@@ -953,35 +970,6 @@ stamps/download.stamp: + @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi ; \ + @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \ + @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ | $(MD5SUM) --check ; \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi ; \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ $(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \ +- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ | $(MD5SUM) --check ; \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi ; \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ -O $(NETBEANS_PROFILER_SRC_ZIP) ; \ +- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \ +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ | $(MD5SUM) --check ; \ +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ if [ $(VISUALVM_SRC_ZIP) ] ; \ +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ then \ +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \ +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi ; \ +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \ +- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@ fi + mkdir -p stamps + touch stamps/download.stamp + +@@ -1021,7 +1009,6 @@ stamps/extract.stamp: stamps/download.st + mkdir openjdk ; \ + $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ + chmod -R ug+w openjdk ; \ +- sh $(abs_top_srcdir)/fsg.sh ; \ + fi + @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! test -d cacao ; \ + @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \ +@@ -1060,7 +1047,7 @@ stamps/extract.stamp: stamps/download.st + clean-extract: + rm -f stamps/extract.stamp + +-stamps/patch.stamp: stamps/patch-fsg.stamp ++stamps/patch.stamp: stamps/extract.stamp + mkdir -p stamps ; \ + rm -f stamps/patch.stamp.tmp ; \ + touch stamps/patch.stamp.tmp ; \ +@@ -1070,7 +1057,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta + if test x$${all_patches_ok} = "xyes" \ + && echo Checking $$p \ + && $(PATCH) -l -p0 --dry-run -s -t -f \ +- -F 0 < $(abs_top_srcdir)/$$p ; \ ++ < $(abs_top_srcdir)/$$p ; \ + then \ + echo Applying $$p ; \ + $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ +@@ -1137,7 +1124,7 @@ stamps/patch-fsg.stamp: stamps/extract.s + if test x$${all_patches_ok} = "xyes" \ + && echo Checking $$p \ + && $(PATCH) -l -p0 --dry-run -s -t -f \ +- -F 0 < $(abs_top_srcdir)/$$p ; \ ++ < $(abs_top_srcdir)/$$p ; \ + then \ + echo Applying $$p ; \ + $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ +@@ -1227,7 +1214,7 @@ stamps/patch-ecj.stamp: stamps/extract-e + if test x$${all_patches_ok} = "xyes" \ + && echo Checking $$p \ + && $(PATCH) -l -p0 --dry-run -s -t -f \ +- -F 0 < $(abs_top_srcdir)/$$p ; \ ++ < $(abs_top_srcdir)/$$p ; \ + then \ + echo Applying $$p ; \ + $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ From airlied at fedoraproject.org Tue May 5 05:35:12 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 5 May 2009 05:35:12 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/F-11 radeon-modeset-fixes.patch, 1.2, 1.3 xorg-x11-drv-ati.spec, 1.185, 1.186 radeon-6.12.2-fix-rs690-clamp.patch, 1.3, NONE radeon-6.12.2-fix-xv-warning.patch, 1.1, NONE radeon-6.12.2-kms-gamma.patch, 1.2, NONE Message-ID: <20090505053512.7F96A70108@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13444 Modified Files: xorg-x11-drv-ati.spec Added Files: radeon-modeset-fixes.patch Removed Files: radeon-6.12.2-fix-rs690-clamp.patch radeon-6.12.2-fix-xv-warning.patch radeon-6.12.2-kms-gamma.patch Log Message: * Tue May 05 2009 Dave Airlie 6.12.2-10 - radeon-modeset-fixes.patch: backport fixes from upstream for rs480 firefox gpu crash radeon-modeset-fixes.patch: Index: radeon-modeset-fixes.patch =================================================================== RCS file: radeon-modeset-fixes.patch diff -N radeon-modeset-fixes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ radeon-modeset-fixes.patch 5 May 2009 05:34:41 -0000 1.3 @@ -0,0 +1,250 @@ +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index b368115..8e33a76 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -458,7 +458,11 @@ static void + drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green, + uint16_t *blue, int size) + { +- return; ++ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; ++ drmmode_ptr drmmode = drmmode_crtc->drmmode; ++ ++ drmModeCrtcSetGamma(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, ++ size, red, green, blue); + } + + static const xf86CrtcFuncsRec drmmode_crtc_funcs = { +@@ -954,8 +958,6 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors, + int index, j, i; + int c; + +- +- + for (c = 0; c < xf86_config->num_crtc; c++) { + xf86CrtcPtr crtc = xf86_config->crtc[c]; + drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; +@@ -966,8 +968,7 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors, + lut_b[i] = drmmode_crtc->lut_b[i] << 6; + } + +-#if 0 //TODO +- switch (info->CurrentLayout.depth) { ++ switch(pScrn->depth) { + case 15: + for (i = 0; i < numColors; i++) { + index = indices[i]; +@@ -1003,7 +1004,6 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors, + } + break; + } +-#endif + + /* Make the change through RandR */ + #ifdef RANDR_12_INTERFACE +diff --git a/src/radeon_accel.c b/src/radeon_accel.c +index 9d02ac8..5577f84 100644 +--- a/src/radeon_accel.c ++++ b/src/radeon_accel.c +@@ -491,7 +491,7 @@ void RADEONEngineInit(ScrnInfoPtr pScrn) + "num quad-pipes is %d\n", info->accel_state->num_gb_pipes); + + if (IS_R300_3D || IS_R500_3D) { +- uint32_t gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 | R300_SUBPIXEL_1_16); ++ uint32_t gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16); + + switch(info->accel_state->num_gb_pipes) { + case 2: gb_tile_config |= R300_PIPE_COUNT_R300; break; +diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c +index 6c22339..9e23463 100644 +--- a/src/radeon_commonfuncs.c ++++ b/src/radeon_commonfuncs.c +@@ -72,7 +72,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) + FINISH_ACCEL(); + } + +- gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 | R300_SUBPIXEL_1_16); ++ gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16); + + switch(info->accel_state->num_gb_pipes) { + case 2: gb_tile_config |= R300_PIPE_COUNT_R300; break; +@@ -110,21 +110,21 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) + OUT_ACCEL_REG(R300_GB_AA_CONFIG, 0); + OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D | R300_DC_FREE_3D); + OUT_ACCEL_REG(R300_RB3D_ZCACHE_CTLSTAT, R300_ZC_FLUSH | R300_ZC_FREE); +- OUT_ACCEL_REG(R300_GB_MSPOS0, ((8 << R300_MS_X0_SHIFT) | +- (8 << R300_MS_Y0_SHIFT) | +- (8 << R300_MS_X1_SHIFT) | +- (8 << R300_MS_Y1_SHIFT) | +- (8 << R300_MS_X2_SHIFT) | +- (8 << R300_MS_Y2_SHIFT) | +- (8 << R300_MSBD0_Y_SHIFT) | +- (7 << R300_MSBD0_X_SHIFT))); +- OUT_ACCEL_REG(R300_GB_MSPOS1, ((8 << R300_MS_X3_SHIFT) | +- (8 << R300_MS_Y3_SHIFT) | +- (8 << R300_MS_X4_SHIFT) | +- (8 << R300_MS_Y4_SHIFT) | +- (8 << R300_MS_X5_SHIFT) | +- (8 << R300_MS_Y5_SHIFT) | +- (8 << R300_MSBD1_SHIFT))); ++ OUT_ACCEL_REG(R300_GB_MSPOS0, ((6 << R300_MS_X0_SHIFT) | ++ (6 << R300_MS_Y0_SHIFT) | ++ (6 << R300_MS_X1_SHIFT) | ++ (6 << R300_MS_Y1_SHIFT) | ++ (6 << R300_MS_X2_SHIFT) | ++ (6 << R300_MS_Y2_SHIFT) | ++ (6 << R300_MSBD0_Y_SHIFT) | ++ (6 << R300_MSBD0_X_SHIFT))); ++ OUT_ACCEL_REG(R300_GB_MSPOS1, ((6 << R300_MS_X3_SHIFT) | ++ (6 << R300_MS_Y3_SHIFT) | ++ (6 << R300_MS_X4_SHIFT) | ++ (6 << R300_MS_Y4_SHIFT) | ++ (6 << R300_MS_X5_SHIFT) | ++ (6 << R300_MS_Y5_SHIFT) | ++ (6 << R300_MSBD1_SHIFT))); + FINISH_ACCEL(); + + BEGIN_ACCEL(5); +@@ -557,10 +557,10 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) + OUT_ACCEL_REG(R300_SC_EDGERULE, 0xA5294A5); + if (IS_R300_3D) { + /* clip has offset 1440 */ +- OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((1088 << R300_CLIP_X_SHIFT) | +- (1088 << R300_CLIP_Y_SHIFT))); +- OUT_ACCEL_REG(R300_SC_CLIP_0_B, (((1080 + 2920) << R300_CLIP_X_SHIFT) | +- ((1080 + 2920) << R300_CLIP_Y_SHIFT))); ++ OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((1440 << R300_CLIP_X_SHIFT) | ++ (1440 << R300_CLIP_Y_SHIFT))); ++ OUT_ACCEL_REG(R300_SC_CLIP_0_B, ((4080 << R300_CLIP_X_SHIFT) | ++ (4080 << R300_CLIP_Y_SHIFT))); + } else { + OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((0 << R300_CLIP_X_SHIFT) | + (0 << R300_CLIP_Y_SHIFT))); +diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c +index ca46505..b49c2fb 100644 +--- a/src/radeon_exa_render.c ++++ b/src/radeon_exa_render.c +@@ -1718,7 +1718,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, + R300_RS_COUNT_HIRES_EN)); + + /* R300_INST_COUNT_RS - highest RS instruction used */ +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1)); + + OUT_ACCEL_REG(R300_US_CODE_OFFSET, (R300_ALU_CODE_OFFSET(0) | + R300_ALU_CODE_SIZE(0) | +@@ -1740,7 +1740,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, + ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) | + R300_RS_COUNT_HIRES_EN)); + +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0)); + + OUT_ACCEL_REG(R300_US_CODE_OFFSET, (R300_ALU_CODE_OFFSET(0) | + R300_ALU_CODE_SIZE(0) | +@@ -1967,7 +1967,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, + R300_RS_COUNT_HIRES_EN)); + + /* 2 RS instructions: 1 for tex0 (src), 1 for tex1 (mask) */ +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1)); + + OUT_ACCEL_REG(R500_US_CODE_ADDR, (R500_US_CODE_START_ADDR(0) | + R500_US_CODE_END_ADDR(2))); +@@ -1979,7 +1979,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, + ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) | + R300_RS_COUNT_HIRES_EN)); + +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0)); + + OUT_ACCEL_REG(R500_US_CODE_ADDR, (R500_US_CODE_START_ADDR(0) | + R500_US_CODE_END_ADDR(1))); +@@ -2159,8 +2159,12 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, + + /* Clear out scissoring */ + BEGIN_ACCEL(2); +- OUT_ACCEL_REG(R300_SC_SCISSOR0, ((0 << R300_SCISSOR_X_SHIFT) | +- (0 << R300_SCISSOR_Y_SHIFT))); ++ if (IS_R300_3D) ++ OUT_ACCEL_REG(R300_SC_SCISSOR0, ((1440 << R300_SCISSOR_X_SHIFT) | ++ (1440 << R300_SCISSOR_Y_SHIFT))); ++ else ++ OUT_ACCEL_REG(R300_SC_SCISSOR0, ((0 << R300_SCISSOR_X_SHIFT) | ++ (0 << R300_SCISSOR_Y_SHIFT))); + OUT_ACCEL_REG(R300_SC_SCISSOR1, ((8191 << R300_SCISSOR_X_SHIFT) | + (8191 << R300_SCISSOR_Y_SHIFT))); + FINISH_ACCEL(); +diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c +index 852f4ac..bc4101a 100644 +--- a/src/radeon_textured_videofuncs.c ++++ b/src/radeon_textured_videofuncs.c +@@ -458,7 +458,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + R300_RS_COUNT_HIRES_EN)); + + /* R300_INST_COUNT_RS - highest RS instruction used */ +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1)); + + /* Pixel stack frame size. */ + OUT_ACCEL_REG(R300_US_PIXSIZE, 5); +@@ -835,7 +835,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) | + R300_RS_COUNT_HIRES_EN)); + /* R300_INST_COUNT_RS - highest RS instruction used */ +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0)); + + OUT_ACCEL_REG(R300_US_PIXSIZE, 2); /* highest temp used */ + +@@ -967,7 +967,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) | + R300_RS_COUNT_HIRES_EN)); + /* R300_INST_COUNT_RS - highest RS instruction used */ +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0)); + + OUT_ACCEL_REG(R300_US_PIXSIZE, 0); /* highest temp used */ + +@@ -1040,7 +1040,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + R300_RS_COUNT_HIRES_EN)); + + /* R300_INST_COUNT_RS - highest RS instruction used */ +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1)); + + /* Pixel stack frame size. */ + OUT_ACCEL_REG(R300_US_PIXSIZE, 5); +@@ -1512,7 +1512,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + R300_RS_COUNT_HIRES_EN)); + + /* R300_INST_COUNT_RS - highest RS instruction used */ +- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6)); ++ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0)); + + /* Pixel stack frame size. */ + OUT_ACCEL_REG(R300_US_PIXSIZE, 0); /* highest temp used */ +@@ -1601,7 +1601,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + } + } + +- qwords = info->new_cs ? 8 : 6; ++ qwords = info->new_cs ? 7 : 6; + BEGIN_ACCEL(qwords); + OUT_ACCEL_REG(R300_TX_INVALTAGS, 0); + OUT_ACCEL_REG(R300_TX_ENABLE, txenable); +@@ -2131,10 +2131,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + BEGIN_ACCEL(2); + if (IS_R300_3D) { + /* R300 has an offset */ +- OUT_ACCEL_REG(R300_SC_SCISSOR0, (((dstX + 1088) << R300_SCISSOR_X_SHIFT) | +- ((dstY + 1088) << R300_SCISSOR_Y_SHIFT))); +- OUT_ACCEL_REG(R300_SC_SCISSOR1, (((dstX + dstw + 1088 - 1) << R300_SCISSOR_X_SHIFT) | +- ((dstY + dsth + 1088 - 1) << R300_SCISSOR_Y_SHIFT))); ++ OUT_ACCEL_REG(R300_SC_SCISSOR0, (((dstX + 1440) << R300_SCISSOR_X_SHIFT) | ++ ((dstY + 1440) << R300_SCISSOR_Y_SHIFT))); ++ OUT_ACCEL_REG(R300_SC_SCISSOR1, (((dstX + dstw + 1440 - 1) << R300_SCISSOR_X_SHIFT) | ++ ((dstY + dsth + 1440 - 1) << R300_SCISSOR_Y_SHIFT))); + } else { + OUT_ACCEL_REG(R300_SC_SCISSOR0, (((dstX) << R300_SCISSOR_X_SHIFT) | + ((dstY) << R300_SCISSOR_Y_SHIFT))); Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v retrieving revision 1.185 retrieving revision 1.186 diff -u -p -r1.185 -r1.186 --- xorg-x11-drv-ati.spec 28 Apr 2009 10:05:56 -0000 1.185 +++ xorg-x11-drv-ati.spec 5 May 2009 05:34:42 -0000 1.186 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.12.2 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -15,11 +15,9 @@ Source0: http://www.x.org/pub/individu Source1: radeon.xinf Patch1: radeon-modeset.patch +Patch2: radeon-modeset-fixes.patch Patch6: radeon-6.9.0-bgnr-enable.patch Patch7: radeon-6.12.1-r600-fb-size.patch -Patch8: radeon-6.12.2-kms-gamma.patch -Patch9: radeon-6.12.2-fix-rs690-clamp.patch -Patch10: radeon-6.12.2-fix-xv-warning.patch ExcludeArch: s390 s390x @@ -42,11 +40,9 @@ X.Org X11 ati video driver. %prep %setup -q -n %{tarball}-%{version} %patch1 -p1 -b .modeset +%patch2 -p1 -b .modeset-fixes %patch6 -p1 -b .bgnr %patch7 -p1 -b .r600-fb-size -%patch8 -p1 -b .kms-gamma -%patch9 -p1 -b .rs690clamp -%patch10 -p1 -b .fix-xvwarn %build autoreconf -iv @@ -78,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Tue May 05 2009 Dave Airlie 6.12.2-10 +- radeon-modeset-fixes.patch: backport fixes from upstream for rs480 firefox gpu crash + * Tue Apr 28 2009 Dave Airlie 6.12.2-9 - fix gamma code to work properly - bump kernel requires for gamma interface not oopsing --- radeon-6.12.2-fix-rs690-clamp.patch DELETED --- --- radeon-6.12.2-fix-xv-warning.patch DELETED --- --- radeon-6.12.2-kms-gamma.patch DELETED --- From airlied at fedoraproject.org Tue May 5 05:54:26 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 5 May 2009 05:54:26 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/F-11 radeon-src-readback-cpu.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.186, 1.187 Message-ID: <20090505055427.093A570108@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15116 Modified Files: xorg-x11-drv-ati.spec Added Files: radeon-src-readback-cpu.patch Log Message: * Tue May 05 2009 Dave Airlie 6.12.2-11 - make src/mask prepare access force to GTT. radeon-src-readback-cpu.patch: --- NEW FILE radeon-src-readback-cpu.patch --- >From c29c2002c2d3d474456a16584fa2ebef43de8544 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 6 May 2009 02:54:42 +1000 Subject: [PATCH] radeon: always pull srcs into CPU space for rendering dsts at least get write combined in theory though who knows with blending really need an XA already --- src/radeon_bufmgr_gem.c | 16 ++++++++++++++++ src/radeon_bufmgr_gem.h | 1 + src/radeon_exa.c | 6 +++++- 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/radeon_bufmgr_gem.c b/src/radeon_bufmgr_gem.c index 634d28d..03d0a20 100644 --- a/src/radeon_bufmgr_gem.c +++ b/src/radeon_bufmgr_gem.c @@ -239,6 +239,22 @@ dri_bufmgr_gem_destroy(dri_bufmgr *bufmgr) free(bufmgr); } +void radeon_bufmgr_gem_force_map(dri_bo *buf) +{ + dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)buf->bufmgr; + struct drm_radeon_gem_set_domain sd_args; + dri_bo_gem *gem_bo = (dri_bo_gem *)buf; + int ret; + + + sd_args.handle = gem_bo->gem_handle; + sd_args.read_domains = RADEON_GEM_DOMAIN_GTT; + sd_args.write_domain = 0; + + ret = drmCommandWriteRead(bufmgr_gem->fd, DRM_RADEON_GEM_SET_DOMAIN, + &sd_args, sizeof(sd_args)); +} + void radeon_bufmgr_gem_wait_rendering(dri_bo *buf) { dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)buf->bufmgr; diff --git a/src/radeon_bufmgr_gem.h b/src/radeon_bufmgr_gem.h index 52b3d99..eb7974e 100644 --- a/src/radeon_bufmgr_gem.h +++ b/src/radeon_bufmgr_gem.h @@ -4,6 +4,7 @@ #include "radeon_dri_bufmgr.h" +extern void radeon_bufmgr_gem_force_map(dri_bo *buf); extern void radeon_bufmgr_gem_wait_rendering(dri_bo *bo); void radeon_bufmgr_gem_emit_reloc(dri_bo *bo, struct radeon_relocs_info *reloc_info, uint32_t *head, uint32_t *count_p, uint32_t read_domains, uint32_t write_domain); void radeon_gem_bufmgr_post_submit(dri_bufmgr *bufmgr, struct radeon_relocs_info *reloc_info, int error); diff --git a/src/radeon_exa.c b/src/radeon_exa.c index cc48a7a..267c5c3 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -272,7 +272,11 @@ static Bool RADEONPrepareAccess(PixmapPtr pPix, int index) if (radeon_bufmgr_gem_has_references(driver_priv->bo)) RADEONCPFlushIndirect(pScrn, 0); - radeon_bufmgr_gem_wait_rendering(driver_priv->bo); + /* if we hit a sw fallback for a src or mask pull them into cpu accessible space */ + if (index) + radeon_bufmgr_gem_force_map(driver_priv->bo); + else + radeon_bufmgr_gem_wait_rendering(driver_priv->bo); /* flush IB */ ret = dri_bo_map(driver_priv->bo, 1); -- 1.6.2.2 Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v retrieving revision 1.186 retrieving revision 1.187 diff -u -p -r1.186 -r1.187 --- xorg-x11-drv-ati.spec 5 May 2009 05:34:42 -0000 1.186 +++ xorg-x11-drv-ati.spec 5 May 2009 05:53:55 -0000 1.187 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.12.2 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -18,6 +18,7 @@ Patch1: radeon-modeset.patch Patch2: radeon-modeset-fixes.patch Patch6: radeon-6.9.0-bgnr-enable.patch Patch7: radeon-6.12.1-r600-fb-size.patch +Patch8: radeon-src-readback-cpu.patch ExcludeArch: s390 s390x @@ -43,6 +44,7 @@ X.Org X11 ati video driver. %patch2 -p1 -b .modeset-fixes %patch6 -p1 -b .bgnr %patch7 -p1 -b .r600-fb-size +%patch8 -p1 -b .srcrb %build autoreconf -iv @@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Tue May 05 2009 Dave Airlie 6.12.2-11 +- make src/mask prepare access force to GTT. + * Tue May 05 2009 Dave Airlie 6.12.2-10 - radeon-modeset-fixes.patch: backport fixes from upstream for rs480 firefox gpu crash From iefremov at fedoraproject.org Tue May 5 05:57:40 2009 From: iefremov at fedoraproject.org (Ivan Efremov) Date: Tue, 5 May 2009 05:57:40 +0000 (UTC) Subject: rpms/ugene/F-11 ugene.spec,1.1,1.2 Message-ID: <20090505055741.0490C70108@cvs1.fedora.phx.redhat.com> Author: iefremov Update of /cvs/pkgs/rpms/ugene/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15480 Modified Files: ugene.spec Log Message: desktop-file utils added as dependency Index: ugene.spec =================================================================== RCS file: /cvs/pkgs/rpms/ugene/F-11/ugene.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ugene.spec 5 May 2009 03:55:51 -0000 1.1 +++ ugene.spec 5 May 2009 05:57:10 -0000 1.2 @@ -11,7 +11,7 @@ URL: http://ugene.unipro.ru Source0: http://ugene.unipro.ru/downloads/%{name}-%{version}.tar.gz Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: qt-devel >= 4.4 zlib-devel +BuildRequires: qt-devel >= 4.4 zlib-devel desktop-file-utils #We need strict versions of qt for correct work of src/libs_3rdparty/qtbindings_* Requires: qt >= 4.4.3 qt-x11 >= 4.4.3 From iefremov at fedoraproject.org Tue May 5 05:58:43 2009 From: iefremov at fedoraproject.org (Ivan Efremov) Date: Tue, 5 May 2009 05:58:43 +0000 (UTC) Subject: rpms/ugene/devel ugene.spec,1.1,1.2 Message-ID: <20090505055843.6E6B170108@cvs1.fedora.phx.redhat.com> Author: iefremov Update of /cvs/pkgs/rpms/ugene/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15593 Modified Files: ugene.spec Log Message: desktop-file utils added as dependency Index: ugene.spec =================================================================== RCS file: /cvs/pkgs/rpms/ugene/devel/ugene.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ugene.spec 5 May 2009 03:39:28 -0000 1.1 +++ ugene.spec 5 May 2009 05:58:13 -0000 1.2 @@ -11,7 +11,7 @@ URL: http://ugene.unipro.ru Source0: http://ugene.unipro.ru/downloads/%{name}-%{version}.tar.gz Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: qt-devel >= 4.4 zlib-devel +BuildRequires: qt-devel >= 4.4 zlib-devel desktop-file-utils #We need strict versions of qt for correct work of src/libs_3rdparty/qtbindings_* Requires: qt >= 4.4.3 qt-x11 >= 4.4.3 From iefremov at fedoraproject.org Tue May 5 06:04:30 2009 From: iefremov at fedoraproject.org (Ivan Efremov) Date: Tue, 5 May 2009 06:04:30 +0000 (UTC) Subject: rpms/ugene/devel ugene.spec,1.2,1.3 Message-ID: <20090505060430.DAD4E70135@cvs1.fedora.phx.redhat.com> Author: iefremov Update of /cvs/pkgs/rpms/ugene/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16155 Modified Files: ugene.spec Log Message: release bump Index: ugene.spec =================================================================== RCS file: /cvs/pkgs/rpms/ugene/devel/ugene.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- ugene.spec 5 May 2009 05:58:13 -0000 1.2 +++ ugene.spec 5 May 2009 06:04:00 -0000 1.3 @@ -1,7 +1,7 @@ Name: ugene Summary: Integrated bioinformatics toolkit Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} #The entire source code is GPLv2+ except: #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2 #files in src/plugins_3rdparty/script_debuger/src/qtscriptdebug/ which are GPLv2 @@ -55,6 +55,9 @@ rm -rf %{buildroot} %doc COPYRIGHT LICENSE %changelog +* Tue May 05 2009 Ivan Efremov - 1.4.1-3 +- desktop-file-utils added to BuildRequires + * Tue Mar 24 2009 Ivan Efremov - 1.4.1-1 - Upstream version change From peter at fedoraproject.org Tue May 5 06:06:51 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Tue, 5 May 2009 06:06:51 +0000 (UTC) Subject: rpms/flashrom/devel .cvsignore, 1.14, 1.15 flashrom--Makefile_cleanup.diff, 1.6, 1.7 flashrom.spec, 1.18, 1.19 import.log, 1.6, 1.7 sources, 1.14, 1.15 Message-ID: <20090505060651.D39AD70108@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17116/devel Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: Ver. 0.9.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 14 Apr 2009 08:13:45 -0000 1.14 +++ .cvsignore 5 May 2009 06:06:21 -0000 1.15 @@ -1 +1 @@ -flashrom-4107.tar.bz2 +flashrom-0.9.0.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/flashrom--Makefile_cleanup.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- flashrom--Makefile_cleanup.diff 11 Mar 2009 12:59:11 -0000 1.6 +++ flashrom--Makefile_cleanup.diff 5 May 2009 06:06:21 -0000 1.7 @@ -1,7 +1,7 @@ ---- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 -+++ Makefile 2009-03-11 15:46:46.227346626 +0300 -@@ -9,14 +9,14 @@ - CC = gcc +--- Makefile~ 2009-05-04 03:37:07.000000000 +0400 ++++ Makefile 2009-05-05 10:00:38.680942737 +0400 +@@ -9,9 +9,9 @@ + CC ?= gcc STRIP = strip INSTALL = /usr/bin/install -PREFIX = /usr/local @@ -12,19 +12,7 @@ LDFLAGS = OS_ARCH = $(shell uname) - ifneq ($(OS_ARCH), SunOS) --STRIP_ARGS = -s -+#STRIP_ARGS = -s - endif - ifeq ($(OS_ARCH), Darwin) - CFLAGS += -I/usr/local/include -@@ -40,12 +40,11 @@ - - # Set the flashrom version string from the highest revision number - # of the checked out flashrom files. --SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ -+#SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ - | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"' +@@ -43,7 +43,6 @@ $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/flashrom.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- flashrom.spec 14 Apr 2009 08:13:45 -0000 1.18 +++ flashrom.spec 5 May 2009 06:06:21 -0000 1.19 @@ -1,15 +1,12 @@ -%define svnver 4107 Summary: Simple program for reading/writing BIOS chips content Name: flashrom -Version: 0 -Release: 0.18.20090414svn%{svnver}%{?dist} +Version: 0.9.0 +Release: 1%{?dist} License: GPLv2 Group: Applications/System -# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom -Source0: flashrom-%{svnver}.tar.bz2 +URL: http://coreboot.org/flashrom +Source0: http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff -URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,12 +19,11 @@ Utility which can be used to detect BIOS and write new contents on the chips ("flash the chip"). %prep -%setup -q -n %{name} -%patch0 -b .Makefile_cleanup +%setup -q +%patch0 -p0 -b .Makefile_cleanup %build -# currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -45,6 +41,9 @@ install -D -p -m644 %{name}.8 $RPM_BUILD %{_mandir}/man8/%{name}.* %changelog +* Tue May 5 2009 Peter Lemenkov 0.9.0-1 +- Ver. 0.9.0 + * Tue Apr 14 2009 Peter Lemenkov 0-0.18.20090414svn4107 - Various manpage / README fixes - Board enable support for HP DL145 G3 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- import.log 14 Apr 2009 08:13:45 -0000 1.6 +++ import.log 5 May 2009 06:06:21 -0000 1.7 @@ -4,3 +4,4 @@ flashrom-0-0_14_20081103svn3723_fc9:HEAD flashrom-0-0_15_20090112svn3852_fc10:HEAD:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231410331 flashrom-0-0_17_20090311svn3984_fc10:HEAD:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776289 flashrom-0-0_18_20090414svn4107_fc10:HEAD:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239696789 +flashrom-0_9_0-1_fc10:HEAD:flashrom-0.9.0-1.fc10.src.rpm:1241503535 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 14 Apr 2009 08:13:45 -0000 1.14 +++ sources 5 May 2009 06:06:21 -0000 1.15 @@ -1 +1 @@ -784e25d61ac3ae7f3d31914e963acaa3 flashrom-4107.tar.bz2 +e9953bc012b07ce20e83f253e5199c2a flashrom-0.9.0.tar.bz2 From iefremov at fedoraproject.org Tue May 5 06:07:01 2009 From: iefremov at fedoraproject.org (Ivan Efremov) Date: Tue, 5 May 2009 06:07:01 +0000 (UTC) Subject: rpms/ugene/F-11 ugene.spec,1.2,1.3 Message-ID: <20090505060701.DBD6870108@cvs1.fedora.phx.redhat.com> Author: iefremov Update of /cvs/pkgs/rpms/ugene/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17153 Modified Files: ugene.spec Log Message: release bump Index: ugene.spec =================================================================== RCS file: /cvs/pkgs/rpms/ugene/F-11/ugene.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- ugene.spec 5 May 2009 05:57:10 -0000 1.2 +++ ugene.spec 5 May 2009 06:06:31 -0000 1.3 @@ -1,7 +1,7 @@ Name: ugene Summary: Integrated bioinformatics toolkit Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} #The entire source code is GPLv2+ except: #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2 #files in src/plugins_3rdparty/script_debuger/src/qtscriptdebug/ which are GPLv2 @@ -55,6 +55,9 @@ rm -rf %{buildroot} %doc COPYRIGHT LICENSE %changelog +* Tue May 05 2009 Ivan Efremov - 1.4.1-3 +- desktop-file-utils added to BuildRequires + * Tue Mar 24 2009 Ivan Efremov - 1.4.1-1 - Upstream version change From peter at fedoraproject.org Tue May 5 06:09:06 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Tue, 5 May 2009 06:09:06 +0000 (UTC) Subject: rpms/flashrom/F-11 .cvsignore, 1.14, 1.15 flashrom--Makefile_cleanup.diff, 1.6, 1.7 flashrom.spec, 1.18, 1.19 import.log, 1.6, 1.7 sources, 1.14, 1.15 Message-ID: <20090505060906.2448270108@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17537/F-11 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: Ver. 0.9.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-11/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 14 Apr 2009 08:13:45 -0000 1.14 +++ .cvsignore 5 May 2009 06:08:35 -0000 1.15 @@ -1 +1 @@ -flashrom-4107.tar.bz2 +flashrom-0.9.0.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-11/flashrom--Makefile_cleanup.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- flashrom--Makefile_cleanup.diff 11 Mar 2009 12:59:11 -0000 1.6 +++ flashrom--Makefile_cleanup.diff 5 May 2009 06:08:35 -0000 1.7 @@ -1,7 +1,7 @@ ---- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 -+++ Makefile 2009-03-11 15:46:46.227346626 +0300 -@@ -9,14 +9,14 @@ - CC = gcc +--- Makefile~ 2009-05-04 03:37:07.000000000 +0400 ++++ Makefile 2009-05-05 10:00:38.680942737 +0400 +@@ -9,9 +9,9 @@ + CC ?= gcc STRIP = strip INSTALL = /usr/bin/install -PREFIX = /usr/local @@ -12,19 +12,7 @@ LDFLAGS = OS_ARCH = $(shell uname) - ifneq ($(OS_ARCH), SunOS) --STRIP_ARGS = -s -+#STRIP_ARGS = -s - endif - ifeq ($(OS_ARCH), Darwin) - CFLAGS += -I/usr/local/include -@@ -40,12 +40,11 @@ - - # Set the flashrom version string from the highest revision number - # of the checked out flashrom files. --SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ -+#SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ - | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"' +@@ -43,7 +43,6 @@ $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-11/flashrom.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- flashrom.spec 14 Apr 2009 08:13:45 -0000 1.18 +++ flashrom.spec 5 May 2009 06:08:35 -0000 1.19 @@ -1,15 +1,12 @@ -%define svnver 4107 Summary: Simple program for reading/writing BIOS chips content Name: flashrom -Version: 0 -Release: 0.18.20090414svn%{svnver}%{?dist} +Version: 0.9.0 +Release: 1%{?dist} License: GPLv2 Group: Applications/System -# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom -Source0: flashrom-%{svnver}.tar.bz2 +URL: http://coreboot.org/flashrom +Source0: http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff -URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,12 +19,11 @@ Utility which can be used to detect BIOS and write new contents on the chips ("flash the chip"). %prep -%setup -q -n %{name} -%patch0 -b .Makefile_cleanup +%setup -q +%patch0 -p0 -b .Makefile_cleanup %build -# currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -45,6 +41,9 @@ install -D -p -m644 %{name}.8 $RPM_BUILD %{_mandir}/man8/%{name}.* %changelog +* Tue May 5 2009 Peter Lemenkov 0.9.0-1 +- Ver. 0.9.0 + * Tue Apr 14 2009 Peter Lemenkov 0-0.18.20090414svn4107 - Various manpage / README fixes - Board enable support for HP DL145 G3 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-11/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- import.log 14 Apr 2009 08:13:45 -0000 1.6 +++ import.log 5 May 2009 06:08:35 -0000 1.7 @@ -4,3 +4,4 @@ flashrom-0-0_14_20081103svn3723_fc9:HEAD flashrom-0-0_15_20090112svn3852_fc10:HEAD:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231410331 flashrom-0-0_17_20090311svn3984_fc10:HEAD:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776289 flashrom-0-0_18_20090414svn4107_fc10:HEAD:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239696789 +flashrom-0_9_0-1_fc10:F-11:flashrom-0.9.0-1.fc10.src.rpm:1241503656 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-11/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 14 Apr 2009 08:13:45 -0000 1.14 +++ sources 5 May 2009 06:08:35 -0000 1.15 @@ -1 +1 @@ -784e25d61ac3ae7f3d31914e963acaa3 flashrom-4107.tar.bz2 +e9953bc012b07ce20e83f253e5199c2a flashrom-0.9.0.tar.bz2 From peter at fedoraproject.org Tue May 5 06:11:49 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Tue, 5 May 2009 06:11:49 +0000 (UTC) Subject: rpms/flashrom/F-10 .cvsignore, 1.14, 1.15 flashrom--Makefile_cleanup.diff, 1.6, 1.7 flashrom.spec, 1.17, 1.18 import.log, 1.6, 1.7 sources, 1.14, 1.15 Message-ID: <20090505061149.4009A70108@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18170/F-10 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: Ver. 0.9.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 14 Apr 2009 08:16:30 -0000 1.14 +++ .cvsignore 5 May 2009 06:11:18 -0000 1.15 @@ -1 +1 @@ -flashrom-4107.tar.bz2 +flashrom-0.9.0.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/flashrom--Makefile_cleanup.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- flashrom--Makefile_cleanup.diff 11 Mar 2009 13:01:55 -0000 1.6 +++ flashrom--Makefile_cleanup.diff 5 May 2009 06:11:18 -0000 1.7 @@ -1,7 +1,7 @@ ---- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 -+++ Makefile 2009-03-11 15:46:46.227346626 +0300 -@@ -9,14 +9,14 @@ - CC = gcc +--- Makefile~ 2009-05-04 03:37:07.000000000 +0400 ++++ Makefile 2009-05-05 10:00:38.680942737 +0400 +@@ -9,9 +9,9 @@ + CC ?= gcc STRIP = strip INSTALL = /usr/bin/install -PREFIX = /usr/local @@ -12,19 +12,7 @@ LDFLAGS = OS_ARCH = $(shell uname) - ifneq ($(OS_ARCH), SunOS) --STRIP_ARGS = -s -+#STRIP_ARGS = -s - endif - ifeq ($(OS_ARCH), Darwin) - CFLAGS += -I/usr/local/include -@@ -40,12 +40,11 @@ - - # Set the flashrom version string from the highest revision number - # of the checked out flashrom files. --SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ -+#SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ - | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"' +@@ -43,7 +43,6 @@ $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/flashrom.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- flashrom.spec 14 Apr 2009 08:16:30 -0000 1.17 +++ flashrom.spec 5 May 2009 06:11:18 -0000 1.18 @@ -1,15 +1,12 @@ -%define svnver 4107 Summary: Simple program for reading/writing BIOS chips content Name: flashrom -Version: 0 -Release: 0.18.20090414svn%{svnver}%{?dist} +Version: 0.9.0 +Release: 1%{?dist} License: GPLv2 Group: Applications/System -# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom -Source0: flashrom-%{svnver}.tar.bz2 +URL: http://coreboot.org/flashrom +Source0: http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff -URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,12 +19,11 @@ Utility which can be used to detect BIOS and write new contents on the chips ("flash the chip"). %prep -%setup -q -n %{name} -%patch0 -b .Makefile_cleanup +%setup -q +%patch0 -p0 -b .Makefile_cleanup %build -# currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -45,6 +41,9 @@ install -D -p -m644 %{name}.8 $RPM_BUILD %{_mandir}/man8/%{name}.* %changelog +* Tue May 5 2009 Peter Lemenkov 0.9.0-1 +- Ver. 0.9.0 + * Tue Apr 14 2009 Peter Lemenkov 0-0.18.20090414svn4107 - Various manpage / README fixes - Board enable support for HP DL145 G3 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- import.log 14 Apr 2009 08:16:30 -0000 1.6 +++ import.log 5 May 2009 06:11:18 -0000 1.7 @@ -4,3 +4,4 @@ flashrom-0-0_14_20081103svn3723_fc9:HEAD flashrom-0-0_15_20090112svn3852_fc10:F-10:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231431767 flashrom-0-0_17_20090311svn3984_fc10:F-10:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776491 flashrom-0-0_18_20090414svn4107_fc10:F-10:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239696892 +flashrom-0_9_0-1_fc10:F-10:flashrom-0.9.0-1.fc10.src.rpm:1241503823 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 14 Apr 2009 08:16:30 -0000 1.14 +++ sources 5 May 2009 06:11:18 -0000 1.15 @@ -1 +1 @@ -784e25d61ac3ae7f3d31914e963acaa3 flashrom-4107.tar.bz2 +e9953bc012b07ce20e83f253e5199c2a flashrom-0.9.0.tar.bz2 From airlied at fedoraproject.org Tue May 5 06:12:06 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 5 May 2009 06:12:06 +0000 (UTC) Subject: rpms/mesa/F-11 mesa.spec, 1.247, 1.248 radeon-rewrite.patch, 1.21, 1.22 Message-ID: <20090505061206.57FEC70108@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17879 Modified Files: mesa.spec radeon-rewrite.patch Log Message: * Tue May 05 2009 Dave Airlie 7.5-0.14 - radeon-rewrite.patch: fixes from upstream for rs690 + r200 Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa.spec,v retrieving revision 1.247 retrieving revision 1.248 diff -u -p -r1.247 -r1.248 --- mesa.spec 28 Apr 2009 10:17:37 -0000 1.247 +++ mesa.spec 5 May 2009 06:11:35 -0000 1.248 @@ -20,7 +20,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.5 -Release: 0.13%{?dist} +Release: 0.14%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -432,6 +432,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/mesa-demos-data %changelog +* Tue May 05 2009 Dave Airlie 7.5-0.14 +- radeon-rewrite.patch: fixes from upstream for rs690 + r200 + * Tue Apr 28 2009 Dave Airlie 7.5-0.13 - radeon fix clip emits radeon-rewrite.patch: Index: radeon-rewrite.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-11/radeon-rewrite.patch,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- radeon-rewrite.patch 28 Apr 2009 05:49:26 -0000 1.21 +++ radeon-rewrite.patch 5 May 2009 06:11:35 -0000 1.22 @@ -10636,7 +10636,7 @@ index a8eaa58..3786813 100644 #endif /* __R300_CMDBUF_H__ */ diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c -index 12bee1a..4d1f10b 100644 +index 12bee1a..70c7730 100644 --- a/src/mesa/drivers/dri/r300/r300_context.c +++ b/src/mesa/drivers/dri/r300/r300_context.c @@ -44,6 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -11023,7 +11023,7 @@ index 12bee1a..4d1f10b 100644 /* Configure swrast and TNL to match hardware characteristics: */ -@@ -351,59 +400,33 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual, +@@ -351,59 +400,38 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual, _tnl_allow_pixel_fog(ctx, GL_FALSE); _tnl_allow_vertex_fog(ctx, GL_TRUE); @@ -11064,11 +11064,16 @@ index 12bee1a..4d1f10b 100644 + if (r300->radeon.radeonScreen->kernel_mm) + driInitExtensions(ctx, mm_extensions, GL_FALSE); + -+ r300->radeon.initialMaxAnisotropy = driQueryOptionf(&r300->radeon.optionCache, -+ "def_max_anisotropy"); ++ if (screen->chip_family == CHIP_FAMILY_RS600 || screen->chip_family == CHIP_FAMILY_RS690 || ++ screen->chip_family == CHIP_FAMILY_RS740) { ++ r300->radeon.texture_row_align = 64; ++ } - if (driQueryOptionb - (&r300->radeon.optionCache, "disable_stencil_two_side")) ++ r300->radeon.initialMaxAnisotropy = driQueryOptionf(&r300->radeon.optionCache, ++ "def_max_anisotropy"); ++ + if (driQueryOptionb(&r300->radeon.optionCache, "disable_stencil_two_side")) _mesa_disable_extension(ctx, "GL_EXT_stencil_two_side"); @@ -11099,7 +11104,7 @@ index 12bee1a..4d1f10b 100644 tcl_mode = driQueryOptioni(&r300->radeon.optionCache, "tcl_mode"); if (driQueryOptionb(&r300->radeon.optionCache, "no_rast")) { -@@ -426,145 +449,3 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual, +@@ -426,145 +454,3 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual, return GL_TRUE; } @@ -25187,10 +25192,10 @@ index 0000000..c2fbb09 +#endif diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c new file mode 100644 -index 0000000..ba74c97 +index 0000000..3e71362 --- /dev/null +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c -@@ -0,0 +1,623 @@ +@@ -0,0 +1,625 @@ +/************************************************************************** + +Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and @@ -25370,6 +25375,8 @@ index 0000000..ba74c97 + radeon->texture_depth = ( glVisual->rgbBits > 16 ) ? + DRI_CONF_TEXTURE_DEPTH_32 : DRI_CONF_TEXTURE_DEPTH_16; + ++ radeon->texture_row_align = 32; ++ + return GL_TRUE; +} + @@ -25816,10 +25823,10 @@ index 0000000..ba74c97 + diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h new file mode 100644 -index 0000000..d32e5af +index 0000000..181688c --- /dev/null +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h -@@ -0,0 +1,563 @@ +@@ -0,0 +1,564 @@ + +#ifndef COMMON_CONTEXT_H +#define COMMON_CONTEXT_H @@ -26243,6 +26250,7 @@ index 0000000..d32e5af + */ + int texture_depth; + float initialMaxAnisotropy; ++ uint32_t texture_row_align; + + struct radeon_dma dma; + struct radeon_hw_state hw; @@ -32152,10 +32160,10 @@ index 126d072..78ec119 100644 -} diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c new file mode 100644 -index 0000000..34d6261 +index 0000000..51538e3 --- /dev/null +++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c -@@ -0,0 +1,386 @@ +@@ -0,0 +1,387 @@ +/* + * Copyright (C) 2008 Nicolai Haehnle. + * @@ -32244,10 +32252,11 @@ index 0000000..34d6261 + * \param curOffset points to the offset at which the image is to be stored + * and is updated by this function according to the size of the image. + */ -+static void compute_tex_image_offset(radeon_mipmap_tree *mt, ++static void compute_tex_image_offset(radeonContextPtr rmesa, radeon_mipmap_tree *mt, + GLuint face, GLuint level, GLuint* curOffset) +{ + radeon_mipmap_level *lvl = &mt->levels[level]; ++ uint32_t row_align = rmesa->texture_row_align - 1; + + /* Find image size in bytes */ + if (mt->compressed) { @@ -32265,7 +32274,7 @@ index 0000000..34d6261 + lvl->rowstride = (lvl->width * mt->bpp * 2 + 31) & ~31; + lvl->size = lvl->rowstride * ((lvl->height + 1) / 2) * lvl->depth; + } else { -+ lvl->rowstride = (lvl->width * mt->bpp + 31) & ~31; ++ lvl->rowstride = (lvl->width * mt->bpp + row_align) & ~row_align; + lvl->size = lvl->rowstride * lvl->height * lvl->depth; + } + assert(lvl->size > 0); @@ -32289,7 +32298,7 @@ index 0000000..34d6261 + return size; +} + -+static void calculate_miptree_layout(radeon_mipmap_tree *mt) ++static void calculate_miptree_layout(radeonContextPtr rmesa, radeon_mipmap_tree *mt) +{ + GLuint curOffset; + GLuint numLevels; @@ -32307,7 +32316,7 @@ index 0000000..34d6261 + mt->levels[i].depth = minify(mt->depth0, i); + + for(face = 0; face < mt->faces; face++) -+ compute_tex_image_offset(mt, face, i, &curOffset); ++ compute_tex_image_offset(rmesa, mt, face, i, &curOffset); + } + + /* Note the required size in memory */ @@ -32339,7 +32348,7 @@ index 0000000..34d6261 + mt->tilebits = tilebits; + mt->compressed = compressed; + -+ calculate_miptree_layout(mt); ++ calculate_miptree_layout(rmesa, mt); + + mt->bo = radeon_bo_open(rmesa->radeonScreen->bom, + 0, mt->totalsize, 1024, @@ -32673,7 +32682,7 @@ index 1ec06bc..f30eb1c 100644 drm_clip_rect_t *boxes ); diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c -index 8828533..9ce950a 100644 +index 8828533..56dbe74 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -35,6 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -32856,7 +32865,7 @@ index 8828533..9ce950a 100644 r300SetTexOffset, }; -#endif -- + -/* Create the device specific screen private data struct. - */ -static radeonScreenPtr @@ -32868,7 +32877,7 @@ index 8828533..9ce950a 100644 - int i; - int ret; - uint32_t temp = 0; - +- - if (sPriv->devPrivSize != sizeof(RADEONDRIRec)) { - fprintf(stderr,"\nERROR! sizeof(RADEONDRIRec) does not match passed size from device driver\n"); - return GL_FALSE; @@ -32997,7 +33006,19 @@ index 8828533..9ce950a 100644 case PCI_CHIP_RADEON_LY: case PCI_CHIP_RADEON_LZ: case PCI_CHIP_RADEON_QY: -@@ -824,9 +739,145 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) +@@ -561,11 +476,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) + screen->chip_family = CHIP_FAMILY_RS300; + break; + +- /* 9500 with 1 pipe verified by: Reid Linnemann */ + case PCI_CHIP_R300_AD: +- screen->chip_family = CHIP_FAMILY_RV350; +- screen->chip_flags = RADEON_CHIPSET_TCL; +- break; + case PCI_CHIP_R300_AE: + case PCI_CHIP_R300_AF: + case PCI_CHIP_R300_AG: +@@ -824,9 +735,145 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) default: fprintf(stderr, "unknown chip id 0x%x, can't guess.\n", @@ -33144,7 +33165,7 @@ index 8828533..9ce950a 100644 if ((screen->chip_family == CHIP_FAMILY_R350 || screen->chip_family == CHIP_FAMILY_R300) && sPriv->ddx_version.minor < 2) { fprintf(stderr, "xf86-video-ati-6.6.2 or newer needed for Radeon 9500/9700/9800 cards.\n"); -@@ -851,8 +902,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) +@@ -851,8 +898,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) screen->cpp = dri_priv->bpp / 8; screen->AGPMode = dri_priv->AGPMode; @@ -33154,7 +33175,7 @@ index 8828533..9ce950a 100644 if (ret) { if (screen->chip_family < CHIP_FAMILY_RS600) screen->fbLocation = ( INREG( RADEON_MC_FB_LOCATION ) & 0xffff) << 16; -@@ -866,8 +916,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) +@@ -866,8 +912,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) } if (screen->chip_family >= CHIP_FAMILY_R300) { @@ -33164,7 +33185,25 @@ index 8828533..9ce950a 100644 if (ret) { fprintf(stderr, "Unable to get num_pipes, need newer drm\n"); switch (screen->chip_family) { -@@ -962,7 +1011,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) +@@ -893,6 +938,17 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) + } else { + screen->num_gb_pipes = temp; + } ++ ++ /* pipe overrides */ ++ switch (dri_priv->deviceID) { ++ case PCI_CHIP_R300_AD: /* 9500 with 1 quadpipe verified by: Reid Linnemann */ ++ case PCI_CHIP_RV410_5E4C: /* RV410 SE only have 1 quadpipe */ ++ case PCI_CHIP_RV410_5E4F: /* RV410 SE only have 1 quadpipe */ ++ screen->num_gb_pipes = 1; ++ break; ++ default: ++ break; ++ } + } + + if ( sPriv->drm_version.minor >= 10 ) { +@@ -962,7 +1018,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200) if (IS_R200_CLASS(screen)) @@ -33173,7 +33212,7 @@ index 8828533..9ce950a 100644 screen->extensions[i++] = &r200texOffsetExtension.base; #endif -@@ -976,6 +1025,133 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) +@@ -976,6 +1032,154 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) screen->driScreen = sPriv; screen->sarea_priv_offset = dri_priv->sarea_priv_offset; @@ -33218,6 +33257,15 @@ index 8828533..9ce950a 100644 + screen->kernel_mm = 1; + screen->chip_flags = 0; + ++ /* if we have kms we can support all of these */ ++ screen->drmSupportsCubeMapsR200 = 1; ++ screen->drmSupportsBlendColor = 1; ++ screen->drmSupportsTriPerf = 1; ++ screen->drmSupportsFragShader = 1; ++ screen->drmSupportsPointSprites = 1; ++ screen->drmSupportsCubeMapsR100 = 1; ++ screen->drmSupportsVertexProgram = 1; ++ + ret = radeonGetParam(sPriv, RADEON_PARAM_IRQ_NR, &screen->irq); + + ret = radeonGetParam(sPriv, RADEON_PARAM_DEVICE_ID, &device_id); @@ -33258,6 +33306,18 @@ index 8828533..9ce950a 100644 + } else { + screen->num_gb_pipes = temp; + } ++ ++ /* pipe overrides */ ++ switch (device_id) { ++ case PCI_CHIP_R300_AD: /* 9500 with 1 quadpipe verified by: Reid Linnemann */ ++ case PCI_CHIP_RV410_5E4C: /* RV410 SE only have 1 quadpipe */ ++ case PCI_CHIP_RV410_5E4F: /* RV410 SE only have 1 quadpipe */ ++ screen->num_gb_pipes = 1; ++ break; ++ default: ++ break; ++ } ++ + } + + if (screen->chip_family <= CHIP_FAMILY_RS200) @@ -33307,7 +33367,7 @@ index 8828533..9ce950a 100644 return screen; } -@@ -984,23 +1160,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) +@@ -984,23 +1188,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) static void radeonDestroyScreen( __DRIscreenPrivate *sPriv ) { @@ -33353,7 +33413,7 @@ index 8828533..9ce950a 100644 } -@@ -1009,16 +1194,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv ) +@@ -1009,16 +1222,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv ) static GLboolean radeonInitDriver( __DRIscreenPrivate *sPriv ) { @@ -33381,14 +33441,13 @@ index 8828533..9ce950a 100644 /** * Create the Mesa framebuffer and renderbuffers for a given window/drawable. * -@@ -1031,101 +1221,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv, +@@ -1031,101 +1249,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv, const __GLcontextModes *mesaVis, GLboolean isPixmap ) { - radeonScreenPtr screen = (radeonScreenPtr) driScrnPriv->private; + radeonScreenPtr screen = (radeonScreenPtr) driScrnPriv->private; - -- if (isPixmap) { ++ + const GLboolean swDepth = GL_FALSE; + const GLboolean swAlpha = GL_FALSE; + const GLboolean swAccum = mesaVis->accumRedBits > 0; @@ -33396,7 +33455,8 @@ index 8828533..9ce950a 100644 + mesaVis->depthBits != 24; + GLenum rgbFormat; + struct radeon_framebuffer *rfb; -+ + +- if (isPixmap) { + if (isPixmap) return GL_FALSE; /* not implemented */ - } @@ -33573,7 +33633,7 @@ index 8828533..9ce950a 100644 /** * Choose the appropriate CreateContext function based on the chipset. * Eventually, all drivers will go through this process. -@@ -1136,25 +1336,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual, +@@ -1136,25 +1364,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual, { __DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv; radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private); @@ -33609,7 +33669,7 @@ index 8828533..9ce950a 100644 /** -@@ -1216,13 +1412,103 @@ radeonInitScreen(__DRIscreenPrivate *psp) +@@ -1216,13 +1440,103 @@ radeonInitScreen(__DRIscreenPrivate *psp) if (!radeonInitDriver(psp)) return NULL; @@ -33622,7 +33682,7 @@ index 8828533..9ce950a 100644 + (dri_priv->bpp == 16) ? 0 : 8, 1); } +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) - ++ +/** + * This is the driver specific part of the createNewScreen entry point. + * Called when using DRI2. @@ -33703,7 +33763,7 @@ index 8828533..9ce950a 100644 + else + configs = driConcatConfigs(configs, new_configs); + } -+ + + if (configs == NULL) { + fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, + __LINE__); @@ -33715,7 +33775,7 @@ index 8828533..9ce950a 100644 /** * Get information about previous buffer swaps. -@@ -1230,31 +1516,26 @@ radeonInitScreen(__DRIscreenPrivate *psp) +@@ -1230,31 +1544,26 @@ radeonInitScreen(__DRIscreenPrivate *psp) static int getSwapInfo( __DRIdrawablePrivate *dPriv, __DRIswapInfo * sInfo ) { @@ -33757,7 +33817,7 @@ index 8828533..9ce950a 100644 const struct __DriverAPIRec driDriverAPI = { .InitScreen = radeonInitScreen, .DestroyScreen = radeonDestroyScreen, -@@ -1271,23 +1552,7 @@ const struct __DriverAPIRec driDriverAPI = { +@@ -1271,23 +1580,7 @@ const struct __DriverAPIRec driDriverAPI = { .WaitForSBC = NULL, .SwapBuffersMSC = NULL, .CopySubBuffer = radeonCopySubBuffer, From peter at fedoraproject.org Tue May 5 06:13:19 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Tue, 5 May 2009 06:13:19 +0000 (UTC) Subject: rpms/flashrom/F-9 .cvsignore, 1.14, 1.15 flashrom--Makefile_cleanup.diff, 1.6, 1.7 flashrom.spec, 1.16, 1.17 import.log, 1.6, 1.7 sources, 1.14, 1.15 Message-ID: <20090505061319.AF29F70108@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18469/F-9 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: Ver. 0.9.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 14 Apr 2009 08:22:08 -0000 1.14 +++ .cvsignore 5 May 2009 06:12:49 -0000 1.15 @@ -1 +1 @@ -flashrom-4107.tar.bz2 +flashrom-0.9.0.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/flashrom--Makefile_cleanup.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- flashrom--Makefile_cleanup.diff 11 Mar 2009 13:03:56 -0000 1.6 +++ flashrom--Makefile_cleanup.diff 5 May 2009 06:12:49 -0000 1.7 @@ -1,7 +1,7 @@ ---- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 -+++ Makefile 2009-03-11 15:46:46.227346626 +0300 -@@ -9,14 +9,14 @@ - CC = gcc +--- Makefile~ 2009-05-04 03:37:07.000000000 +0400 ++++ Makefile 2009-05-05 10:00:38.680942737 +0400 +@@ -9,9 +9,9 @@ + CC ?= gcc STRIP = strip INSTALL = /usr/bin/install -PREFIX = /usr/local @@ -12,19 +12,7 @@ LDFLAGS = OS_ARCH = $(shell uname) - ifneq ($(OS_ARCH), SunOS) --STRIP_ARGS = -s -+#STRIP_ARGS = -s - endif - ifeq ($(OS_ARCH), Darwin) - CFLAGS += -I/usr/local/include -@@ -40,12 +40,11 @@ - - # Set the flashrom version string from the highest revision number - # of the checked out flashrom files. --SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ -+#SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ - | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"' +@@ -43,7 +43,6 @@ $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/flashrom.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- flashrom.spec 14 Apr 2009 08:22:08 -0000 1.16 +++ flashrom.spec 5 May 2009 06:12:49 -0000 1.17 @@ -1,15 +1,12 @@ -%define svnver 4107 Summary: Simple program for reading/writing BIOS chips content Name: flashrom -Version: 0 -Release: 0.18.20090414svn%{svnver}%{?dist} +Version: 0.9.0 +Release: 1%{?dist} License: GPLv2 Group: Applications/System -# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom -Source0: flashrom-%{svnver}.tar.bz2 +URL: http://coreboot.org/flashrom +Source0: http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff -URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,12 +19,11 @@ Utility which can be used to detect BIOS and write new contents on the chips ("flash the chip"). %prep -%setup -q -n %{name} -%patch0 -b .Makefile_cleanup +%setup -q +%patch0 -p0 -b .Makefile_cleanup %build -# currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -45,6 +41,9 @@ install -D -p -m644 %{name}.8 $RPM_BUILD %{_mandir}/man8/%{name}.* %changelog +* Tue May 5 2009 Peter Lemenkov 0.9.0-1 +- Ver. 0.9.0 + * Tue Apr 14 2009 Peter Lemenkov 0-0.18.20090414svn4107 - Various manpage / README fixes - Board enable support for HP DL145 G3 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- import.log 14 Apr 2009 08:22:08 -0000 1.6 +++ import.log 5 May 2009 06:12:49 -0000 1.7 @@ -4,3 +4,4 @@ flashrom-0-0_14_20081103svn3723_fc9:F-9: flashrom-0-0_15_20090112svn3852_fc10:F-9:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231412366 flashrom-0-0_17_20090311svn3984_fc10:F-9:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776575 flashrom-0-0_18_20090414svn4107_fc10:F-9:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239697141 +flashrom-0_9_0-1_fc10:F-9:flashrom-0.9.0-1.fc10.src.rpm:1241503943 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 14 Apr 2009 08:22:08 -0000 1.14 +++ sources 5 May 2009 06:12:49 -0000 1.15 @@ -1 +1 @@ -784e25d61ac3ae7f3d31914e963acaa3 flashrom-4107.tar.bz2 +e9953bc012b07ce20e83f253e5199c2a flashrom-0.9.0.tar.bz2 From peter at fedoraproject.org Tue May 5 06:15:01 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Tue, 5 May 2009 06:15:01 +0000 (UTC) Subject: rpms/flashrom/EL-5 .cvsignore, 1.14, 1.15 flashrom--Makefile_cleanup.diff, 1.6, 1.7 flashrom.spec, 1.16, 1.17 import.log, 1.6, 1.7 sources, 1.14, 1.15 Message-ID: <20090505061501.9EC0870108@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18765/EL-5 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: Ver. 0.9.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 14 Apr 2009 08:24:17 -0000 1.14 +++ .cvsignore 5 May 2009 06:14:31 -0000 1.15 @@ -1 +1 @@ -flashrom-4107.tar.bz2 +flashrom-0.9.0.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/flashrom--Makefile_cleanup.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- flashrom--Makefile_cleanup.diff 11 Mar 2009 13:05:40 -0000 1.6 +++ flashrom--Makefile_cleanup.diff 5 May 2009 06:14:31 -0000 1.7 @@ -1,7 +1,7 @@ ---- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 -+++ Makefile 2009-03-11 15:46:46.227346626 +0300 -@@ -9,14 +9,14 @@ - CC = gcc +--- Makefile~ 2009-05-04 03:37:07.000000000 +0400 ++++ Makefile 2009-05-05 10:00:38.680942737 +0400 +@@ -9,9 +9,9 @@ + CC ?= gcc STRIP = strip INSTALL = /usr/bin/install -PREFIX = /usr/local @@ -12,19 +12,7 @@ LDFLAGS = OS_ARCH = $(shell uname) - ifneq ($(OS_ARCH), SunOS) --STRIP_ARGS = -s -+#STRIP_ARGS = -s - endif - ifeq ($(OS_ARCH), Darwin) - CFLAGS += -I/usr/local/include -@@ -40,12 +40,11 @@ - - # Set the flashrom version string from the highest revision number - # of the checked out flashrom files. --SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ -+#SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ - | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"' +@@ -43,7 +43,6 @@ $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/flashrom.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- flashrom.spec 14 Apr 2009 08:24:17 -0000 1.16 +++ flashrom.spec 5 May 2009 06:14:31 -0000 1.17 @@ -1,15 +1,12 @@ -%define svnver 4107 Summary: Simple program for reading/writing BIOS chips content Name: flashrom -Version: 0 -Release: 0.18.20090414svn%{svnver}%{?dist} +Version: 0.9.0 +Release: 1%{?dist} License: GPLv2 Group: Applications/System -# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom -Source0: flashrom-%{svnver}.tar.bz2 +URL: http://coreboot.org/flashrom +Source0: http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff -URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,12 +19,11 @@ Utility which can be used to detect BIOS and write new contents on the chips ("flash the chip"). %prep -%setup -q -n %{name} -%patch0 -b .Makefile_cleanup +%setup -q +%patch0 -p0 -b .Makefile_cleanup %build -# currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -45,6 +41,9 @@ install -D -p -m644 %{name}.8 $RPM_BUILD %{_mandir}/man8/%{name}.* %changelog +* Tue May 5 2009 Peter Lemenkov 0.9.0-1 +- Ver. 0.9.0 + * Tue Apr 14 2009 Peter Lemenkov 0-0.18.20090414svn4107 - Various manpage / README fixes - Board enable support for HP DL145 G3 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- import.log 14 Apr 2009 08:24:17 -0000 1.6 +++ import.log 5 May 2009 06:14:31 -0000 1.7 @@ -4,3 +4,4 @@ flashrom-0-0_14_20081103svn3723_fc9:EL-5 flashrom-0-0_15_20090112svn3852_fc10:EL-5:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231426886 flashrom-0-0_17_20090311svn3984_fc10:EL-5:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776717 flashrom-0-0_18_20090414svn4107_fc10:EL-5:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239697384 +flashrom-0_9_0-1_fc10:EL-5:flashrom-0.9.0-1.fc10.src.rpm:1241504039 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 14 Apr 2009 08:24:17 -0000 1.14 +++ sources 5 May 2009 06:14:31 -0000 1.15 @@ -1 +1 @@ -784e25d61ac3ae7f3d31914e963acaa3 flashrom-4107.tar.bz2 +e9953bc012b07ce20e83f253e5199c2a flashrom-0.9.0.tar.bz2 From peter at fedoraproject.org Tue May 5 06:17:18 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Tue, 5 May 2009 06:17:18 +0000 (UTC) Subject: rpms/flashrom/EL-4 .cvsignore, 1.14, 1.15 flashrom--Makefile_cleanup.diff, 1.6, 1.7 flashrom.spec, 1.16, 1.17 import.log, 1.6, 1.7 sources, 1.14, 1.15 Message-ID: <20090505061718.1641170108@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19095/EL-4 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: Ver. 0.9.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 14 Apr 2009 08:26:28 -0000 1.14 +++ .cvsignore 5 May 2009 06:16:47 -0000 1.15 @@ -1 +1 @@ -flashrom-4107.tar.bz2 +flashrom-0.9.0.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/flashrom--Makefile_cleanup.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- flashrom--Makefile_cleanup.diff 11 Mar 2009 13:07:14 -0000 1.6 +++ flashrom--Makefile_cleanup.diff 5 May 2009 06:16:47 -0000 1.7 @@ -1,7 +1,7 @@ ---- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 -+++ Makefile 2009-03-11 15:46:46.227346626 +0300 -@@ -9,14 +9,14 @@ - CC = gcc +--- Makefile~ 2009-05-04 03:37:07.000000000 +0400 ++++ Makefile 2009-05-05 10:00:38.680942737 +0400 +@@ -9,9 +9,9 @@ + CC ?= gcc STRIP = strip INSTALL = /usr/bin/install -PREFIX = /usr/local @@ -12,19 +12,7 @@ LDFLAGS = OS_ARCH = $(shell uname) - ifneq ($(OS_ARCH), SunOS) --STRIP_ARGS = -s -+#STRIP_ARGS = -s - endif - ifeq ($(OS_ARCH), Darwin) - CFLAGS += -I/usr/local/include -@@ -40,12 +40,11 @@ - - # Set the flashrom version string from the highest revision number - # of the checked out flashrom files. --SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ -+#SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ - | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"' +@@ -43,7 +43,6 @@ $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/flashrom.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- flashrom.spec 14 Apr 2009 08:26:28 -0000 1.16 +++ flashrom.spec 5 May 2009 06:16:47 -0000 1.17 @@ -1,15 +1,12 @@ -%define svnver 4107 Summary: Simple program for reading/writing BIOS chips content Name: flashrom -Version: 0 -Release: 0.18.20090414svn%{svnver}%{?dist} +Version: 0.9.0 +Release: 1%{?dist} License: GPLv2 Group: Applications/System -# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom -Source0: flashrom-%{svnver}.tar.bz2 +URL: http://coreboot.org/flashrom +Source0: http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff -URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,12 +19,11 @@ Utility which can be used to detect BIOS and write new contents on the chips ("flash the chip"). %prep -%setup -q -n %{name} -%patch0 -b .Makefile_cleanup +%setup -q +%patch0 -p0 -b .Makefile_cleanup %build -# currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -45,6 +41,9 @@ install -D -p -m644 %{name}.8 $RPM_BUILD %{_mandir}/man8/%{name}.* %changelog +* Tue May 5 2009 Peter Lemenkov 0.9.0-1 +- Ver. 0.9.0 + * Tue Apr 14 2009 Peter Lemenkov 0-0.18.20090414svn4107 - Various manpage / README fixes - Board enable support for HP DL145 G3 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- import.log 14 Apr 2009 08:26:28 -0000 1.6 +++ import.log 5 May 2009 06:16:47 -0000 1.7 @@ -4,3 +4,4 @@ flashrom-0-0_14_20081103svn3723_fc9:EL-4 flashrom-0-0_15_20090112svn3852_fc10:EL-4:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231431453 flashrom-0-0_17_20090311svn3984_fc10:EL-4:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776794 flashrom-0-0_18_20090414svn4107_fc10:EL-4:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239697521 +flashrom-0_9_0-1_fc10:EL-4:flashrom-0.9.0-1.fc10.src.rpm:1241504157 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 14 Apr 2009 08:26:28 -0000 1.14 +++ sources 5 May 2009 06:16:47 -0000 1.15 @@ -1 +1 @@ -784e25d61ac3ae7f3d31914e963acaa3 flashrom-4107.tar.bz2 +e9953bc012b07ce20e83f253e5199c2a flashrom-0.9.0.tar.bz2 From alexlan at fedoraproject.org Tue May 5 06:19:43 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 06:19:43 +0000 (UTC) Subject: rpms/perl-XML-XPathEngine/devel .cvsignore, 1.3, 1.4 perl-XML-XPathEngine.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <20090505061943.5B38170108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-XML-XPathEngine/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19569 Modified Files: .cvsignore perl-XML-XPathEngine.spec sources Log Message: - Update to latest upstream (#499068) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 4 Jun 2008 07:58:34 -0000 1.3 +++ .cvsignore 5 May 2009 06:19:12 -0000 1.4 @@ -1 +1 @@ -XML-XPathEngine-0.11.tar.gz +XML-XPathEngine-0.12.tar.gz Index: perl-XML-XPathEngine.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/devel/perl-XML-XPathEngine.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- perl-XML-XPathEngine.spec 27 Feb 2009 04:54:43 -0000 1.6 +++ perl-XML-XPathEngine.spec 5 May 2009 06:19:12 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-XML-XPathEngine -Version: 0.11 -Release: 2%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: Re-usable XPath engine for DOM-like trees License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon May 4 2009 Alex Lancaster - 0.12-1 +- Update to latest upstream (#499068) + * Thu Feb 26 2009 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 Jun 2008 07:58:34 -0000 1.3 +++ sources 5 May 2009 06:19:12 -0000 1.4 @@ -1 +1 @@ -63c1f458501174eeb3025506426fd27c XML-XPathEngine-0.11.tar.gz +ecb1121f5a11411a2d4942c87d8725af XML-XPathEngine-0.12.tar.gz From alexlan at fedoraproject.org Tue May 5 06:27:53 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 06:27:53 +0000 (UTC) Subject: rpms/perl-XML-XPathEngine/F-11 .cvsignore, 1.3, 1.4 perl-XML-XPathEngine.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <20090505062753.926D970108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-XML-XPathEngine/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20665/F-11 Modified Files: .cvsignore perl-XML-XPathEngine.spec sources Log Message: - Update to latest upstream (#499068) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 4 Jun 2008 07:58:34 -0000 1.3 +++ .cvsignore 5 May 2009 06:27:23 -0000 1.4 @@ -1 +1 @@ -XML-XPathEngine-0.11.tar.gz +XML-XPathEngine-0.12.tar.gz Index: perl-XML-XPathEngine.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-11/perl-XML-XPathEngine.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- perl-XML-XPathEngine.spec 27 Feb 2009 04:54:43 -0000 1.6 +++ perl-XML-XPathEngine.spec 5 May 2009 06:27:23 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-XML-XPathEngine -Version: 0.11 -Release: 2%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: Re-usable XPath engine for DOM-like trees License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon May 4 2009 Alex Lancaster - 0.12-1 +- Update to latest upstream (#499068) + * Thu Feb 26 2009 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 Jun 2008 07:58:34 -0000 1.3 +++ sources 5 May 2009 06:27:23 -0000 1.4 @@ -1 +1 @@ -63c1f458501174eeb3025506426fd27c XML-XPathEngine-0.11.tar.gz +ecb1121f5a11411a2d4942c87d8725af XML-XPathEngine-0.12.tar.gz From alexlan at fedoraproject.org Tue May 5 06:27:53 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 06:27:53 +0000 (UTC) Subject: rpms/perl-XML-XPathEngine/F-10 .cvsignore, 1.3, 1.4 perl-XML-XPathEngine.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <20090505062753.645EA70108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-XML-XPathEngine/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20665/F-10 Modified Files: .cvsignore perl-XML-XPathEngine.spec sources Log Message: - Update to latest upstream (#499068) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 4 Jun 2008 07:58:34 -0000 1.3 +++ .cvsignore 5 May 2009 06:27:22 -0000 1.4 @@ -1 +1 @@ -XML-XPathEngine-0.11.tar.gz +XML-XPathEngine-0.12.tar.gz Index: perl-XML-XPathEngine.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-10/perl-XML-XPathEngine.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- perl-XML-XPathEngine.spec 4 Jun 2008 07:58:34 -0000 1.5 +++ perl-XML-XPathEngine.spec 5 May 2009 06:27:22 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-XML-XPathEngine -Version: 0.11 +Version: 0.12 Release: 1%{?dist} Summary: Re-usable XPath engine for DOM-like trees License: GPL+ or Artistic @@ -47,6 +47,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon May 4 2009 Alex Lancaster - 0.12-1 +- Update to latest upstream (#499068) + +* Thu Feb 26 2009 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Jun 4 2008 Alex Lancaster - 0.11-1 - Update to latest upstream (0.11) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 Jun 2008 07:58:34 -0000 1.3 +++ sources 5 May 2009 06:27:22 -0000 1.4 @@ -1 +1 @@ -63c1f458501174eeb3025506426fd27c XML-XPathEngine-0.11.tar.gz +ecb1121f5a11411a2d4942c87d8725af XML-XPathEngine-0.12.tar.gz From alexlan at fedoraproject.org Tue May 5 06:27:53 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 06:27:53 +0000 (UTC) Subject: rpms/perl-XML-XPathEngine/F-9 .cvsignore, 1.3, 1.4 perl-XML-XPathEngine.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <20090505062753.DE50370108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-XML-XPathEngine/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20665/F-9 Modified Files: .cvsignore perl-XML-XPathEngine.spec sources Log Message: - Update to latest upstream (#499068) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 4 Jun 2008 09:41:47 -0000 1.3 +++ .cvsignore 5 May 2009 06:27:23 -0000 1.4 @@ -1 +1 @@ -XML-XPathEngine-0.11.tar.gz +XML-XPathEngine-0.12.tar.gz Index: perl-XML-XPathEngine.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-9/perl-XML-XPathEngine.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- perl-XML-XPathEngine.spec 4 Jun 2008 09:41:47 -0000 1.5 +++ perl-XML-XPathEngine.spec 5 May 2009 06:27:23 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-XML-XPathEngine -Version: 0.11 +Version: 0.12 Release: 1%{?dist} Summary: Re-usable XPath engine for DOM-like trees License: GPL+ or Artistic @@ -47,6 +47,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon May 4 2009 Alex Lancaster - 0.12-1 +- Update to latest upstream (#499068) + +* Thu Feb 26 2009 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Jun 4 2008 Alex Lancaster - 0.11-1 - Update to latest upstream (0.11) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 Jun 2008 09:41:47 -0000 1.3 +++ sources 5 May 2009 06:27:23 -0000 1.4 @@ -1 +1 @@ -63c1f458501174eeb3025506426fd27c XML-XPathEngine-0.11.tar.gz +ecb1121f5a11411a2d4942c87d8725af XML-XPathEngine-0.12.tar.gz From liangsuilong at fedoraproject.org Tue May 5 06:59:04 2009 From: liangsuilong at fedoraproject.org (=?utf-8?b?5qKB56mX6ZqG?=) Date: Tue, 5 May 2009 06:59:04 +0000 (UTC) Subject: rpms/iptux/devel import.log, NONE, 1.1 iptux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090505065904.3D2B470108@cvs1.fedora.phx.redhat.com> Author: liangsuilong Update of /cvs/pkgs/rpms/iptux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21940/devel Modified Files: .cvsignore sources Added Files: import.log iptux.spec Log Message: --- NEW FILE import.log --- iptux-0_4_5-2_fc10:HEAD:iptux-0.4.5-2.fc10.src.rpm:1241505455 --- NEW FILE iptux.spec --- Name: iptux Version: 0.4.5 Release: 2%{?dist} Summary: A software for sharing in LAN Group: Applications/Internet License: GPLv2+ URL: http://code.google.com/p/iptux/ Source0: http://iptux.googlecode.com/files/%{name}-%{version}-2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: GConf2-devel, gtk2-devel, desktop-file-utils BuildRequires: gettext, dbus-devel, gstreamer-devel %description A software for sharing and transporting files and directories in LAN. It is written by C++ and the skin is designed by gtk. Iptux is based on ipmsg, so you can use it send files to a Windows PC which has an ipmsg Windows edition in Lan. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} desktop-file-install \ --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 README TODO AUTHORS %{_bindir}/%{name} %{_bindir}/ihate%{name} %{_datadir}/applications/iptux.desktop %{_datadir}/%{name}/ %{_datadir}/pixmaps/ip-tux.png %{_datadir}/pixmaps/i-tux.png %changelog * Tue Mar 3 2009 Liang Suilong 0.4.5-1 - Upstream to 0.4.5 * Fri Feb 27 2009 Liang Suilong 0.4.5-0.1.rc3 - Upstream to 0.4.5-rc4 - Remove the iptux-0.4.5-rc1-revert-using-ipv4_order.patch - Remove the iptux-0.4.4-g++44.patch * Sun Feb 15 2009 Liang Suilong 0.4.5-0.1.rc3 - Upstream to 0.4.5-rc3 * Sun Feb 15 2009 Liang Suilong 0.4.5-0.1.rc1 - Upstream to 0.4.5-rc1 * Tue Jan 19 2009 Liang Suilong 0.4.4-2 - Fix build error with g++44 * Tue Jan 19 2009 Liang Suilong 0.4.4-1 - Upstream to 0.4.4 * Wed Dec 24 2008 Liang Suilong -0.4.3-1 - Initial Package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iptux/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 19 Apr 2009 01:24:49 -0000 1.1 +++ .cvsignore 5 May 2009 06:58:32 -0000 1.2 @@ -0,0 +1 @@ +iptux-0.4.5-2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iptux/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 19 Apr 2009 01:24:49 -0000 1.1 +++ sources 5 May 2009 06:58:32 -0000 1.2 @@ -0,0 +1 @@ +7804f8a8486e8e9fa23eb661e34b3686 iptux-0.4.5-2.tar.gz From thm at fedoraproject.org Tue May 5 07:09:49 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Tue, 5 May 2009 07:09:49 +0000 (UTC) Subject: rpms/waf/devel .cvsignore, 1.12, 1.13 import.log, 1.7, 1.8 sources, 1.12, 1.13 waf.spec, 1.15, 1.16 Message-ID: <20090505070950.0FBD770108@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/waf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27421/devel Modified Files: .cvsignore import.log sources waf.spec Log Message: Update to 1.5.6. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 25 Apr 2009 14:47:37 -0000 1.12 +++ .cvsignore 5 May 2009 07:09:19 -0000 1.13 @@ -1 +1 @@ -waf-1.5.5.stripped.tar.bz2 +waf-1.5.6.stripped.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- import.log 25 Apr 2009 14:47:38 -0000 1.7 +++ import.log 5 May 2009 07:09:19 -0000 1.8 @@ -5,3 +5,4 @@ waf-1_5_2-2_fc10:HEAD:waf-1.5.2-2.fc10.s waf-1_5_3-1_fc10:HEAD:waf-1.5.3-1.fc10.src.rpm:1233608182 waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.src.rpm:1239132971 waf-1_5_5-1_fc10:HEAD:waf-1.5.5-1.fc10.src.rpm:1240670795 +waf-1_5_6-1_fc11:HEAD:waf-1.5.6-1.fc11.src.rpm:1241507304 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/waf/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 25 Apr 2009 14:47:38 -0000 1.12 +++ sources 5 May 2009 07:09:19 -0000 1.13 @@ -1 +1 @@ -37e7124312f27a226feea9f7cac01ec2 waf-1.5.5.stripped.tar.bz2 +7efca6a12dfe6a23f454c2e02aa99ace waf-1.5.6.stripped.tar.bz2 Index: waf.spec =================================================================== RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- waf.spec 25 Apr 2009 14:47:38 -0000 1.15 +++ waf.spec 5 May 2009 07:09:19 -0000 1.16 @@ -1,5 +1,5 @@ Name: waf -Version: 1.5.5 +Version: 1.5.6 Release: 1%{?dist} Summary: A Python-based build system Group: Development/Tools @@ -83,6 +83,9 @@ find demos utils -type f -exec %{__chmod %changelog +* Tue May 5 2009 Thomas Moschny - 1.5.6-1 +- Update to 1.5.6. + * Mon Apr 20 2009 Thomas Moschny - 1.5.5-1 - Update to 1.5.5. From thm at fedoraproject.org Tue May 5 07:14:22 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Tue, 5 May 2009 07:14:22 +0000 (UTC) Subject: rpms/waf/F-11 .cvsignore, 1.12, 1.13 import.log, 1.7, 1.8 sources, 1.12, 1.13 waf.spec, 1.15, 1.16 Message-ID: <20090505071422.65D4570108@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/waf/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28166/F-11 Modified Files: .cvsignore import.log sources waf.spec Log Message: Update to 1.5.6. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/waf/F-11/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 25 Apr 2009 15:00:00 -0000 1.12 +++ .cvsignore 5 May 2009 07:13:51 -0000 1.13 @@ -1 +1 @@ -waf-1.5.5.stripped.tar.bz2 +waf-1.5.6.stripped.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/waf/F-11/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- import.log 25 Apr 2009 15:00:00 -0000 1.7 +++ import.log 5 May 2009 07:13:51 -0000 1.8 @@ -5,3 +5,4 @@ waf-1_5_2-2_fc10:HEAD:waf-1.5.2-2.fc10.s waf-1_5_3-1_fc10:HEAD:waf-1.5.3-1.fc10.src.rpm:1233608182 waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.src.rpm:1239132971 waf-1_5_5-1_fc10:F-11:waf-1.5.5-1.fc10.src.rpm:1240671397 +waf-1_5_6-1_fc11:F-11:waf-1.5.6-1.fc11.src.rpm:1241507587 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/waf/F-11/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 25 Apr 2009 15:00:00 -0000 1.12 +++ sources 5 May 2009 07:13:51 -0000 1.13 @@ -1 +1 @@ -37e7124312f27a226feea9f7cac01ec2 waf-1.5.5.stripped.tar.bz2 +7efca6a12dfe6a23f454c2e02aa99ace waf-1.5.6.stripped.tar.bz2 Index: waf.spec =================================================================== RCS file: /cvs/pkgs/rpms/waf/F-11/waf.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- waf.spec 25 Apr 2009 15:00:00 -0000 1.15 +++ waf.spec 5 May 2009 07:13:51 -0000 1.16 @@ -1,5 +1,5 @@ Name: waf -Version: 1.5.5 +Version: 1.5.6 Release: 1%{?dist} Summary: A Python-based build system Group: Development/Tools @@ -83,6 +83,9 @@ find demos utils -type f -exec %{__chmod %changelog +* Tue May 5 2009 Thomas Moschny - 1.5.6-1 +- Update to 1.5.6. + * Mon Apr 20 2009 Thomas Moschny - 1.5.5-1 - Update to 1.5.5. From caolanm at fedoraproject.org Tue May 5 07:31:05 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 5 May 2009 07:31:05 +0000 (UTC) Subject: rpms/hunspell-so/devel hunspell-so.spec, NONE, 1.1 import.log, NONE, 1.1 so-SO@dictionaries.addons.mozilla.org3.xpi, NONE, 1.1 Message-ID: <20090505073105.A59C270108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-so/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30001/devel Added Files: hunspell-so.spec import.log so-SO at dictionaries.addons.mozilla.org3.xpi Log Message: --- NEW FILE hunspell-so.spec --- Name: hunspell-so Summary: Somali hunspell dictionaries Version: 0.1.2 Release: 1%{?dist} Group: Applications/Text Source: http://www.opensourcesomalia.org/uploads/so-SO at dictionaries.addons.mozilla.org3.xpi URL: http://www.opensourcesomalia.org/index.php?page=hingaad-saxe BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPLv2+ BuildArch: noarch Requires: hunspell %description Somali hunspell dictionaries. %prep %setup -q -c %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p dictionaries/so-SO.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/so_SO.aff cp -p dictionaries/so-SO.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/so_SO.dic pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ so_SO_aliases="so_DJ so_ET so_KE" for lang in $so_SO_aliases; do ln -s so_SO.aff $lang.aff ln -s so_SO.dic $lang.dic done popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc xuquuqda/* %{_datadir}/myspell/* %changelog * Sun May 03 2009 Caolan McNamara - 0.1.2-1 - initial version --- NEW FILE import.log --- hunspell-so-0_1_2-1_fc11:HEAD:hunspell-so-0.1.2-1.fc11.src.rpm:1241508616 --- NEW FILE so-SO at dictionaries.addons.mozilla.org3.xpi --- PK O?W???On???.??)??fx&?z?%?????06??????_HaM~0??????@>?/??f!?+)J??| B&x?8?M"?s??????P??Q???'`??|?????Q>?8Q??????????^???? ?Z???v?z??5??o?!??j?I ?????NN????????/????&7??_????i???????b??dD?@'?v?@??:_????????J@??*;t?Q?%? ???uy??[????pd??O?1?mC??O?]??|????o??W??b?k??f;|???V Xt_???h??x{?'??=P?7????fz ???d0TQ!?o??n2?:?A?k????'??_??xr????BOq?oGZ???1I!? ?1&R?? ?B???Z?????n??z?>1??????F?rn??=????%?;????? B9?'CJ??D???uE-?W??d?^?C;^o??;Q??j?G?X???????????0O]?????TSB U??J?{?????=? ??X??Ua??6.???????#????SB?~????????M???]1- ?Z"@],??,?J??>}?qH@??<u$?G??m_?$.? ?k??UC????s??qN??/??+?m?A?JV?N??3?DN?.???&??????N??BDX(K???=Qq ??????B -?PxG*J??Xby??4?h??V???M[E?(?:?<?&?h?`?L]4y2?L5?R?TEIuQ??(?)????OTa?C???????Zdp?\??K??V?????r?X*?r??BEO?z?xR3?>B???g?|,T?A?5+?o?n? ?=????/ ???,?_??q (VZ]Op??2?x?Y??F??Z}???mUi? li?S,??|d?????e?? !$??,q??? b???a+???I????VQ'?n'?6????U?>???F?+???j?l?r??j? ?q???????Z????2?hM'?T??Hk???x??[/P?????|ddX?"N?91?PA8??h#"??)-[{??8? ??o?q=RZ??xnIV^??? ^?.???hdkB? ?(??%???i?n?Q??sUx~"7:!???U(???Yh????( ????:?('j? v???"???0????E?S;??,??.?W?????U?f???)??????pq???$T?"^g??bW?/??OZZ#?[q?[q\6F?????+?W????X?? ?Ww?nB?E????+?????8;?L?????^VdyY?f???ge??^??Y????h??[?T>?YJ<C,?????vRS????Oj??k???&?o?????|;???62C??w?U??nM???C??Wv3;"???????Z?9 (????? qO?7??x???.?-?=?1???????2??a?Y???PK ?b? ????????????[??C????????????????BU???h~W????+?Vx?????bg??>m????H??fC2?j~???????O6?????@J?Y???F??V?`??A`P?]jTb??\?~#???????>?2???D??????i??,%?B+g?;>'l??R?l+b}???B?2vG#? d???RR???????l??????[J#0W?? ?]g?b??T??QW???ql??7a?@??S?BL????$???R???"?4I?,?D?T2????R?????f?y?X>???F???V{?O??m?A??? X???[a)I?5)#G?3D????U??d?ld{k[:?????.?*k!,???"???^W[I????+(???C??G??QCS??"??j!?r#k'4????(??Sm;????8^%????T?ea?????Tf?.l%??C??\?$?(??L?t?8?*?j?????41-E[??bQ??p???]????J?????'?,?????fb????\???&??TR$??I??(;'u?T+?Vj??|?J?A=I8?@??$(??j?sKt?;?c)$[2???MY??????^?????U?-1?????b6?V ?$#?????d?a??E?dVZ???g?????ET2??&?p?Qd6?????!?????i???#??l??!????O????~4m?Q?$4????????Y!d4D???jt?0 O?E?M??(??DI?(?c+?A??@fF?(U????? <5?#[lNY 2\?g'?????s????|)2?^???w [V?? yQ?J??Z?k?R??r?????w????~?E???*k?HFYeA??z???ri?j??,Z4-O??? l-??D??g#i?&??)?,1 I??m?VO????????k?u?:ge??x DcH?????F?R?tj?jN?A/??hB?D???Q?g]PM>?C"L?? ?K?S??a???7J?O???1?A^@?X??%??B?e@%????1 gO)??????Q ?L??{e?????? ??-??Wr?X??G??sv!?]X????=??L?JmQ?j)?X???y???=??? U?E?? +?Qu????e5&p?lN? ?=66??!??6#?Dj%{?;J?? Xa??? ???M???g+)?n/zyi?Q>#?F?{4K4)?hWT?^+??@cE????h??M????S2?F?c????O?'?2?TA?(?;.?e??]DIM*'?d??9I)GR???l???exJ??\?Y?V???(?W???q ?Z???Tfk??XcP?`?O`?68? km???`??? j5?|???$Q??$?H.p8??? ??b?:?:?:?9?T? ??RbKj?6l?,??`???T m??T?Z>}??m??p??)0??k?HTj?1? c?\?}?4W??`3hV?? @z???{?[*??r?\a\?^?D????H?_??KU?%1G?????? ??Wf??o?????=?????"4???Rt?????????Y?T?`?Q???"???l????G+2_????BJ{???a?C??U?????F{??'j?"?j????t?"U0??PT??= ??V??V??$???????????K??9?????hP1+?????=?0?A?ea"cM??????f??o?r[??.????h??ct?2S??=??a&?;?c|??y??j?????-??\? ? ?X???5?n?&??-? ??(3fEa;??B???????w????~??IJ?Y?$D??!?q?x??{iW??>j????G[P\????zi???R?0????A?????a??"<?Cd??p???(s7M???H?^f??-?>??????????9?0?D?,M?~???b??`??Q>) ?D??????c1???"?^&7,?P??R,?7??:MH/.?0y\&v?yJ?T?#?7'??c?7??V?g?(??$K%?H?&?*?\?-??6r?Ke??]??l????$???????1F?+!?l?V)??? ?? Yx9z??v6??????\n4m???4?Rd(*Oe?E??S&yR??gT&>8??o?!??E?v???$F??(TC?T ???!???-6\?,b at 2{????V?"??+??R???M?R+???r"?}'a????? ?Nx? w??r?w?"???YD?0?^o?]??$hnU????f?&0amF????#2?"??D????J?]?!?>??F?y? ,?}Gjsa??=?I? ?<9?Y?????5D?)???d?_&??|??W??Us?M????t???/IX?rXG n???M??U%???>?\?jX? *?lJgs?9J????d?A6Dk????d??Z??=???r??)?2X?????rW???h|?J??]PS????E???e??]???WCe+? ANyx????????1u??(?3?olAee?lT???)V+"??%??6? ?]?EU?????????d?XVrn??? \Lr?x?M???p?l69eBVP????J?+????Q?M??????f?H??????Y??&?? 9]?H?? 5??'O,T?V???;???{??;?KS??G?K???S [Nu0????2~>_\?wEWp?X?w?U"c_?V?T:y???m????kbV???u~mo??k????X \???c;???*???>?[?T(?? ?R T?????Z(M???M?h?fs?w?r-???Y? ???^??};?u\??*M??dfRd??!9?2????."??C?????W??i/1???\?Y?R?6???]?b?G??^?UM??8=?@? o9?$??????&1_???"?}?*om{Q?K'=??p ???|?????T??W'f?H????o\????K?+jI???L?4???%???Tyz;?????'N????D?( ??g???V?l??_?e?[]?W??a??^???p?!X?7?"?^[?????pS???\?k9h?2??$Q?#lO???3??95???g?$zu??`???\?_v?Uid&?/?L C?i{?~?4???D????3Q}?? l??kxe&???;? L?V?w>?? 30A/?IZ??[ F?%/??3=???W1$????$????.?b???8?? ??bjM?W?z??RD'?!?R?U???!????s?$??f?:? ??@5R?? 2??,q??? R_??]????j?. ?iI6;????r?n????t??);? W??j&w????<(BP](??wCe?k(?i~??K4??????j-j??cvt#e?C??`??c?????j?t0i? ?8.Gr???N?z]?&??m?lh??o??}?Mc?dJ&??%?T ?x?UH? X7:??`??m 6?$??12?S??}??e??>??,???z#??I"T`U?K?k?K?_?\,?????T?O??y???Ehm[N??$(?&w?????m2A)I?`?Y??51)t??$i????*??{AI??x?C??n:r??Uq?????-?? ??$mvz??[?Y?M??)?v<V?U~????r?0k?? ?@? ?B?8? ??y?[?????Wy?xZ! ,???(??s#?? ??u??? V? C]???.???=?]J??l??? v??{?&6???JQQ??w&?8 ?$??]=j??@Hm???? *`2????J?X?X?#???A???????;??N?U?)qNQ?96?????iG??#?-?? S???>?&?h??#??Ra(????6???; ??o? r???W?ZD?`?? ???7?]?y???W?D?R[c??6?6?????????U????-??=?k??V????(?h???>?z?i@??????R??H???6V???D?/??? ?D?:?^??C??????Sw???????G?D??w?G?y??%??W1 ?"w??w??????P??????????!} ?y??ow??&t? CIvV?/???????P[???W/=???g???u?$,??CA????5o?c3 ????U?3?J???*a(?\??????^?WNQ???T?>17?J???~?7kwqD?~%?V?????* ^??0U???G?e>???E b?!Kf??#! ????w\???z?????? ????9???dn?.????I????w_? ??eI?d??)???Vs?? ??* J??LJ? *?????j???p???1???q????*+E?? 9er3da~W???J?????J???L?AT!"ev(??K??CA~?4??2??????? ?? ?dh??Qd?Tu]?]G/r?@rR?M?5??a??qUdu??[?c???i|Ke??P?1{?MM??Cr?0#?k??e{??~( ?Fq???????????? ??o~ $^Z at A4A(;???$???A??t?Z?k3?'?N??E??? G#????????aP?????0t??&$6? ?'IIW???$?7N??^:??6???)??jz??????%?:?f:??N??L+D!S?2?jg? ???x??m??Sa?? 8K??????L?]? ???%??v????????OE-E3U????? ??L)??H}??9???O0??s??=~???v?+ U????^?l+?U~?????_W???O????YX"????Q?D?6G ? ?&G????-R`;??r 7?QH???,Fe ? 6??)8 ^]s8??j??phJ??ia*$=??=N?*??(?pf?ZY#G??*?-?V??yU????*?=?9??n)N?? ?-l?????i-??????{???=??=?)}???? [\???g?z'P????s?h=???tp??on??????D??b?,??Z??z:?"??r??@?P????t?{ ?????=??P??????????m????P ????Ad?? be??[?"?%e??#,}?F?u??t???iK/o??a??1??9???]y?\)??#dN\s???8?9?.?%??1???0)??`gl? ?????{#??(,??? q?WSz?????+?=?8oD:??~?s??vtG?&.j?DcJd?f? ?TX 1?,Bep?6}?`?8???A?n`G??w?%?)y??-[.I????%?[???[?p?U??[&z?:?-k???rG?9H???????"?^z?fY[????`??5????J?eN[?1?? @??????"??Y????Gj%???YDZ:??sj??OQ?Z??z??c???w6?))????C??`JL????Q????S ;'?v?M??i?!?????&n????aX? :????]???IHG???=????p>??q???????^I!?B??GM???0b???^y?5??G^?????8????7?{??LU ?3?F?tg???)?/'??? ]???q???? ?J?^J5^d?=v?8?H?n??????UL7m?$\???s?-M\:3E?`?N ?4a??$#E??f??e????t??;???]??l??Fp???1?1&?m?OC????A?hd??e*?lTt??[%:??? ??S( :r???i?4mJ 4?is??i?kDBB??????n&?&L??w?A? ??,W?.?Y??B??ba?s?]8?MiOKB-???({?r?????[Ner?????nJ=?_??T?Ms??V????A?>??????dy?Mt???????9?{!???lO????F?o%=?p}???;???V?#Y?Ag~????????KO????!??N?M?%p9 6???-va?; 2Pt???%?????{j?(Bu???xX??R????F???3?????(???E????HB???L4??v????N??W??}!????8?7?(???b@:?yT?????e???$}+b?F?eZ?? ??;??B??????W]???? 7? |q???????8??4??uh?????(P?+???u?$???;J++?Z???} ?F??.H????B?`?{8!F^?????=?)$ ???3?O&N??fJ????~?3???\W2?I7A?I%I?f???-?I????????S?Yh8?I"??>?"?%?*?jb?? ??P,??b ??g?K???UVbg??5??lg???$?I??????"?'=?}?x?n??.?z?b??h`';?]?L??????\?l?B?;UnZ?w?@?:??????? ??????@?E??:?#M?H|??1?+ O?O;|?c?{%?jl???u?????B6 ??"?u~?"n/ |?????x?????C?M???r?h?.????????y?????|w??>????r? ??P??sS ?LR1?w0+?*,??Mb???bG??'? ??2?~??pW???4?8??F=?;r ??z??3??B? x]ITpj? v)7U???`??f???'9??b;???S?Vuh?H?E?1?7qr?)?#^#?"????z???????_????B????????>?z???I?i?;u?UE??+?s??q}?v??????^:???Vk?C91(?G????I>F?*?S??c59?&??"?V?2*?????p ^?> p??????8Y??eD?2?? ?<|???? ?@L?%f??i??VI?(? ?QO?$?B?(??alEZ????Ew5????#?&????[??2; ?Q???.?\??Mj?z#G? ???$? :A?M??$Y??8?.???:???&fr???p??l???b?oh?????^????????hJ???Q???GI&??HDE?????????P6???$?????\;???wov?7?????*????. z? ?5y??Zrte1-dKw??? ????Y?x?W-'??8????'?I?D?$|*???M???$?????>?ef'd???SmU??t??V???H?NW?'x+?v??(j}cH??Z??,??rw;?#?E-\ ??p???Nw?;??????n1????jP? ??c'??X}??2?4???Rk?????AOo?????R3? ?? ???Q9?\???!?fN?M? i#NC*?????????j??_??#1Er??6???'?SY`?O??vvUWN???E???Z?;?J?M??M_p?g??? V?,$?????`?z?t??,Z?[-,????l??E?2?5.n?????^[\r??dZM??"???\!?+>? ?/?6???><????y?r?w?????D?v?}?????J?I?Q|{y???_6ik??????!4??? ???m?nT???6?l9???? n?_q2Q??Ke??.?."?U??#1eW??m??5?-???y??6????mn"/??2FY?qp'i,???*:0?I??\g?;T????G???*.?????e????%Q?vg??????_?<r??&?_*w??|J.I/?K?W??c?o?9U?86"????8??#/????X???$?8-?):????}??;???T?d???vt???Z;?GkIT? K?R1q??c??J?K???l[?@SO??Z?t??K;???q|?n????K??\?(H'=?NT?I??6ilJ|? JG????? I8?(?10?????6?y?:X p??t?G???? ?u?????????X?d_K??{h??xC?v???_pAx?:??cS46N??? ???~???5??66*bYs??M?%Q?????ds ?W?~??????^??baj?X(}?~??9x_? ?c2?c??|?.!?9?!M???`??5?&??)?A?%S?ah?????'!? ze]?5#????#?tTx??????j?=?L3S??$YD?@,???W=N?'?\9tYuD g??S+?xs????????*#??ee?J!6?E?????s??r???? ?B>'?????G1??8 ?N?? +gETs???ZX???f??? ??d3?po?7X????????H ?q$????&???D??F"????@?^??????Qn??-??,?? ?\x?~M??0 ?M?? ~??Rp-C Q ?{?_? ???f?`?N?G??:'?#??4????aNf=?O????B????? g??#56?X????T?3?u1 at 3?0?? ?N]?ZJ??????&?q?TxwI?e=????I???f]???:?????xY)uS ?7| ? ??C?|?__ w?????+?Kod?|??v?? :??R?;??OI??.?A??Ee ??T??R?op2Za?TE?2?zlsj?0W?K ??3? q?????w?9^6?:?d???t???????)\r???i?B?;? w?d????????KO??S???4??z?ML?j???/5?6 i%???Xu?l*?\.T?'`??I?pF?g?UEsT?????5_???|?? ?U?"_?????S???????h at 4?h???b?&?Q??p)?+?g?]?k?-?k[U?-/?b? .?????%z?t}2fOy?L?N????&??UA?r? Q???w/????)?kbJ ?????R?j?0?mMW??????X?? p??HI?? ??E10?W???q?W???T?f(i???I??7$????[????xk?+????5?????????WKZ????)?d ea7? h#6n.? ????????U?]???????g?w??fk?C? @)d?nxM+?M?`oR???b??? ?0{????`???UX?a?????L?2?_{???8??????u??F??????=G??m?m7@?????x??u?j?Z=?Cc+??85;?^z?C??{????????f??R?&?|???????7?OOU?Bpj??swa{?k?H]?????G?$?>QY?????G?ey??)3K?1???????P?My?7#M?`?"??8x??[?4*?Vd0???S????=?Ip? ??N? 2????S?t??.?!?????u??k??}?????<)?r!??|?zY?~?? ??FP?:B?1??? ???nN??\N??SN?}Z#???y?(?'????@?-H???{\s'$\?5=?K??.????MYL?????BX>?*?<d6?)*l?0?6??.? ?!3=^???$V? ????0UDAf???!=?5??>jo?}04??G?? ;??B?2??? )???{"???????-s????[?b?_??\? ??C2f?_??]$t????IF???M?^;>?????J?{S?????@???B?????o????l?~?F_G??a??????~= ,??ZkTH?a??H??x???Hthff????j/h??????Y???????+>m24??k?Mv?E?????????r??S??i???2?F?C1cQ4(>?_??E????>ab??q??5??????Dw?g?S????[c?#?x?`?!Y3!V ?n??w?"t??p????E?G???O???oK2\L???{*=`??x?????zpi?7???zV$?`??????/?G?????v/|-?????5???1?b U?G.??{?cnT?)?fg?????k?iu??+RR?_?7?dLob=y?? ??`?}s?:??ul1??mKK?"?[mE?4=Cu ?tO?(???;??>?????.2T=]?6?-t=5H|?]j??SfUQ??? ?????U????8??d?I?`??~?=??.;>+?????`?????eB?????z???r??n+????Jb@8??x)|P:??6?q??F?!???3??a??A??????{]?P(?U?~?H??? ?'v?|V????~ G?????????e??O??X??U???Sf?x? >?\i??{??Io??XY?t?/?d???|? ????*?G?>rE"?V5)??? C\?}%?u??5~???8???(+q???????^???>)?V9?? ??yYS????WhdYy??W??pf?~?jwI?[??E%%H???/\?_hNe,?B??O*???Hda1?{-2?+k1f Z?????2rl????????q?Bt!??L^?J??????,w@??iX?x????}X??'n??f?48?nfO?M* ??%[D?A&6?6?Is?Q? c(Z}?Z???O???f?q???J??f??m??]? ?%??S?????O}??|?h_t?????OO6_??k??t??J?????PK +?????m ??H]p?` ???1 ??5???C{???>ec?? g?g?{??6?????? t????ke /???[?????2[??1?:??>?z??????e? :????6%??????%??F?C0 CW???M?Jc?6???????????t:?????,?gS???l?r??y????y?sE??  IHDR MiCCPPhotoshop ICC profile V?HU??? H????(?gA??Z?U\8????}z????????????y??&???j ?z??y8?@??P?< ?%b??0??>?3?o??~??@??z? ??AT?:????????18 ??\??p`???? A?a!:?b??"???"aH4??? ??Q"??r??Bj?]H#?-r9?\@???? 2????G1???Q?u@?????s?t4]???k??=?????K?ut !%?2I IkH?H-?S?>?i?L&??m?????? ?????O??????:???L ?$R??J5e????2B???Q??????:?ZIm?vP/S??4u?%??C??-????igi?h/?t? ??E????k??????w ? ??Hb(k{??/?L?????T0?2?g??oUX*?*|???:?V?~???TUsU??y? T?U?^V}?FU?P?? ????U??6??RwR?P?Q_??_???c ???F??H?Tc???!?2e?XB?rV?,k?Mb[???Lv?v/{LSCs?f?f?f??q?????9??J?!? ?{--?-??j?f?~?7?z???b?r?????up?@?,??:m:?u ?6?Q????u??>?c?y? ??????G?m????????7046?l18c???c?k?i???????h???h??I?'?&??g?5x>f?ob?4?e?kVyV?V??I?\?,?m?WlPW? ?:????????v?m???)?)?Sn?1??? ????9?a?%?m????;t;|rtu?vlp????4??????Wgg?s??5?K???v?Sm???n?z????????????????m???=?}??M.??]?=?A???X?q??????????/^v^Y^??O??&??0m???[???{`:>=e???>?>?z?????"?=?#~?~?~???;???????y??N`??????k??5??/ >B Yr?o???c3?g,????Z?0?&L?????~o??L?????Gl??i??})*2?.?Q?Stqt?,???Y?g???????;?j?rvg?jlRlc????????x??E??t$ ??????=??s?l?3???T?tc??????????w?|??/????%??3 ?PP1F zP??? Z?z???????:3??s??g??????W?G???a???Z???c??h??????b^??m????????^ o.?I??}?i?G ikk??}???? C?????/??F6a%xU???p????S???Bk]m??#?Y??,Z????:?.??f????/?[?@?????~s?????|N'??k^???,?? ??v?|?I??????PW???~?????}????-Z??M??79?e ??Q???5?.ovj ?????????F5?st?F??U!?M??K?,?tE?????????g?????D?? ?!???iX??{??"3,?H???th?}?l??????ch5 ???@??????????s???'?Sg??f??8?b?X?)????%?5?k??4??qw??Q??????MA1???(???????A"5R;&C???X^J??sY? ?wa0??TC???+`2?h??"?"lB$??? C?@H&????"7@??Gg*??u?4?#??"??"d??Q ?(?V?Ba???c%0??[????_?c???q?????\l??K????xr6???? 5?K?[p?S??n&??>?2b??K&?yl?Dk?X? j???U?6??????x{ @????? ?t? ?eR????R?KA?> ???? ??*e?z?u??4_??:????`)?L??Yx?????xxy7??lT9w?lCn ? zl?/?2?U????YzvN{o?e?????Vkz3K.??.?E?q9Q@???:?_????????&YV??e?????X?d3????]X??UQ? ?????t>}???*?F?%;?+?????b?o????1]t??o????We??????????If?9mm??tt?4?\???^???^?t????V??????G6????6m?C[?Y>(??h????1}p"??K? ?%?mF???????iu???8??i?|g z????x)??}[X???E??KRz??^dJ$?O????N?i?p??t??7?????t^&???8Y???%?????EmI???Y!?Y?{?`Q?n}]???c?.?n0W%=|?J?re??T?=(??????????N????X?I?0??U$iGdPbG??s????U???????6]ai????E?????p?+???^?dJf??#?Lx???~?^?3??m??I?,??*?Hns?&??_??????[?????+?=KgV???-*1?{?????????"/?3??????g??.gS?Md%?????R)a?%P????????L?gI??/\Y%t`zbK_??4K?T?V????9?E??M?LWP_f?-}?~O6???'?.????&?????????J???3???B?OM~?%U?#?Hi?????r?? 3????X??????? ???Z?^???4???J4t?5?=? ?@?>?W????? ?? ?cZBzO??z#?Vn???.8XI??r????? ?????D??m?S?#?_f????????q?K??????1???d?8Y?c?I?V??Ua,t Qx?????p??Bh??????|# q?yA???B;??O? 6$??? ?0?)?a?|??????m?=}????z k??"#b??r??@? I?'Y???#!?#(?o8????^D ]?N,@?9??!?h-???=??+?0?.??:??x??=??jM??B7?E???(???58n?u?8Kz????H??????S ? @? H?8??? ???3?????3 `?9FDg $?-??O?V??M??=?w? ??????K?KBl3??Q 9#????P(_??NI???,?B[?,???p)??!Z]?????)?T%??\???X?:???)|?????O(6?+&B?E??? ![?S????=P4v>'????a9?(??@??Xg/F???????,.^a?`4??, ? ?Y?| ????=?????|????????+??U(@m?b??F??R2?;,???x?p?C???:-?#+?-??0M ??H???sLu?-[???????}B)??N?0?????`???????:?t$??i5.?? [????#???a?poC,~ENV?b?????P??bv{??"[C>[?????G???F???????dq??f????x?LR??)f???_????,Y#$??VpB??)????,L)??(??? D[?6c?,?4Bp"*?*?KR.)???%??(-????????k?U?/?O????Z ?T_???D?IrW??A ???? ?@ ? ?[???F?,s?J?/s??e?z?X"??9HOm>XmTS??P?= X?????MR???u(?C?c???^?O?4????g_?,???gy??kqr??KJn??Y?#v???qP9Z[R??????H?]!A@?se????X_{?????>???/???I???dp??r??? ??+???Q???T3 HB?^O???Q?x?dDK.?LQ??u?:??Rb OIY?A?#T??~C_ ???x?? >M?CVN|)??c??EI2??Yst??}ms|`b?p?3_??K??????y??A5?????A??????~?:???????i?k?xxY?bK?6?|'=2?Vt??^??\??'K?R?A?q?h???hI?#???+:??7????M?O(n?7{L??pt??/}??T??)>????w?? H?r????L?)?724"F??$F??@Y7?? ?mw?/?)?=??n??K?VufO4kK??l?k?oU?zM?Xs??o????*?(???/ ????yc>?^B??};ZI\?j ?h?@ ???_???+y?Q??T????(? ?T??{?r?=???&??Cm]????_?L?????????s????*~ H([???"?iL???T ??-?l?'?6?e? ?>?oO?+?: ????~?`?c??????:#3u?*????????7q?&?s$K.?G?i??"?wP??? ?%???5?h??DY$? :??=?:? e ?{??$`g?C?q?????^"h5? ?w??|?Q???? ??I?nJx(jJ? ??,e.*d?m??u*n??dv??F??5>?Ob?? ?o?*P?'U?i???uafOKuR7H???? ????????D?.?0??t??~)u?0???? ??5?U?B??I$?oe8#h?? ?`???Y?????????2k?:?M?????_r?~$?? ???KSLT^?R???8y?e?l ?%~?Rk???i??'?G??v?l??????~h?_???????3??n86X??????xa4?_'??h???h?d??nf??o?????v???`2 ????2???l0%????????i??? ??????M?G??????pJ?7???3Q???3??????D?`?l?????5?`&???????????G? }O?G?????? R?t; q?h?Cl?6:B{???y????A/??P6?d6?L1?y5????????4??~??i? ?A?L???Fc??y??G??`O?g{;??Mt?v~ bI??F A??=?;?????Tz?c????Dq5??7_F??_?A???MO9??%?P???D;S-?jF~??? ??)?OV8(n????y ?[Q?F[1h 6?K???L?xu;mm??????d???R??_s??` `????3???????T?'vx??ZKs?/D ??????n?&J'? ????i???m?2?gjK"??X?\ 1????4M?2vE Z?e??6? ?N???c?09????????J???+???;Fux? ?]HA???f??? zzH?Gb??*?v? Q?~HS,6 ?A?E?v$??I?I\????%?*???jEQ?0!?s?;?lK?d??9M8??H?????b|D~??T????'I:%e????1??;???ul??d?r?OO??&?vV`>????X?S !?r.?? }W??"i\i???e??G?????E?T?? ?????? ?x???j??@???&???????VD?6?M?LO???Y?Y?i????`r??2???????z???=]? ??????7YJ?ice?W;??I?&;6=_2/?????yb?Y?!????yU&??;?j??0?b^r1???N`?t2l??Z ?)??????|??d?i???6Jb!-???]q?????-g?8?i?z?7?l$??w?T?c??h?*@?&?QZ??????T???#???????N?hks???E??C:-?rw?q???L2?^??@$?fwZ?a?;?-?`Q?g??"g?%?nL??h??G?Y???vH? 1qK!????????? ??.[? ?_$???W?????6???|?x? ? ???l?_/?+Q"O?k^l?9;] ?$g????Vf?$? ? ?W?Y y,075???q?>?p|?U_???de ? Z???69/?D?????d?GV???w6?18?\6?9[???@M@?????i???h6??.j????s?????'???M0FpL?O?????q??eI?&??>?_???l`? ?kcDId?Dq?g)?%M0Kj+D???4??9#??`i?0o?rL????M???->G(x4G??O?r?????@ ????,?????AfK???e ~?aw?@?BT?#?J)x}F?bkL?y?:?|????.'?b\I?v.??P?*?!?3n??h??F9??:?_?I??? ?"?zRRo2Ht?h?1?s??%?'??] '_?P(A?E?????????0E????/a?????90m???C`A??????`??5??V??=??6?o ? ??Q?e>~???d??o????D?? ???o3???g?V?????????xc?u??&???J??D?'??@??q???NK)??=b? B??n??????59M?????yp2?R`?>?4P[? /, ??????????????|$????r?JF? ??????A???uxoM2~CV??9????,?hu,?U7?,(??????;??4??u^P{Jg?u$t??z8?#?Ij[AE?v?1?tAKh???????jK@ ?M9D?< S?J?????t?x?Ys??r}???l?4???S0?????aZ?cz?? ?w??38L''F ?j????yo?q?4?X???;?Q+?I?????0? t?]?;??, ???????,r$???s??7???$%7j???;?]?r???B???HsC????p? ???k;?????(,?g ?o5????:~?????????8??)?Js?@u??Hb?^????Q?z?d?K.???????????9?(<%?m?_F@?????k????~@M??!-'??R???z???T?O???? [4NE*b? ??8?!r?!4?\?????q??l?`???p?Q???????`(?P?v??]???2?h???9]4??N??`M???\v????L????p;T?JIZ??V???????2%?j?3na??R????Y(???? ?8@ u@????qu2VtL?u^? d0:N\+??a#??j?[p?\3??#p?}n3eb?E?8??c???%??QQ/W?oO]?\??kL?EC%??rQ$ t ???3@??$????????N` %? ?5?mP????z??#??n& L??J1??2,N.zu?O??D?W??? f?")????F???3?,Y?P??p??rt>???M??????l???oN???q v?a? ????2r????z\?/???!??????L?4???A1d?pe??U????? ?%????\??8D at o??'l???'??az??vAJfDuY?(M???????#??W!?'???1?"4?\?eNaa? .???(?dTA??-??????|B?+/?) ? ??}?0??3DG?D? ? >?o?/.j????+?IK2?I?\??0????$`??:K?????^[?????I??p??&Q?%}????%?&W? s??I$?ods?W]?????????PK LIf??[????????J,U??!S???@G^P??$p????}?]b???'+.??????? ?zBm???y'?< ???5r?UOJ???t8@???ld??????????.)?2?? (?K??r?)d?PK From thm at fedoraproject.org Tue May 5 07:34:03 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Tue, 5 May 2009 07:34:03 +0000 (UTC) Subject: rpms/ikiwiki/devel .cvsignore, 1.21, 1.22 ikiwiki.spec, 1.23, 1.24 import.log, 1.21, 1.22 sources, 1.21, 1.22 Message-ID: <20090505073403.4DA9170108@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30466/devel Modified Files: .cvsignore ikiwiki.spec import.log sources Log Message: Update to 3.11. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 25 Apr 2009 16:24:45 -0000 1.21 +++ .cvsignore 5 May 2009 07:33:32 -0000 1.22 @@ -1 +1 @@ -ikiwiki_3.10.tar.gz +ikiwiki_3.11.tar.gz Index: ikiwiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- ikiwiki.spec 25 Apr 2009 16:24:45 -0000 1.23 +++ ikiwiki.spec 5 May 2009 07:33:32 -0000 1.24 @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.10 +Version: 3.11 Release: 1%{?dist} Summary: A wiki compiler @@ -143,6 +143,9 @@ meta-wrapper in this package. %changelog +* Tue May 5 2009 Thomas Moschny - 3.11-1 +- Update to 3.11. + * Sat Apr 25 2009 Thomas Moschny - 3.10-1 - Update to 3.10. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- import.log 25 Apr 2009 16:24:45 -0000 1.21 +++ import.log 5 May 2009 07:33:32 -0000 1.22 @@ -19,3 +19,4 @@ ikiwiki-3_07-1_fc10:HEAD:ikiwiki-3.07-1. ikiwiki-3_08-1_fc10:HEAD:ikiwiki-3.08-1.fc10.src.rpm:1238186789 ikiwiki-3_09-1_fc10:HEAD:ikiwiki-3.09-1.fc10.src.rpm:1239133519 ikiwiki-3_10-1_fc10:HEAD:ikiwiki-3.10-1.fc10.src.rpm:1240676654 +ikiwiki-3_11-1_fc11:HEAD:ikiwiki-3.11-1.fc11.src.rpm:1241508769 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 25 Apr 2009 16:24:45 -0000 1.21 +++ sources 5 May 2009 07:33:32 -0000 1.22 @@ -1 +1 @@ -cb4659afe5076518498d8ed2e0304993 ikiwiki_3.10.tar.gz +5cbb3417fb341069070b4b1a61f3200c ikiwiki_3.11.tar.gz From thm at fedoraproject.org Tue May 5 07:38:15 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Tue, 5 May 2009 07:38:15 +0000 (UTC) Subject: rpms/ikiwiki/F-11 .cvsignore, 1.21, 1.22 ikiwiki.spec, 1.23, 1.24 import.log, 1.21, 1.22 sources, 1.21, 1.22 Message-ID: <20090505073815.6FA4F70108@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31089/F-11 Modified Files: .cvsignore ikiwiki.spec import.log sources Log Message: Update to 3.11. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 25 Apr 2009 16:31:14 -0000 1.21 +++ .cvsignore 5 May 2009 07:37:44 -0000 1.22 @@ -1 +1 @@ -ikiwiki_3.10.tar.gz +ikiwiki_3.11.tar.gz Index: ikiwiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/ikiwiki.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- ikiwiki.spec 25 Apr 2009 16:31:14 -0000 1.23 +++ ikiwiki.spec 5 May 2009 07:37:44 -0000 1.24 @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.10 +Version: 3.11 Release: 1%{?dist} Summary: A wiki compiler @@ -143,6 +143,9 @@ meta-wrapper in this package. %changelog +* Tue May 5 2009 Thomas Moschny - 3.11-1 +- Update to 3.11. + * Sat Apr 25 2009 Thomas Moschny - 3.10-1 - Update to 3.10. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/import.log,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- import.log 25 Apr 2009 16:31:14 -0000 1.21 +++ import.log 5 May 2009 07:37:45 -0000 1.22 @@ -19,3 +19,4 @@ ikiwiki-3_07-1_fc10:HEAD:ikiwiki-3.07-1. ikiwiki-3_08-1_fc10:HEAD:ikiwiki-3.08-1.fc10.src.rpm:1238186789 ikiwiki-3_09-1_fc10:HEAD:ikiwiki-3.09-1.fc10.src.rpm:1239133519 ikiwiki-3_10-1_fc10:F-11:ikiwiki-3.10-1.fc10.src.rpm:1240677044 +ikiwiki-3_11-1_fc11:F-11:ikiwiki-3.11-1.fc11.src.rpm:1241508996 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 25 Apr 2009 16:31:14 -0000 1.21 +++ sources 5 May 2009 07:37:45 -0000 1.22 @@ -1 +1 @@ -cb4659afe5076518498d8ed2e0304993 ikiwiki_3.10.tar.gz +5cbb3417fb341069070b4b1a61f3200c ikiwiki_3.11.tar.gz From alexlan at fedoraproject.org Tue May 5 07:45:58 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 07:45:58 +0000 (UTC) Subject: rpms/perl-Bio-Graphics/devel .cvsignore, 1.3, 1.4 perl-Bio-Graphics.spec, 1.4, 1.5 sources, 1.3, 1.4 perl-Bio-Graphics-tests.patch, 1.1, NONE Message-ID: <20090505074558.4283170108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-Bio-Graphics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32626 Modified Files: .cvsignore perl-Bio-Graphics.spec sources Removed Files: perl-Bio-Graphics-tests.patch Log Message: - Update to latest upstream (1.94) - Drop patch for disabling tests Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Bio-Graphics/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 28 Jan 2009 01:14:54 -0000 1.3 +++ .cvsignore 5 May 2009 07:45:27 -0000 1.4 @@ -1 +1 @@ -Bio-Graphics-1.84.tar.gz +Bio-Graphics-1.94.tar.gz Index: perl-Bio-Graphics.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Bio-Graphics/devel/perl-Bio-Graphics.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- perl-Bio-Graphics.spec 26 Feb 2009 11:23:43 -0000 1.4 +++ perl-Bio-Graphics.spec 5 May 2009 07:45:27 -0000 1.5 @@ -1,12 +1,11 @@ Name: perl-Bio-Graphics -Version: 1.84 -Release: 2%{?dist} +Version: 1.94 +Release: 1%{?dist} Summary: Generate GD images of Bio::Seq objects License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Bio-Graphics/ Source0: http://www.cpan.org/authors/id/L/LD/LDS/Bio-Graphics-%{version}.tar.gz -Patch0: perl-Bio-Graphics-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Bio::Root::Version) >= 1.005009 @@ -28,7 +27,6 @@ laid out on the number line %prep %setup -q -n Bio-Graphics-%{version} -%patch0 -p0 -b .tests # temporarily remove modules Bio/Graphics/Glyph/trace.pm until the dependency: # Bio::SCF is packaged @@ -62,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue May 5 2009 Alex Lancaster - 1.94-1 +- Update to latest upstream (1.94) +- Drop patch for disabling tests + * Thu Feb 26 2009 Fedora Release Engineering - 1.84-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Bio-Graphics/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 28 Jan 2009 01:14:54 -0000 1.3 +++ sources 5 May 2009 07:45:27 -0000 1.4 @@ -1 +1 @@ -ff4e72484d345d5d711b80606426faff Bio-Graphics-1.84.tar.gz +363508cab96fc62d84f2d1f9e158edfd Bio-Graphics-1.94.tar.gz --- perl-Bio-Graphics-tests.patch DELETED --- From kwizart at fedoraproject.org Tue May 5 07:53:17 2009 From: kwizart at fedoraproject.org (Nicolas Chauvet) Date: Tue, 5 May 2009 07:53:17 +0000 (UTC) Subject: rpms/filezilla/F-10 filezilla.spec,1.26,1.27 sources,1.25,1.26 Message-ID: <20090505075317.2F13A70108@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv901 Modified Files: filezilla.spec sources Log Message: Update to 3.2.4.1 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-10/filezilla.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- filezilla.spec 18 Nov 2008 11:05:45 -0000 1.26 +++ filezilla.spec 5 May 2009 07:52:46 -0000 1.27 @@ -1,12 +1,14 @@ +#define fz_rc rc1 + Name: filezilla -Version: 3.1.5.1 -Release: 1%{?dist} +Version: 3.2.4.1 +Release: 1%{?fz_rc:_%{?fz_rc}}%{?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}%{?fz_rc:-%{?fz_rc}}_src.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Needed if autogen.sh is invoked @@ -16,6 +18,8 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildRequires: cppunit-devel >= 1.10.2 ## BuildRequires: desktop-file-utils + +BuildRequires: dbus-devel BuildRequires: gettext BuildRequires: gnutls-devel >= 2.0.4 BuildRequires: libidn-devel @@ -38,9 +42,7 @@ FileZilla is a FTP, FTPS and SFTP client %prep -%setup -q -n %{name}-%{version} - -#sed -i -e 's/2.0.4/1.6.3/' configure.in +%setup -q -n %{name}-%{version}%{?fz_rc:-%{?fz_rc}} # Run autotools if needed # sh autoconf @@ -117,6 +119,47 @@ fi || : %changelog +* Tue Apr 28 2009 kwizart < kwizart at gmail.com > - 3.2.4.1-1 +- Update to 3.2.4.1 + +* Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 3.2.4-1 +- Update to 3.2.4 + +* Thu Apr 2 2009 kwizart < kwizart at gmail.com > - 3.2.3.1-1 +- Update to 3.2.3.1 stable + +* Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 3.2.3-1 +- Update to 3.2.3 stable + +* Mon Mar 16 2009 kwizart < kwizart at gmail.com > - 3.2.3-0.1_rc1 +- Update to 3.2.3-rc1 + +* Tue Feb 24 2009 Fedora Release Engineering - 3.2.2.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 23 2009 kwizart < kwizart at gmail.com > - 3.2.2.1-1 +- Update to 3.2.2.1 stable + +* Fri Feb 20 2009 kwizart < kwizart at gmail.com > - 3.2.2-1 +- Update to 3.2.2 stable + +* Tue Feb 10 2009 kwizart < kwizart at gmail.com > - 3.2.1-1 +- Update to 3.2.1 stable + +* Tue Feb 3 2009 kwizart < kwizart at gmail.com > - 3.2.1-0.1_rc1 +- Update to 3.2.1-rc1 + +* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 3.2.0-1 +- Update to 3.2.0 stable + +* Tue Jan 6 2009 kwizart < kwizart at gmail.com > - 3.2.0-0.1_rc2 +- Update to 3.2.0-rc2 +- Add BR dbus-devel - Needs a fix for gnome-session + see http://bugzilla.gnome.org/show_bug.cgi?id=559469 + +* Thu Dec 4 2008 kwizart < kwizart at gmail.com > - 3.1.6-1 +- Update to 3.1.6 + * Tue Nov 18 2008 kwizart < kwizart at gmail.com > - 3.1.5.1-1 - Update to 3.1.5.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-10/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sources 18 Nov 2008 11:05:45 -0000 1.25 +++ sources 5 May 2009 07:52:46 -0000 1.26 @@ -1 +1 @@ -4d81583991259bb072afe2869f406083 FileZilla_3.1.5.1_src.tar.bz2 +ceeec2016b333597b51a7d7315678f9b FileZilla_3.2.4.1_src.tar.bz2 From alexlan at fedoraproject.org Tue May 5 08:13:41 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 08:13:41 +0000 (UTC) Subject: rpms/perl-Convert-Binary-C/devel .cvsignore, 1.5, 1.6 perl-Convert-Binary-C.spec, 1.12, 1.13 sources, 1.5, 1.6 perl-Convert-Binary-C-gcc44.patch, 1.1, NONE Message-ID: <20090505081341.90D8C70108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-Convert-Binary-C/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4229 Modified Files: .cvsignore perl-Convert-Binary-C.spec sources Removed Files: perl-Convert-Binary-C-gcc44.patch Log Message: - Update to latest upstream (0.74) - Drop GCC 4.4 patch (fixed upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 4 Jun 2008 07:49:03 -0000 1.5 +++ .cvsignore 5 May 2009 08:13:11 -0000 1.6 @@ -1 +1 @@ -Convert-Binary-C-0.71.tar.gz +Convert-Binary-C-0.74.tar.gz Index: perl-Convert-Binary-C.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/devel/perl-Convert-Binary-C.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- perl-Convert-Binary-C.spec 26 Feb 2009 13:36:47 -0000 1.12 +++ perl-Convert-Binary-C.spec 5 May 2009 08:13:11 -0000 1.13 @@ -1,12 +1,11 @@ Name: perl-Convert-Binary-C -Version: 0.71 -Release: 3%{?dist} +Version: 0.74 +Release: 1%{?dist} Summary: Binary data conversion using C types License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-Binary-C/ Source0: http://www.cpan.org/modules/by-module/Convert/Convert-Binary-C-%{version}.tar.gz -Patch0: %{name}-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Pod) @@ -23,7 +22,6 @@ from and to Perl's complex data structur %prep %setup -q -n Convert-Binary-C-%{version} -%patch0 -p0 -b .gcc44 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" @@ -56,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue May 5 2009 Alex Lancaster - 0.74-1 +- Update to latest upstream (0.74) +- Drop GCC 4.4 patch (fixed upstream) + * Thu Feb 26 2009 Fedora Release Engineering - 0.71-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 4 Jun 2008 07:49:03 -0000 1.5 +++ sources 5 May 2009 08:13:11 -0000 1.6 @@ -1 +1 @@ -b2c0958f1424c4b9e4a7cd4a4f8ef0bf Convert-Binary-C-0.71.tar.gz +164ce4e87a5d54945ef21c28fab6d10f Convert-Binary-C-0.74.tar.gz --- perl-Convert-Binary-C-gcc44.patch DELETED --- From kwizart at fedoraproject.org Tue May 5 08:16:21 2009 From: kwizart at fedoraproject.org (Nicolas Chauvet) Date: Tue, 5 May 2009 08:16:21 +0000 (UTC) Subject: rpms/filezilla/F-10 filezilla.spec,1.27,1.28 sources,1.26,1.27 Message-ID: <20090505081621.8F24970108@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4570 Modified Files: filezilla.spec sources Log Message: Backport for F-10 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-10/filezilla.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- filezilla.spec 5 May 2009 07:52:46 -0000 1.27 +++ filezilla.spec 5 May 2009 08:15:51 -0000 1.28 @@ -1,7 +1,7 @@ #define fz_rc rc1 Name: filezilla -Version: 3.2.4.1 +Version: 3.1.6 Release: 1%{?fz_rc:_%{?fz_rc}}%{?dist} Summary: FileZilla FTP, FTPS and SFTP client @@ -19,7 +19,6 @@ BuildRequires: cppunit-devel >= 1.10.2 ## BuildRequires: desktop-file-utils -BuildRequires: dbus-devel BuildRequires: gettext BuildRequires: gnutls-devel >= 2.0.4 BuildRequires: libidn-devel @@ -119,45 +118,8 @@ fi || : %changelog -* Tue Apr 28 2009 kwizart < kwizart at gmail.com > - 3.2.4.1-1 -- Update to 3.2.4.1 - -* Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 3.2.4-1 -- Update to 3.2.4 - -* Thu Apr 2 2009 kwizart < kwizart at gmail.com > - 3.2.3.1-1 -- Update to 3.2.3.1 stable - -* Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 3.2.3-1 -- Update to 3.2.3 stable - -* Mon Mar 16 2009 kwizart < kwizart at gmail.com > - 3.2.3-0.1_rc1 -- Update to 3.2.3-rc1 - -* Tue Feb 24 2009 Fedora Release Engineering - 3.2.2.1-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 23 2009 kwizart < kwizart at gmail.com > - 3.2.2.1-1 -- Update to 3.2.2.1 stable - -* Fri Feb 20 2009 kwizart < kwizart at gmail.com > - 3.2.2-1 -- Update to 3.2.2 stable - -* Tue Feb 10 2009 kwizart < kwizart at gmail.com > - 3.2.1-1 -- Update to 3.2.1 stable - -* Tue Feb 3 2009 kwizart < kwizart at gmail.com > - 3.2.1-0.1_rc1 -- Update to 3.2.1-rc1 - -* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 3.2.0-1 -- Update to 3.2.0 stable - -* Tue Jan 6 2009 kwizart < kwizart at gmail.com > - 3.2.0-0.1_rc2 -- Update to 3.2.0-rc2 -- Add BR dbus-devel - Needs a fix for gnome-session - see http://bugzilla.gnome.org/show_bug.cgi?id=559469 - -* Thu Dec 4 2008 kwizart < kwizart at gmail.com > - 3.1.6-1 +* Tue May 5 2009 kwizart < kwizart at gmail.com > - 3.1.6-1 +- Backport for F-10 - Update to 3.1.6 * Tue Nov 18 2008 kwizart < kwizart at gmail.com > - 3.1.5.1-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-10/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- sources 5 May 2009 07:52:46 -0000 1.26 +++ sources 5 May 2009 08:15:51 -0000 1.27 @@ -1 +1 @@ -ceeec2016b333597b51a7d7315678f9b FileZilla_3.2.4.1_src.tar.bz2 +c72dffb9a56086f7d94cba045035d77e FileZilla_3.1.6_src.tar.bz2 From kwizart at fedoraproject.org Tue May 5 08:18:06 2009 From: kwizart at fedoraproject.org (Nicolas Chauvet) Date: Tue, 5 May 2009 08:18:06 +0000 (UTC) Subject: rpms/filezilla/F-10 .cvsignore,1.20,1.21 Message-ID: <20090505081806.AB49870108@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4821 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-10/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- .cvsignore 24 Oct 2008 00:23:57 -0000 1.20 +++ .cvsignore 5 May 2009 08:17:36 -0000 1.21 @@ -1 +1 @@ -FileZilla_3.1.5_src.tar.bz2 +FileZilla_3.1.6_src.tar.bz2 From alexlan at fedoraproject.org Tue May 5 08:30:42 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 08:30:42 +0000 (UTC) Subject: rpms/perl-Convert-Binary-C/F-11 .cvsignore, 1.5, 1.6 perl-Convert-Binary-C.spec, 1.12, 1.13 sources, 1.5, 1.6 perl-Convert-Binary-C-gcc44.patch, 1.1, NONE Message-ID: <20090505083042.B6F1270108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-Convert-Binary-C/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5991 Modified Files: .cvsignore perl-Convert-Binary-C.spec sources Removed Files: perl-Convert-Binary-C-gcc44.patch Log Message: - Update to latest upstream (0.74) - Drop GCC 4.4 patch (fixed upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 4 Jun 2008 07:49:03 -0000 1.5 +++ .cvsignore 5 May 2009 08:30:12 -0000 1.6 @@ -1 +1 @@ -Convert-Binary-C-0.71.tar.gz +Convert-Binary-C-0.74.tar.gz Index: perl-Convert-Binary-C.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-11/perl-Convert-Binary-C.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- perl-Convert-Binary-C.spec 26 Feb 2009 13:36:47 -0000 1.12 +++ perl-Convert-Binary-C.spec 5 May 2009 08:30:12 -0000 1.13 @@ -1,12 +1,11 @@ Name: perl-Convert-Binary-C -Version: 0.71 -Release: 3%{?dist} +Version: 0.74 +Release: 1%{?dist} Summary: Binary data conversion using C types License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-Binary-C/ Source0: http://www.cpan.org/modules/by-module/Convert/Convert-Binary-C-%{version}.tar.gz -Patch0: %{name}-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Pod) @@ -23,7 +22,6 @@ from and to Perl's complex data structur %prep %setup -q -n Convert-Binary-C-%{version} -%patch0 -p0 -b .gcc44 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" @@ -56,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue May 5 2009 Alex Lancaster - 0.74-1 +- Update to latest upstream (0.74) +- Drop GCC 4.4 patch (fixed upstream) + * Thu Feb 26 2009 Fedora Release Engineering - 0.71-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 4 Jun 2008 07:49:03 -0000 1.5 +++ sources 5 May 2009 08:30:12 -0000 1.6 @@ -1 +1 @@ -b2c0958f1424c4b9e4a7cd4a4f8ef0bf Convert-Binary-C-0.71.tar.gz +164ce4e87a5d54945ef21c28fab6d10f Convert-Binary-C-0.74.tar.gz --- perl-Convert-Binary-C-gcc44.patch DELETED --- From kwizart at fedoraproject.org Tue May 5 08:32:39 2009 From: kwizart at fedoraproject.org (Nicolas Chauvet) Date: Tue, 5 May 2009 08:32:39 +0000 (UTC) Subject: rpms/filezilla/F-10 filezilla.spec,1.28,1.29 Message-ID: <20090505083239.DAB2C70108@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6210 Modified Files: filezilla.spec Log Message: Fix tag Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-10/filezilla.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- filezilla.spec 5 May 2009 08:15:51 -0000 1.28 +++ filezilla.spec 5 May 2009 08:32:09 -0000 1.29 @@ -2,7 +2,7 @@ Name: filezilla Version: 3.1.6 -Release: 1%{?fz_rc:_%{?fz_rc}}%{?dist} +Release: 1%{?fz_rc:_%{?fz_rc}}%{?dist}.1 Summary: FileZilla FTP, FTPS and SFTP client Group: Applications/Internet From alexlan at fedoraproject.org Tue May 5 08:01:52 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 08:01:52 +0000 (UTC) Subject: rpms/perl-Bio-Graphics/F-11 .cvsignore, 1.3, 1.4 perl-Bio-Graphics.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090505080152.CE46870108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-Bio-Graphics/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1805 Modified Files: .cvsignore perl-Bio-Graphics.spec sources Log Message: - Update to latest upstream (1.94) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 28 Jan 2009 01:14:54 -0000 1.3 +++ .cvsignore 5 May 2009 08:01:22 -0000 1.4 @@ -1 +1 @@ -Bio-Graphics-1.84.tar.gz +Bio-Graphics-1.94.tar.gz Index: perl-Bio-Graphics.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-11/perl-Bio-Graphics.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- perl-Bio-Graphics.spec 26 Feb 2009 11:23:43 -0000 1.4 +++ perl-Bio-Graphics.spec 5 May 2009 08:01:22 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Bio-Graphics -Version: 1.84 -Release: 2%{?dist} +Version: 1.94 +Release: 1%{?dist} Summary: Generate GD images of Bio::Seq objects License: GPL+ or Artistic Group: Development/Libraries @@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue May 5 2009 Alex Lancaster - 1.94-1 +- Update to latest upstream (1.94) + * Thu Feb 26 2009 Fedora Release Engineering - 1.84-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 28 Jan 2009 01:14:54 -0000 1.3 +++ sources 5 May 2009 08:01:22 -0000 1.4 @@ -1 +1 @@ -ff4e72484d345d5d711b80606426faff Bio-Graphics-1.84.tar.gz +363508cab96fc62d84f2d1f9e158edfd Bio-Graphics-1.94.tar.gz From than at fedoraproject.org Tue May 5 08:41:57 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 5 May 2009 08:41:57 +0000 (UTC) Subject: rpms/kdenetwork/F-11 kdenetwork-4.2.3-filesharing-crash.patch, NONE, 1.1 kdenetwork.spec, 1.183, 1.184 Message-ID: <20090505084157.D7FFC70131@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdenetwork/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7016 Modified Files: kdenetwork.spec Added Files: kdenetwork-4.2.3-filesharing-crash.patch Log Message: apply upstream patch to fix crash in filesharing kdenetwork-4.2.3-filesharing-crash.patch: --- NEW FILE kdenetwork-4.2.3-filesharing-crash.patch --- --- kdenetwork/filesharing/advanced/nfs/nfsfile.cpp 2009/01/06 17:13:38 906699 +++ kdenetwork/filesharing/advanced/nfs/nfsfile.cpp 2009/05/05 00:50:30 963627 @@ -71,7 +71,7 @@ return 0L; QString testPath = path.trimmed(); - if ( testPath[testPath.length()-1] != '/' ) + if ( !testPath.endsWith('/') ) testPath += '/'; for (NFSEntry* entry = _entries.first(); entry; entry = _entries.next()) @@ -129,7 +129,7 @@ completeLine = currentLine; // is the line continued in the next line ? - if ( completeLine[completeLine.length()-1] == '\\' ) + if ( completeLine.endsWith('\\') ) { continuedLine = true; // remove the ending backslash @@ -144,7 +144,7 @@ } // comments - if ('#' == completeLine[0]) { + if (completeLine.startsWith('#') ) { _lines.append(new NFSComment(completeLine)); continue; } @@ -153,7 +153,7 @@ QString hosts; // Handle quotation marks - if ( completeLine[0] == '"' ) { + if ( completeLine.startsWith('"') ) { int i = completeLine.indexOf('"',1); if (i == -1) { kError() << "NFSFile: Parse error: Missing quotation mark: " @@ -177,7 +177,7 @@ } // normalize path - if ( path[path.length()-1] != '/' ) + if ( !path.endsWith('/') ) path += '/'; kDebug(5009) << "KNFSShare: Found path: '" << path << "'"; Index: kdenetwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -p -r1.183 -r1.184 --- kdenetwork.spec 3 May 2009 22:02:45 -0000 1.183 +++ kdenetwork.spec 5 May 2009 08:41:27 -0000 1.184 @@ -10,11 +10,15 @@ URL: http://www.kde.org Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kdenetwork-4.2.0-handle-enc-message.patch Patch1: kdenetwork-4.2.0-libv4l.patch + +# 4.2 upstream patches +Patch100: kdenetwork-4.2.3-filesharing-crash.patch + # build Kopete against the system libgadu (backported from 4.3) # http://websvn.kde.org/?view=rev&revision=909144 # http://websvn.kde.org/?view=rev&revision=909145 -Patch100: kdenetwork-4.1.96-system-libgadu.patch -Patch104: kdenetwork-4.2.0-kopete-view-history.patch +Patch200: kdenetwork-4.1.96-system-libgadu.patch +Patch201: kdenetwork-4.2.0-kopete-view-history.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,9 +95,12 @@ Requires: kdelibs4-devel %setup -q %patch0 -p1 -b .handle-enc-message %patch1 -p1 -b .libv4l -%patch100 -p0 -b .system-libgadu +# 4.2 upstream patches +%patch100 -p1 -b .filesharing-crash +# 4.3 upstream patches +%patch200 -p0 -b .system-libgadu rm -rf kopete/protocols/gadu/libgadu/ -%patch104 -p1 -b .kopete-view-history +%patch201 -p1 -b .kopete-view-history %build From alexlan at fedoraproject.org Tue May 5 08:43:55 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 08:43:55 +0000 (UTC) Subject: rpms/perl-Convert-Binary-C/F-10 .cvsignore, 1.5, 1.6 perl-Convert-Binary-C.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <20090505084355.3B7FF70108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-Convert-Binary-C/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7985/F-10 Modified Files: .cvsignore perl-Convert-Binary-C.spec sources Log Message: - Update to latest upstream (0.74) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 4 Jun 2008 07:49:03 -0000 1.5 +++ .cvsignore 5 May 2009 08:43:24 -0000 1.6 @@ -1 +1 @@ -Convert-Binary-C-0.71.tar.gz +Convert-Binary-C-0.74.tar.gz Index: perl-Convert-Binary-C.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-10/perl-Convert-Binary-C.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- perl-Convert-Binary-C.spec 4 Jun 2008 07:49:03 -0000 1.10 +++ perl-Convert-Binary-C.spec 5 May 2009 08:43:24 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-Convert-Binary-C -Version: 0.71 +Version: 0.74 Release: 1%{?dist} Summary: Binary data conversion using C types License: GPL+ or Artistic @@ -54,6 +54,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue May 5 2009 Alex Lancaster - 0.74-1 +- Update to latest upstream (0.74) +- Drop GCC 4.4 patch (fixed upstream) + +* Thu Feb 26 2009 Fedora Release Engineering - 0.71-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Feb 8 2009 Alex Lancaster - 0.71-2 +- Add patch to fix #elif directives for new GCC 4.4 + * Wed Jun 4 2008 Alex Lancaster - 0.71-1 - Update to latest upstream (0.71) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 4 Jun 2008 07:49:03 -0000 1.5 +++ sources 5 May 2009 08:43:24 -0000 1.6 @@ -1 +1 @@ -b2c0958f1424c4b9e4a7cd4a4f8ef0bf Convert-Binary-C-0.71.tar.gz +164ce4e87a5d54945ef21c28fab6d10f Convert-Binary-C-0.74.tar.gz From alexlan at fedoraproject.org Tue May 5 08:43:55 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Tue, 5 May 2009 08:43:55 +0000 (UTC) Subject: rpms/perl-Convert-Binary-C/F-9 .cvsignore, 1.5, 1.6 perl-Convert-Binary-C.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <20090505084355.7840770108@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/perl-Convert-Binary-C/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7985/F-9 Modified Files: .cvsignore perl-Convert-Binary-C.spec sources Log Message: - Update to latest upstream (0.74) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 5 Jun 2008 00:39:10 -0000 1.5 +++ .cvsignore 5 May 2009 08:43:25 -0000 1.6 @@ -1 +1 @@ -Convert-Binary-C-0.71.tar.gz +Convert-Binary-C-0.74.tar.gz Index: perl-Convert-Binary-C.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-9/perl-Convert-Binary-C.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- perl-Convert-Binary-C.spec 5 Jun 2008 00:39:10 -0000 1.10 +++ perl-Convert-Binary-C.spec 5 May 2009 08:43:25 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-Convert-Binary-C -Version: 0.71 +Version: 0.74 Release: 1%{?dist} Summary: Binary data conversion using C types License: GPL+ or Artistic @@ -54,6 +54,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue May 5 2009 Alex Lancaster - 0.74-1 +- Update to latest upstream (0.74) +- Drop GCC 4.4 patch (fixed upstream) + +* Thu Feb 26 2009 Fedora Release Engineering - 0.71-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Feb 8 2009 Alex Lancaster - 0.71-2 +- Add patch to fix #elif directives for new GCC 4.4 + * Wed Jun 4 2008 Alex Lancaster - 0.71-1 - Update to latest upstream (0.71) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-Binary-C/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 5 Jun 2008 00:39:10 -0000 1.5 +++ sources 5 May 2009 08:43:25 -0000 1.6 @@ -1 +1 @@ -b2c0958f1424c4b9e4a7cd4a4f8ef0bf Convert-Binary-C-0.71.tar.gz +164ce4e87a5d54945ef21c28fab6d10f Convert-Binary-C-0.74.tar.gz From leigh123linux at fedoraproject.org Tue May 5 08:57:18 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Tue, 5 May 2009 08:57:18 +0000 (UTC) Subject: rpms/qbittorrent/F-11 qbittorrent.spec,1.11,1.12 Message-ID: <20090505085718.0E26570108@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9261 Modified Files: qbittorrent.spec Log Message: * Wed Apr 29 2009 Leigh Scott -1.3.3-4 - rebuild against the new rb_libtorrent version 0.14.3 Index: qbittorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/F-11/qbittorrent.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- qbittorrent.spec 29 Apr 2009 11:58:08 -0000 1.11 +++ qbittorrent.spec 5 May 2009 08:56:47 -0000 1.12 @@ -1,7 +1,7 @@ Name: qbittorrent Summary: A Bittorrent Client Version: 1.3.3 -Release: 3%{dist} +Release: 4%{dist} Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz Patch0: qbittorrent_flag.patch @@ -77,6 +77,9 @@ update-mime-database %{_datadir}/mime &> %changelog +* Wed Apr 29 2009 Leigh Scott -1.3.3-4 +- rebuild against the new rb_libtorrent version 0.14.3 + * Wed Apr 29 2009 Leigh Scott -1.3.3-3 - Rebuild against the new rb_libtorrent version 0.14.3 From than at fedoraproject.org Tue May 5 09:02:31 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 5 May 2009 09:02:31 +0000 (UTC) Subject: rpms/kdelibs/F-11 kdelibs-4.2.3-gcc44.patch, NONE, 1.1 kdelibs.spec, 1.476, 1.477 Message-ID: <20090505090231.EAA3270108@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9843 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.3-gcc44.patch Log Message: fix a gcc4.4 build error kdelibs-4.2.3-gcc44.patch: --- NEW FILE kdelibs-4.2.3-gcc44.patch --- diff -up kdelibs-4.2.3/khtml/misc/loader.cpp.orig kdelibs-4.2.3/khtml/misc/loader.cpp --- kdelibs-4.2.3/khtml/misc/loader.cpp.orig 2009-05-05 10:50:56.000000000 +0200 +++ kdelibs-4.2.3/khtml/misc/loader.cpp 2009-05-05 10:54:01.000000000 +0200 @@ -329,7 +329,7 @@ QString CachedCSSStyleSheet::checkCharse if (strncmp(d, "@charset \"",10) == 0) { // the string until "; is the charset name - char *p = strchr(d+10, '"'); + const char *p = strchr(d+10, '"'); if (p == 0) return m_charset; QString charset = QString::fromAscii(d+10, p-(d+10)); return charset; Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v retrieving revision 1.476 retrieving revision 1.477 diff -u -p -r1.476 -r1.477 --- kdelibs.spec 4 May 2009 21:37:23 -0000 1.476 +++ kdelibs.spec 5 May 2009 09:02:01 -0000 1.477 @@ -83,6 +83,7 @@ Patch22: kdelibs-4.1.96-cmake.patch # upstream # 4.2 branch Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch +Patch101: kdelibs-4.2.3-gcc44.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -220,6 +221,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi # upstream patches # 4.2 %patch100 -p1 -b .strcasestr-glibc2.9 +%patch101 -p1 -b .gcc44 # 4.3 %patch200 -p1 -b .AllowExternalPaths From than at fedoraproject.org Tue May 5 09:31:04 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 5 May 2009 09:31:04 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs-4.2.3-gcc44.patch, NONE, 1.1 kdelibs.spec, 1.425, 1.426 Message-ID: <20090505093104.4B91870108@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12487 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.3-gcc44.patch Log Message: fix gcc-4.4 builld issue kdelibs-4.2.3-gcc44.patch: --- NEW FILE kdelibs-4.2.3-gcc44.patch --- diff -up kdelibs-4.2.3/khtml/misc/loader.cpp.orig kdelibs-4.2.3/khtml/misc/loader.cpp --- kdelibs-4.2.3/khtml/misc/loader.cpp.orig 2009-05-05 10:50:56.000000000 +0200 +++ kdelibs-4.2.3/khtml/misc/loader.cpp 2009-05-05 10:54:01.000000000 +0200 @@ -329,7 +329,7 @@ QString CachedCSSStyleSheet::checkCharse if (strncmp(d, "@charset \"",10) == 0) { // the string until "; is the charset name - char *p = strchr(d+10, '"'); + const char *p = strchr(d+10, '"'); if (p == 0) return m_charset; QString charset = QString::fromAscii(d+10, p-(d+10)); return charset; Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.425 retrieving revision 1.426 diff -u -p -r1.425 -r1.426 --- kdelibs.spec 4 May 2009 21:40:39 -0000 1.425 +++ kdelibs.spec 5 May 2009 09:30:33 -0000 1.426 @@ -83,6 +83,7 @@ Patch22: kdelibs-4.1.96-cmake.patch # upstream # 4.2 branch Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch +Patch101: kdelibs-4.2.3-gcc44.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -220,6 +221,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi # upstream patches # 4.2 %patch100 -p1 -b .strcasestr-glibc2.9 +%patch101 -p1 -b .gcc44 # 4.3 %patch200 -p1 -b .AllowExternalPaths From transif at fedoraproject.org Tue May 5 09:32:23 2009 From: transif at fedoraproject.org (Transifex System User) Date: Tue, 5 May 2009 09:32:23 +0000 (UTC) Subject: comps/po sv.po,1.20,1.21 Message-ID: <20090505093223.35AEF70108@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12759/po Modified Files: sv.po Log Message: Sending translation for Swedish Index: sv.po =================================================================== RCS file: /cvs/pkgs/comps/po/sv.po,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sv.po 29 Apr 2009 20:00:23 -0000 1.20 +++ sv.po 5 May 2009 09:31:52 -0000 1.21 @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: comps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-04-09 21:50+0200\n" +"POT-Creation-Date: 2009-05-05 08:08+0000\n" +"PO-Revision-Date: 2009-05-05 11:30+0200\n" "Last-Translator: G??ran Uddeborg \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -1304,19 +1304,16 @@ msgid "Amazigh Support" msgstr "St??d f??r amazigh" #: ../comps-f11.xml.in.h:13 -#, fuzzy msgid "Azerbaijani Support" -msgstr "St??d f??r serbiska" +msgstr "St??d f??r azerbajdzjanska" #: ../comps-f11.xml.in.h:27 -#, fuzzy msgid "Chichewa Support" -msgstr "St??d f??r kinesiska" +msgstr "St??d f??r chichewa" #: ../comps-f11.xml.in.h:31 -#, fuzzy msgid "Coptic Support" -msgstr "St??d f??r kroatiska" +msgstr "St??d f??r koptiska" #: ../comps-f11.xml.in.h:37 msgid "Design and Simulation tools for hardware engineers" @@ -1327,9 +1324,8 @@ msgid "Electronic Lab" msgstr "Elektroniklabb" #: ../comps-f11.xml.in.h:58 -#, fuzzy msgid "Fijian Support" -msgstr "St??d f??r frisiska" +msgstr "St??d f??r fijianska" #: ../comps-f11.xml.in.h:61 msgid "Font design and packaging" @@ -1344,47 +1340,40 @@ msgid "Friulian Support" msgstr "St??d f??r friuliska" #: ../comps-f11.xml.in.h:83 -#, fuzzy msgid "Hiligaynon Support" -msgstr "St??d f??r filipinska" +msgstr "St??d f??r hiligaynon" #: ../comps-f11.xml.in.h:96 -#, fuzzy msgid "Interlingua Support" -msgstr "St??d f??r italienska" +msgstr "St??d f??r interlingua" #: ../comps-f11.xml.in.h:109 -#, fuzzy msgid "Kazakh Support" -msgstr "St??d f??r kannada" +msgstr "St??d f??r kazakiska" #: ../comps-f11.xml.in.h:111 msgid "Kinyarwanda Support" msgstr "St??d f??r kinyarwanda" #: ../comps-f11.xml.in.h:118 -#, fuzzy msgid "Latin Support" -msgstr "St??d f??r lettiska" +msgstr "St??d f??r latin" #: ../comps-f11.xml.in.h:126 -#, fuzzy msgid "Luxembourgish Support" -msgstr "St??d f??r turkiska" +msgstr "St??d f??r luxemburgska" #: ../comps-f11.xml.in.h:130 msgid "Malagasy Support" msgstr "St??d f??r malagassiska" #: ../comps-f11.xml.in.h:133 -#, fuzzy msgid "Maltese Support" -msgstr "St??d f??r malajiska" +msgstr "St??d f??r maltesiska" #: ../comps-f11.xml.in.h:134 -#, fuzzy msgid "Manx Support" -msgstr "St??d f??r malajiska" +msgstr "St??d f??r manx" #: ../comps-f11.xml.in.h:137 msgid "MinGW cross-compiler" @@ -1403,14 +1392,12 @@ msgid "Online Help and Documentation" msgstr "Direkthj??lp och -dokumentation" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "St??d f??r spanska" +msgstr "St??d f??r sanskrit" #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "St??d f??r ukrainska" +msgstr "St??d f??r sardiska" #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" @@ -1433,14 +1420,12 @@ msgstr "" "dess bibliotek." #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "St??d f??r siswati" +msgstr "St??d f??r swahili" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "St??d f??r telugu" +msgstr "St??d f??r tetum" #: ../comps-f11.xml.in.h:223 msgid "" From than at fedoraproject.org Tue May 5 09:35:11 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 5 May 2009 09:35:11 +0000 (UTC) Subject: rpms/kdelibs/F-9 kdelibs-4.2.3-gcc44.patch, NONE, 1.1 kdelibs.spec, 1.400, 1.401 Message-ID: <20090505093511.B1A6C70108@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13038 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.3-gcc44.patch Log Message: fxi gcc-4.4 build issue kdelibs-4.2.3-gcc44.patch: --- NEW FILE kdelibs-4.2.3-gcc44.patch --- diff -up kdelibs-4.2.3/khtml/misc/loader.cpp.orig kdelibs-4.2.3/khtml/misc/loader.cpp --- kdelibs-4.2.3/khtml/misc/loader.cpp.orig 2009-05-05 10:50:56.000000000 +0200 +++ kdelibs-4.2.3/khtml/misc/loader.cpp 2009-05-05 10:54:01.000000000 +0200 @@ -329,7 +329,7 @@ QString CachedCSSStyleSheet::checkCharse if (strncmp(d, "@charset \"",10) == 0) { // the string until "; is the charset name - char *p = strchr(d+10, '"'); + const char *p = strchr(d+10, '"'); if (p == 0) return m_charset; QString charset = QString::fromAscii(d+10, p-(d+10)); return charset; Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.400 retrieving revision 1.401 diff -u -p -r1.400 -r1.401 --- kdelibs.spec 4 May 2009 21:43:05 -0000 1.400 +++ kdelibs.spec 5 May 2009 09:34:41 -0000 1.401 @@ -83,6 +83,7 @@ Patch22: kdelibs-4.1.96-cmake.patch # upstream # 4.2 branch Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch +Patch101: kdelibs-4.2.3-gcc44.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -220,6 +221,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi # upstream patches # 4.2 %patch100 -p1 -b .strcasestr-glibc2.9 +%patch101 -p1 -b .gcc44 # 4.3 %patch200 -p1 -b .AllowExternalPaths From atkac at fedoraproject.org Tue May 5 09:39:17 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 5 May 2009 09:39:17 +0000 (UTC) Subject: rpms/tigervnc/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tigervnc.spec, 1.6, 1.7 Message-ID: <20090505093917.B053E70108@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/tigervnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13452 Modified Files: .cvsignore sources tigervnc.spec Log Message: - update to 0.0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 27 Apr 2009 13:33:58 -0000 1.4 +++ .cvsignore 5 May 2009 09:38:46 -0000 1.5 @@ -1 +1 @@ -tigervnc-0.0.90-20090427svn3789.tar.bz2 +tigervnc-0.0.90.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 27 Apr 2009 13:33:58 -0000 1.4 +++ sources 5 May 2009 09:38:46 -0000 1.5 @@ -1 +1 @@ -a34b291684a09148b8059450d2543d40 tigervnc-0.0.90-20090427svn3789.tar.bz2 +c80b043daae0c723134dbea9d1c06468 tigervnc-0.0.90.tar.gz Index: tigervnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- tigervnc.spec 30 Apr 2009 08:54:25 -0000 1.6 +++ tigervnc.spec 5 May 2009 09:38:46 -0000 1.7 @@ -1,25 +1,13 @@ -%define revision 3789 -%define date 20090427 -%define releasetag %{date}svn%{revision} - Name: tigervnc Version: 0.0.90 -Release: 0.7.%{releasetag}%{?dist} +Release: 0.8%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops License: GPLv2+ URL: http://www.tigervnc.com -# The source for this package was pulled from upstream's svn. Use the -# following commands to generate the tarball: -# -# $ svn export -r%{revison} \ -# https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk \ - #tigervnc-%{version}-%{releasetag} -# $ tar cjf tigervnc-%{version}-%{releasetag}{.tar.bz2,} - -Source0: %{name}-%{version}-%{releasetag}.tar.bz2 +Source0: %{name}-%{version}.tar.gz Source1: vncserver.init Source2: vncserver.sysconfig Source6: vncviewer.desktop @@ -95,7 +83,7 @@ This package contains libvnc.so module t to access the desktop on your machine. %prep -%setup -q -n %{name}-%{version}-%{releasetag} +%setup -q -n %{name}-%{version} cp -r %{_datadir}/xorg-x11-server-source/* unix/xserver pushd unix/xserver @@ -250,6 +238,9 @@ fi %{_libdir}/xorg/modules/extensions/libvnc.so %changelog +* Tue May 05 2009 Adam Tkac 0.0.90-0.8 +- update to 0.0.90 + * Thu Apr 30 2009 Adam Tkac 0.0.90-0.7.20090427svn3789 - server package now requires xorg-x11-fonts-misc (#498184) From atkac at fedoraproject.org Tue May 5 09:41:51 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 5 May 2009 09:41:51 +0000 (UTC) Subject: rpms/tigervnc/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tigervnc.spec, 1.6, 1.7 Message-ID: <20090505094151.6439370108@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/tigervnc/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13794 Modified Files: .cvsignore sources tigervnc.spec Log Message: - update to 0.0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tigervnc/F-11/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 27 Apr 2009 13:35:44 -0000 1.4 +++ .cvsignore 5 May 2009 09:41:20 -0000 1.5 @@ -1 +1 @@ -tigervnc-0.0.90-20090427svn3789.tar.bz2 +tigervnc-0.0.90.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tigervnc/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 27 Apr 2009 13:35:44 -0000 1.4 +++ sources 5 May 2009 09:41:20 -0000 1.5 @@ -1 +1 @@ -a34b291684a09148b8059450d2543d40 tigervnc-0.0.90-20090427svn3789.tar.bz2 +c80b043daae0c723134dbea9d1c06468 tigervnc-0.0.90.tar.gz Index: tigervnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- tigervnc.spec 30 Apr 2009 08:53:57 -0000 1.6 +++ tigervnc.spec 5 May 2009 09:41:20 -0000 1.7 @@ -1,25 +1,13 @@ -%define revision 3789 -%define date 20090427 -%define releasetag %{date}svn%{revision} - Name: tigervnc Version: 0.0.90 -Release: 0.7.%{releasetag}%{?dist} +Release: 0.8%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops License: GPLv2+ URL: http://www.tigervnc.com -# The source for this package was pulled from upstream's svn. Use the -# following commands to generate the tarball: -# -# $ svn export -r%{revison} \ -# https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk \ - #tigervnc-%{version}-%{releasetag} -# $ tar cjf tigervnc-%{version}-%{releasetag}{.tar.bz2,} - -Source0: %{name}-%{version}-%{releasetag}.tar.bz2 +Source0: %{name}-%{version}.tar.gz Source1: vncserver.init Source2: vncserver.sysconfig Source6: vncviewer.desktop @@ -95,7 +83,7 @@ This package contains libvnc.so module t to access the desktop on your machine. %prep -%setup -q -n %{name}-%{version}-%{releasetag} +%setup -q -n %{name}-%{version} cp -r %{_datadir}/xorg-x11-server-source/* unix/xserver pushd unix/xserver @@ -250,6 +238,9 @@ fi %{_libdir}/xorg/modules/extensions/libvnc.so %changelog +* Tue May 05 2009 Adam Tkac 0.0.90-0.8 +- update to 0.0.90 + * Thu Apr 30 2009 Adam Tkac 0.0.90-0.7.20090427svn3789 - server package now requires xorg-x11-fonts-misc (#498184) From dnovotny at fedoraproject.org Tue May 5 09:49:45 2009 From: dnovotny at fedoraproject.org (Daniel Novotny) Date: Tue, 5 May 2009 09:49:45 +0000 (UTC) Subject: rpms/file/devel .cvsignore, 1.24, 1.25 file.spec, 1.95, 1.96 sources, 1.24, 1.25 Message-ID: <20090505094945.DC05570108@cvs1.fedora.phx.redhat.com> Author: dnovotny Update of /cvs/extras/rpms/file/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15379 Modified Files: .cvsignore file.spec sources Log Message: new upstream version 5.02 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/file/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- .cvsignore 9 Feb 2009 14:03:14 -0000 1.24 +++ .cvsignore 5 May 2009 09:49:15 -0000 1.25 @@ -1 +1 @@ -file-5.00.tar.gz +file-5.02.tar.gz Index: file.spec =================================================================== RCS file: /cvs/extras/rpms/file/devel/file.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -p -r1.95 -r1.96 --- file.spec 29 Apr 2009 08:30:52 -0000 1.95 +++ file.spec 5 May 2009 09:49:15 -0000 1.96 @@ -4,20 +4,15 @@ Summary: A utility for determining file types Name: file -Version: 5.00 -Release: 8%{?dist} +Version: 5.02 +Release: 1%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ Patch0: file-4.21-pybuild.patch Patch1: file-5.00-devdrv.patch -Patch2: file-5.00-non-english-word.patch -Patch3: file-5.00-thumbs-db.patch -Patch4: file-5.00-fonts-ttc-pfa.patch -Patch5: file-5.00-fdleak.patch -Patch6: file-5.00-mdmp.patch -Patch7: file-5.00-erlang.patch +Patch2: file-5.00-mdmp.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,18 +61,8 @@ file(1) command. %patch0 -p1 #fixes #463809 %patch1 -p1 -#fixes #485141 -%patch2 -p1 -#fixes #486105 -%patch3 -p1 -#fixes #491594,#491595 -%patch4 -p1 -#fixes #491596 -%patch5 -p1 #fixes #485835 -%patch6 -p1 -#fixes #498036 -%patch7 -p1 +%patch2 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -100,6 +85,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/misc +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/file make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la @@ -151,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue May 05 2009 Daniel Novotny 5.02-1 +- new upstream version; drop upstreamed patches; this fixes #497913 + * Wed Apr 29 2009 Daniel Novotny 5.00-8 - fix #498036 - Elang JAM file definition breaks detection of postscript-files Index: sources =================================================================== RCS file: /cvs/extras/rpms/file/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- sources 9 Feb 2009 14:03:14 -0000 1.24 +++ sources 5 May 2009 09:49:15 -0000 1.25 @@ -1 +1 @@ -fd0b4ce55a756151629e06eaa3411e0c file-5.00.tar.gz +003c56bd1a130390522b45ebcd5ac179 file-5.02.tar.gz From hadess at fedoraproject.org Tue May 5 09:57:32 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 5 May 2009 09:57:32 +0000 (UTC) Subject: rpms/nautilus-sendto/F-11 .cvsignore, 1.21, 1.22 nautilus-sendto.spec, 1.70, 1.71 sources, 1.21, 1.22 Message-ID: <20090505095732.67DDD70108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16348 Modified Files: .cvsignore nautilus-sendto.spec sources Log Message: * Tue May 05 2009 Bastien Nocera 1.1.5-1 - Update to 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 20 Apr 2009 13:43:14 -0000 1.21 +++ .cvsignore 5 May 2009 09:57:01 -0000 1.22 @@ -1 +1 @@ -nautilus-sendto-1.1.4.1.tar.bz2 +nautilus-sendto-1.1.5.tar.bz2 Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/nautilus-sendto.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- nautilus-sendto.spec 28 Apr 2009 09:45:59 -0000 1.70 +++ nautilus-sendto.spec 5 May 2009 09:57:01 -0000 1.71 @@ -1,6 +1,6 @@ Name: nautilus-sendto -Version: 1.1.4.1 -Release: 2%{?dist} +Version: 1.1.5 +Release: 1%{?dist} Summary: Nautilus context menu for sending files Group: User Interface/Desktops @@ -95,6 +95,9 @@ fi %{_mandir}/man1/nautilus-sendto.1.gz %changelog +* Tue May 05 2009 Bastien Nocera 1.1.5-1 +- Update to 1.1.5 + * Tue Apr 28 2009 Bastien Nocera 1.1.4.1-2 - Build with gajim support (#497975) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 20 Apr 2009 13:43:15 -0000 1.21 +++ sources 5 May 2009 09:57:01 -0000 1.22 @@ -1 +1 @@ -c4b66eb6fd24eff0b2240b832085a20e nautilus-sendto-1.1.4.1.tar.bz2 +8a5b342850bb84b63c7df033ef478654 nautilus-sendto-1.1.5.tar.bz2 From mhlavink at fedoraproject.org Tue May 5 09:58:29 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 09:58:29 +0000 (UTC) Subject: rpms/ksh/devel ksh-20070328-builtins.patch, 1.1, 1.2 ksh.spec, 1.46, 1.47 Message-ID: <20090505095829.64B9770108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ksh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16577 Modified Files: ksh-20070328-builtins.patch ksh.spec Log Message: update to 2009-05-01 ksh-20070328-builtins.patch: Index: ksh-20070328-builtins.patch =================================================================== RCS file: /cvs/extras/rpms/ksh/devel/ksh-20070328-builtins.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ksh-20070328-builtins.patch 23 May 2007 06:52:45 -0000 1.1 +++ ksh-20070328-builtins.patch 5 May 2009 09:57:58 -0000 1.2 @@ -1,6 +1,7 @@ ---- ksh-20070328/src/cmd/ksh93/data/builtins.c.builtoff 2007-05-22 13:14:33.000000000 +0200 -+++ ksh-20070328/src/cmd/ksh93/data/builtins.c 2007-05-22 13:14:51.000000000 +0200 -@@ -128,6 +128,7 @@ +diff -up ksh-20090501/src/cmd/ksh93/data/builtins.c.builtins ksh-20090501/src/cmd/ksh93/data/builtins.c +--- ksh-20090501/src/cmd/ksh93/data/builtins.c.builtins 2009-04-12 09:38:03.000000000 +0200 ++++ ksh-20090501/src/cmd/ksh93/data/builtins.c 2009-05-05 11:20:30.601284246 +0200 +@@ -125,6 +125,7 @@ const struct shtable3 shtab_builtins[] = #ifdef SHOPT_CMDLIB_HDR #include SHOPT_CMDLIB_HDR #else @@ -8,11 +9,11 @@ CMDLIST(basename) CMDLIST(chmod) CMDLIST(dirname) -@@ -141,6 +142,7 @@ +@@ -139,6 +140,7 @@ const struct shtable3 shtab_builtins[] = CMDLIST(wc) CMDLIST(sync) #endif +#endif - "", 0, 0 - }; - + #if SHOPT_REGRESS + "__regress__", NV_BLTIN|BLT_ENV, bltin(__regress__), + #endif Index: ksh.spec =================================================================== RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -r1.46 -r1.47 --- ksh.spec 10 Mar 2009 10:28:17 -0000 1.46 +++ ksh.spec 5 May 2009 09:57:59 -0000 1.47 @@ -1,12 +1,12 @@ -%define releasedate 2008-11-04 +%define releasedate 2009-05-01 Name: ksh Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ Group: System Environment/Shells License: CPL -Version: 20081104 -Release: 3%{?dist} +Version: 20090501 +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 Source3: kshrc.rhs @@ -84,6 +84,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Michal Hlavinka - 20090501-1 +- updated to 2009-05-01 + * Tue Mar 10 2009 Michal Hlavinka - 20081104-3 - fix typos in spec file From hadess at fedoraproject.org Tue May 5 10:08:26 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 5 May 2009 10:08:26 +0000 (UTC) Subject: rpms/nautilus-sendto/devel .cvsignore, 1.21, 1.22 nautilus-sendto.spec, 1.71, 1.72 sources, 1.21, 1.22 Message-ID: <20090505100826.65A2970108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17844 Modified Files: .cvsignore nautilus-sendto.spec sources Log Message: * Tue May 05 2009 Bastien Nocera 1.1.5-1.1 - Update to 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 20 Apr 2009 13:57:04 -0000 1.21 +++ .cvsignore 5 May 2009 10:07:55 -0000 1.22 @@ -1 +1 @@ -nautilus-sendto-1.1.4.1.tar.bz2 +nautilus-sendto-1.1.5.tar.bz2 Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -p -r1.71 -r1.72 --- nautilus-sendto.spec 28 Apr 2009 09:16:14 -0000 1.71 +++ nautilus-sendto.spec 5 May 2009 10:07:55 -0000 1.72 @@ -1,6 +1,6 @@ Name: nautilus-sendto -Version: 1.1.4.1 -Release: 2%{?dist}.1 +Version: 1.1.5 +Release: 1%{?dist}.1 Summary: Nautilus context menu for sending files Group: User Interface/Desktops @@ -97,6 +97,9 @@ fi %{_mandir}/man1/nautilus-sendto.1.gz %changelog +* Tue May 05 2009 Bastien Nocera 1.1.5-1.1 +- Update to 1.1.5 + * Tue Apr 28 2009 - Bastien Nocera - 1.1.4.1-2 - Build with gajim support (#497975) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 20 Apr 2009 13:57:04 -0000 1.21 +++ sources 5 May 2009 10:07:55 -0000 1.22 @@ -1 +1 @@ -c4b66eb6fd24eff0b2240b832085a20e nautilus-sendto-1.1.4.1.tar.bz2 +8a5b342850bb84b63c7df033ef478654 nautilus-sendto-1.1.5.tar.bz2 From airlied at fedoraproject.org Tue May 5 10:28:14 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 5 May 2009 10:28:14 +0000 (UTC) Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.80, 1.81 drm-next.patch, 1.15, 1.16 drm-nouveau.patch, 1.46, 1.47 kernel.spec, 1.1589, 1.1590 drm-radeon-kms-fixes.patch, 1.3, NONE Message-ID: <20090505102814.DC84570108@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20413 Modified Files: drm-modesetting-radeon.patch drm-next.patch drm-nouveau.patch kernel.spec Removed Files: drm-radeon-kms-fixes.patch Log Message: * Tue May 05 2009 Dave Airlie 2.6.29.2-128 - radeon kms: backport some fixes - put back old internal interface drm-modesetting-radeon.patch: Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- drm-modesetting-radeon.patch 21 Apr 2009 05:20:50 -0000 1.80 +++ drm-modesetting-radeon.patch 5 May 2009 10:28:10 -0000 1.81 @@ -1,3 +1,78 @@ +commit cedd30c80687e2dee226ae3f38cb3411361e7572 +Merge: ef416ea 2b12cba +Author: Dave Airlie +Date: Tue May 5 19:10:23 2009 +1000 + + Merge remote branch 'origin/drm-rawhide' into drm-f11 + +commit 2b12cba747575005e75fe6154a552935484e9a4d +Author: Dave Airlie +Date: Tue May 5 18:17:44 2009 +1000 + + radeon: don't convert colors for 16-bit modes + +commit ed70a54c74f78f426497654676dda7ac53055d13 +Author: Dave Airlie +Date: Fri May 1 11:58:10 2009 +1000 + + radeon: init usec timeout earlier + + we can call idle function before we set this up + +commit b1d531a7b26449e17031c22a1b12d6c5994f1b9a +Author: Dave Airlie +Date: Fri Apr 24 15:18:09 2009 +1000 + + drm: revert change and remove unneeded setmode code + +commit 3d533587bcd2753b47887ed6a927b05f5821f1b7 +Author: Dave Airlie +Date: Fri Apr 24 14:32:36 2009 +1000 + + Revert "radeon: set i2c timeout to 2 jiffies" + + This reverts commit ab1e9cd474798a5c7d15d21c6422c3c9f90e90e0. + + fixed in i2c core + +commit 592b92d0a532c7367164546b513d345b1aae1d46 +Author: Dave Airlie +Date: Fri May 1 02:14:07 2009 +1000 + + r300: add other clip regs + +commit 37136c81b28e45f30c8d45d212315c0b4ce6c6b0 +Author: Dave Airlie +Date: Thu Apr 30 23:09:58 2009 +1000 + + drm: make ttm populate on cache changes + + this is backported from upstream + +commit e2b4a0ba030cf96be943a2d277accc43e0560672 +Author: Dave Airlie +Date: Thu Apr 30 23:09:39 2009 +1000 + + radeon: removed unused legacy cs codepath + +commit abe22355e73be13968fead1a42b9af43790f38e9 +Author: Dave Airlie +Date: Wed Apr 22 17:24:46 2009 +1000 + + radeon: duplicate desired modes so this stuff works properly + +commit ab1e9cd474798a5c7d15d21c6422c3c9f90e90e0 +Author: Dave Airlie +Date: Wed Apr 22 16:58:58 2009 +1000 + + radeon: set i2c timeout to 2 jiffies + +commit c4afb1b5b1cf342f9ab6bd561522c58dbe5733ad +Author: Dave Airlie +Date: Wed Apr 22 16:57:38 2009 +1000 + + radeon: hook up the sub pixel order + commit ef416eafca3c5ed83b089e90fb50c15062accecd Merge: fa4687f f891418 Author: Dave Airlie @@ -5607,37 +5682,50 @@ index 94a7688..c580c55 100644 out: diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c -index a04639d..2bedb7a 100644 +index a04639d..f6182a5 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c -@@ -552,7 +552,7 @@ drm_crtc_prepare_encoders(struct drm_device *dev) - bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, - struct drm_display_mode *mode, - int x, int y, -- struct drm_framebuffer *old_fb) -+ struct drm_framebuffer *old_fb, int conn_changed) - { - struct drm_device *dev = crtc->dev; - struct drm_display_mode *adjusted_mode, saved_mode; -@@ -590,7 +590,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, +@@ -561,7 +561,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, + int saved_x, saved_y; + struct drm_encoder *encoder; + bool ret = true; +- bool depth_changed, bpp_changed; + + adjusted_mode = drm_mode_duplicate(dev, mode); + +@@ -570,15 +569,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, + if (!crtc->enabled) + return true; + +- if (old_fb && crtc->fb) { +- depth_changed = (old_fb->depth != crtc->fb->depth); +- bpp_changed = (old_fb->bits_per_pixel != +- crtc->fb->bits_per_pixel); +- } else { +- depth_changed = true; +- bpp_changed = true; +- } +- + saved_mode = crtc->mode; + saved_x = crtc->x; + saved_y = crtc->y; +@@ -590,15 +580,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, crtc->x = x; crtc->y = y; - if (drm_mode_equal(&saved_mode, &crtc->mode)) { -+ if (drm_mode_equal(&saved_mode, &crtc->mode) && !conn_changed) { - if (saved_x != crtc->x || saved_y != crtc->y || - depth_changed || bpp_changed) { - ret = !crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y, -@@ -848,7 +848,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) - drm_mode_debug_printmodeline(set->mode); - if (!drm_crtc_helper_set_mode(set->crtc, set->mode, - set->x, set->y, -- old_fb)) { -+ old_fb, 1)) { - DRM_ERROR("failed to set mode on crtc %p\n", - set->crtc); - ret = -EINVAL; -@@ -868,6 +868,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) +- if (saved_x != crtc->x || saved_y != crtc->y || +- depth_changed || bpp_changed) { +- ret = !crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y, +- old_fb); +- goto done; +- } +- } +- + /* Pass our mode to the connectors and the CRTC to give them a chance to + * adjust it according to limitations or connector properties, and also + * a chance to reject the mode entirely. +@@ -868,6 +849,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) set->x, set->y, old_fb); if (ret != 0) goto fail_set_mode; @@ -5646,16 +5734,7 @@ index a04639d..2bedb7a 100644 } kfree(save_encoders); -@@ -999,7 +1001,7 @@ int drm_helper_resume_force_mode(struct drm_device *dev) - continue; - - ret = drm_crtc_helper_set_mode(crtc, &crtc->mode, -- crtc->x, crtc->y, crtc->fb); -+ crtc->x, crtc->y, crtc->fb, 1); - - if (ret == false) - DRM_ERROR("failed to set mode on crtc %p\n", crtc); -@@ -1007,3 +1009,30 @@ int drm_helper_resume_force_mode(struct drm_device *dev) +@@ -1007,3 +990,30 @@ int drm_helper_resume_force_mode(struct drm_device *dev) return 0; } EXPORT_SYMBOL(drm_helper_resume_force_mode); @@ -6781,10 +6860,10 @@ index d009661..5f7e431 100644 * Called via drm_exit() at module unload time or when pci device is diff --git a/drivers/gpu/drm/drm_ttm.c b/drivers/gpu/drm/drm_ttm.c new file mode 100644 -index 0000000..dbc0cb3 +index 0000000..ae64a83 --- /dev/null +++ b/drivers/gpu/drm/drm_ttm.c -@@ -0,0 +1,469 @@ +@@ -0,0 +1,476 @@ +/************************************************************************** + * + * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA @@ -6876,14 +6955,21 @@ index 0000000..dbc0cb3 + * Change caching policy for the linear kernel map + * for range of pages in a ttm. + */ -+static int drm_ttm_set_caching(struct drm_ttm *ttm, int noncached) ++static int drm_ttm_set_caching(struct drm_ttm *ttm, int noncached, int alloc_cached) +{ + int i; + struct page **cur_page; ++ int ret; + + if ((ttm->page_flags & DRM_TTM_PAGE_UNCACHED) == noncached) + return 0; + ++ { ++ ret = drm_ttm_populate(ttm, alloc_cached); ++ if (ret != 0) ++ return ret; ++ } ++ + if (noncached) + drm_clflush_pages(ttm->pages, ttm->num_pages); + @@ -6976,7 +7062,7 @@ index 0000000..dbc0cb3 + if (ttm->pages) { + if (ttm->page_flags & DRM_TTM_PAGE_USER) { + if (ttm->page_flags & DRM_TTM_PAGE_UNCACHED) -+ drm_ttm_set_caching(ttm, 0); ++ drm_ttm_set_caching(ttm, 0, 0); + + drm_ttm_free_user_pages(ttm); + } else @@ -7184,7 +7270,7 @@ index 0000000..dbc0cb3 + struct drm_ttm_backend *be = ttm->be; + if (be->func->needs_ub_cache_adjust(be)) + if (ttm->page_flags & DRM_TTM_PAGE_ALLOC_CACHED) -+ drm_ttm_set_caching(ttm, 0); ++ drm_ttm_set_caching(ttm, 0, 1); + ttm->state = ttm_unbound; + } +} @@ -7232,7 +7318,7 @@ index 0000000..dbc0cb3 + be = ttm->be; + + if ((ttm->state == ttm_unbound || ttm->state == ttm_unpopulated) && !cached) -+ drm_ttm_set_caching(ttm, DRM_TTM_PAGE_UNCACHED); ++ drm_ttm_set_caching(ttm, DRM_TTM_PAGE_UNCACHED, cached); + else if ((bo_mem->flags & DRM_BO_FLAG_CACHED_MAPPED) && + bo_driver->ttm_cache_flush) + bo_driver->ttm_cache_flush(ttm); @@ -7537,7 +7623,7 @@ index ee7ce7b..95422bb 100644 int i915_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 64773ce..a2783c0 100644 +index 64773ce..178386d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -763,12 +763,18 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, @@ -7580,15 +7666,6 @@ index 64773ce..a2783c0 100644 break; default: DRM_ERROR("Can't update pipe %d in SAREA\n", pipe); -@@ -1573,7 +1579,7 @@ struct drm_crtc *intel_get_load_detect_pipe(struct intel_output *intel_output, - if (!crtc->enabled) { - if (!mode) - mode = &load_detect_mode; -- drm_crtc_helper_set_mode(crtc, mode, 0, 0, crtc->fb); -+ drm_crtc_helper_set_mode(crtc, mode, 0, 0, crtc->fb, 0); - } else { - if (intel_crtc->dpms_mode != DRM_MODE_DPMS_ON) { - crtc_funcs = crtc->helper_private; diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index 52ce439..0eea827 100644 --- a/drivers/gpu/drm/radeon/Makefile @@ -15308,7 +15385,7 @@ index 0000000..ac268dd + RADEON_WRITE(AVIVO_DC_LB_MEMORY_SPLIT, dc_lb_memory_split); +} diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c -index cb2e470..f4ccfbb 100644 +index cb2e470..66aafd8 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c @@ -35,6 +35,7 @@ @@ -15406,7 +15483,7 @@ index cb2e470..f4ccfbb 100644 } else { ADD_RANGE(R300_PFS_CNTL_0, 3); ADD_RANGE(R300_PFS_NODE_0, 4); -@@ -274,11 +289,124 @@ void r300_init_reg_flags(struct drm_device *dev) +@@ -274,11 +289,127 @@ void r300_init_reg_flags(struct drm_device *dev) ADD_RANGE(R300_PFS_INSTR3_0, 64); ADD_RANGE(R300_RS_INTERP_0, 8); ADD_RANGE(R300_RS_ROUTE_0, 8); @@ -15436,6 +15513,9 @@ index cb2e470..f4ccfbb 100644 + ADD_RANGE_MARK(R300_SC_SCISSOR0, 2, MARK_CHECK_SCISSOR); + ADD_RANGE(R300_SC_CLIP_0_A, 2); ++ ADD_RANGE(R300_SC_CLIP_1_A, 2); ++ ADD_RANGE(R300_SC_CLIP_2_A, 2); ++ ADD_RANGE(R300_SC_CLIP_3_A, 2); + ADD_RANGE(R300_SC_CLIP_RULE, 1); + ADD_RANGE(R300_SC_SCREENDOOR, 1); + @@ -15532,7 +15612,7 @@ index cb2e470..f4ccfbb 100644 { int i; if (reg & ~0xffff) -@@ -289,6 +417,13 @@ static __inline__ int r300_check_range(unsigned reg, int count) +@@ -289,6 +420,13 @@ static __inline__ int r300_check_range(unsigned reg, int count) return 0; } @@ -19189,10 +19269,10 @@ index 0000000..5f5a4cb +} diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c new file mode 100644 -index 0000000..2696f22 +index 0000000..0fb98cb --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_connectors.c -@@ -0,0 +1,600 @@ +@@ -0,0 +1,610 @@ +/* + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -19584,6 +19664,7 @@ index 0000000..2696f22 + struct drm_connector *connector; + struct radeon_connector *radeon_connector; + struct radeon_connector_atom_dig *radeon_dig_connector; ++ uint32_t subpixel_order = SubPixelNone; + + /* fixme - tv/cv/din */ + if ((connector_type == DRM_MODE_CONNECTOR_Unknown) || @@ -19643,6 +19724,7 @@ index 0000000..2696f22 + if (!radeon_connector->ddc_bus) + goto failed; + } ++ subpixel_order = SubPixelHorizontalRGB; + break; + case DRM_MODE_CONNECTOR_HDMIA: + case DRM_MODE_CONNECTOR_HDMIB: @@ -19659,6 +19741,7 @@ index 0000000..2696f22 + if (!radeon_connector->ddc_bus) + goto failed; + } ++ subpixel_order = SubPixelHorizontalRGB; + break; + case DRM_MODE_CONNECTOR_DisplayPort: + radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); @@ -19674,6 +19757,7 @@ index 0000000..2696f22 + if (!radeon_connector->ddc_bus) + goto failed; + } ++ subpixel_order = SubPixelHorizontalRGB; + break; + case DRM_MODE_CONNECTOR_SVIDEO: + case DRM_MODE_CONNECTOR_Composite: @@ -19693,9 +19777,11 @@ index 0000000..2696f22 + if (!radeon_connector->ddc_bus) + goto failed; + } ++ subpixel_order = SubPixelHorizontalRGB; + break; + } + ++ connector->display_info.subpixel_order = subpixel_order; + drm_sysfs_connector_add(connector); + return; + @@ -19715,6 +19801,7 @@ index 0000000..2696f22 +{ + struct drm_connector *connector; + struct radeon_connector *radeon_connector; ++ uint32_t subpixel_order = SubPixelNone; + + /* fixme - tv/cv/din */ + if ((connector_type == DRM_MODE_CONNECTOR_Unknown) || @@ -19768,6 +19855,7 @@ index 0000000..2696f22 + if (!radeon_connector->ddc_bus) + goto failed; + } ++ subpixel_order = SubPixelHorizontalRGB; + break; + case DRM_MODE_CONNECTOR_SVIDEO: + case DRM_MODE_CONNECTOR_Composite: @@ -19781,9 +19869,11 @@ index 0000000..2696f22 + if (!radeon_connector->ddc_bus) + goto failed; + } ++ subpixel_order = SubPixelHorizontalRGB; + break; + } + ++ connector->display_info.subpixel_order = subpixel_order; + drm_sysfs_connector_add(connector); + return; + @@ -19794,7 +19884,7 @@ index 0000000..2696f22 + kfree(connector); +} diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c -index 77a7a4d..948cc37 100644 +index 77a7a4d..e074b59 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -46,8 +46,12 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv); @@ -20798,7 +20888,7 @@ index 77a7a4d..948cc37 100644 LOCK_TEST_WITH_RETURN(dev, file_priv); if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) -@@ -2040,6 +2269,822 @@ int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_ +@@ -2040,6 +2269,824 @@ int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_ return ret; } @@ -21291,7 +21381,6 @@ index 77a7a4d..948cc37 100644 + if (dev_priv->chip_family > CHIP_R600) + return 0; + -+ dev_priv->usec_timeout = RADEON_DEFAULT_CP_TIMEOUT; + dev_priv->ring.size = RADEON_DEFAULT_RING_SIZE; + dev_priv->cp_mode = RADEON_CSQ_PRIBM_INDBM; + @@ -21574,6 +21663,9 @@ index 77a7a4d..948cc37 100644 + + radeon_get_clock_info(dev); + ++ /* configure initial usec timeout here */ ++ dev_priv->usec_timeout = RADEON_DEFAULT_CP_TIMEOUT; ++ + return 0; +} + @@ -21621,7 +21713,7 @@ index 77a7a4d..948cc37 100644 int radeon_driver_load(struct drm_device *dev, unsigned long flags) { drm_radeon_private_t *dev_priv; -@@ -2053,6 +3098,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) +@@ -2053,6 +3100,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) dev->dev_private = (void *)dev_priv; dev_priv->flags = flags; @@ -21630,7 +21722,7 @@ index 77a7a4d..948cc37 100644 switch (flags & RADEON_FAMILY_MASK) { case CHIP_R100: case CHIP_RV200: -@@ -2073,6 +3120,21 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) +@@ -2073,6 +3122,21 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) break; } @@ -21652,7 +21744,7 @@ index 77a7a4d..948cc37 100644 if (drm_device_is_agp(dev)) dev_priv->flags |= RADEON_IS_AGP; else if (drm_device_is_pcie(dev)) -@@ -2080,9 +3142,34 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) +@@ -2080,9 +3144,34 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) else dev_priv->flags |= RADEON_IS_PCI; @@ -21688,7 +21780,7 @@ index 77a7a4d..948cc37 100644 if (ret != 0) return ret; -@@ -2092,8 +3179,63 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) +@@ -2092,8 +3181,63 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) return ret; } @@ -21754,7 +21846,7 @@ index 77a7a4d..948cc37 100644 return ret; } -@@ -2147,18 +3289,12 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master) +@@ -2147,18 +3291,12 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master) */ int radeon_driver_firstopen(struct drm_device *dev) { @@ -21776,7 +21868,7 @@ index 77a7a4d..948cc37 100644 return 0; } -@@ -2167,6 +3303,14 @@ int radeon_driver_unload(struct drm_device *dev) +@@ -2167,6 +3305,14 @@ int radeon_driver_unload(struct drm_device *dev) { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -21791,7 +21883,7 @@ index 77a7a4d..948cc37 100644 DRM_DEBUG("\n"); drm_rmmap(dev, dev_priv->mmio); -@@ -2214,3 +3358,41 @@ void radeon_commit_ring(drm_radeon_private_t *dev_priv) +@@ -2214,3 +3360,41 @@ void radeon_commit_ring(drm_radeon_private_t *dev_priv) RADEON_READ(RADEON_CP_RB_RPTR); } } @@ -22795,10 +22887,10 @@ index 0000000..7ddc8fd + diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c new file mode 100644 -index 0000000..78f23da +index 0000000..bb047ec --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_display.c -@@ -0,0 +1,680 @@ +@@ -0,0 +1,670 @@ +/* + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -22933,23 +23025,11 @@ index 0000000..78f23da + if (!crtc->fb) + return; + -+ if (crtc->fb->depth == 16) { -+ for (i = 0; i < 64; i++) { -+ if (i <= 31) { -+ for (j = 0; j < 8; j++) { -+ radeon_crtc->lut_r[i * 8 + j] = red[i] >> 6; -+ radeon_crtc->lut_b[i * 8 + j] = blue[i] >> 6; -+ } -+ } -+ for (j = 0; j < 4; j++) -+ radeon_crtc->lut_g[i * 4 + j] = green[i] >> 6; -+ } -+ } else { -+ for (i = 0; i < 256; i++) { -+ radeon_crtc->lut_r[i] = red[i] >> 6; -+ radeon_crtc->lut_g[i] = green[i] >> 6; -+ radeon_crtc->lut_b[i] = blue[i] >> 6; -+ } ++ /* copy in the colors from userspace */ ++ for (i = 0; i < 256; i++) { ++ radeon_crtc->lut_r[i] = red[i] >> 6; ++ radeon_crtc->lut_g[i] = green[i] >> 6; ++ radeon_crtc->lut_b[i] = blue[i] >> 6; + } + + radeon_crtc_load_lut(crtc); @@ -22959,6 +23039,8 @@ index 0000000..78f23da +{ + struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); + ++ if (radeon_crtc->mode_set.mode) ++ drm_mode_destroy(crtc->dev, radeon_crtc->mode_set.mode); + drm_crtc_cleanup(crtc); + kfree(radeon_crtc); +} @@ -26178,10 +26260,10 @@ index 0000000..433ebc9 +} diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c new file mode 100644 -index 0000000..148ee30 +index 0000000..33edbe8 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_fb.c -@@ -0,0 +1,928 @@ +@@ -0,0 +1,934 @@ +/* + * Copyright ?? 2007 David Airlie + * @@ -26896,8 +26978,11 @@ index 0000000..148ee30 + par->crtc_ids[0] = crtc->base.id; + + modeset->num_connectors = conn_count; -+ if (modeset->mode != modeset->crtc->desired_mode) -+ modeset->mode = modeset->crtc->desired_mode; ++ if (modeset->crtc->desired_mode) { ++ if (modeset->mode) ++ drm_mode_destroy(dev, modeset->mode); ++ modeset->mode = drm_mode_duplicate(dev, modeset->crtc->desired_mode); ++ } + + par->crtc_count = 1; + @@ -27024,8 +27109,11 @@ index 0000000..148ee30 + par->crtc_ids[crtc_count++] = crtc->base.id; + + modeset->num_connectors = conn_count; -+ if (modeset->mode != modeset->crtc->desired_mode) -+ modeset->mode = modeset->crtc->desired_mode; ++ if (modeset->crtc->desired_mode) { ++ if (modeset->mode) ++ drm_mode_destroy(dev, modeset->mode); ++ modeset->mode = drm_mode_duplicate(dev, modeset->crtc->desired_mode); ++ } + } + par->crtc_count = crtc_count; + @@ -27276,10 +27364,10 @@ index 0000000..504290b +#endif diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c new file mode 100644 -index 0000000..a0b0f5b +index 0000000..cb96470 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_gem.c -@@ -0,0 +1,1604 @@ +@@ -0,0 +1,1578 @@ +/* + * Copyright 2008 Red Hat Inc. + * @@ -28728,38 +28816,12 @@ index 0000000..a0b0f5b +static int radeon_gem_relocate(struct drm_radeon_cs_parser *parser, + uint32_t *reloc, uint32_t *offset) +{ -+ struct drm_device *dev = parser->dev; + /* relocate the handle */ -+ uint32_t read_domains, write_domain; -+ struct drm_gem_object *obj; -+ int ret = 0; -+ struct drm_radeon_gem_object *obj_priv; -+ -+ if (parser->reloc_index == -1) { -+ obj = drm_gem_object_lookup(dev, parser->file_priv, reloc[1]); -+ if (!obj) -+ return -EINVAL; -+ obj_priv = obj->driver_private; -+ if (obj_priv->bo->mem.flags & DRM_BO_FLAG_CLEAN) -+ DRM_ERROR("clean on relocate for %d\n", reloc[1]); -+ read_domains = reloc[2]; -+ write_domain = reloc[3]; -+ -+ ret = radeon_gem_do_relocate(obj, read_domains, write_domain, offset); -+ -+ mutex_lock(&dev->struct_mutex); -+ drm_gem_object_unreference(obj); -+ mutex_unlock(&dev->struct_mutex); -+ -+ } else { -+ uint32_t handle; -+ /* have to lookup handle in other chunk */ -+ ret = radeon_gem_find_reloc(parser, reloc[1], &handle, offset); -+ } -+ return ret; ++ uint32_t handle; ++ /* have to lookup handle in other chunk */ ++ return radeon_gem_find_reloc(parser, reloc[1], &handle, offset); +} + -+ +int radeon_gem_prelocate(struct drm_radeon_cs_parser *parser) +{ + struct drm_device *dev = parser->dev; @@ -32316,10 +32378,10 @@ index 4af5286..40134c8 100644 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h new file mode 100644 -index 0000000..a1aff31 +index 0000000..71eaaeb --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_mode.h -@@ -0,0 +1,399 @@ +@@ -0,0 +1,398 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -32602,7 +32664,6 @@ index 0000000..a1aff31 +extern void radeon_i2c_destroy(struct radeon_i2c_chan *i2c); +extern bool radeon_ddc_probe(struct radeon_connector *radeon_connector); +extern int radeon_ddc_get_modes(struct radeon_connector *radeon_connector); -+extern struct drm_connector *radeon_connector_add(struct drm_device *dev, int bios_index); + +extern struct drm_encoder *radeon_best_encoder(struct drm_connector *connector); + @@ -32990,10 +33051,10 @@ index 0000000..5a57056 + diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h new file mode 100644 -index 0000000..1a5e157 +index 0000000..102bdba --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_reg.h -@@ -0,0 +1,5361 @@ +@@ -0,0 +1,5364 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -37837,6 +37898,9 @@ index 0000000..1a5e157 +#define R300_SC_CLIP_0_B 0x43b4 +# define R300_CLIP_X_SHIFT 0 +# define R300_CLIP_Y_SHIFT 13 ++#define R300_SC_CLIP_1_A 0x43b8 ++#define R300_SC_CLIP_2_A 0x43c0 ++#define R300_SC_CLIP_3_A 0x43c8 +#define R300_SC_CLIP_RULE 0x43d0 +#define R300_SC_SCREENDOOR 0x43e8 + @@ -38761,18 +38825,9 @@ index c8c4221..04fbd1e 100644 #endif /* __KERNEL__ */ diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h -index ec073d8..86a8a87 100644 +index ec073d8..32ac55d 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h -@@ -96,7 +96,7 @@ extern int drm_crtc_helper_set_config(struct drm_mode_set *set); - extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, - struct drm_display_mode *mode, - int x, int y, -- struct drm_framebuffer *old_fb); -+ struct drm_framebuffer *old_fb, int conn_changed); - extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc); - - extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, @@ -121,4 +121,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector, } drm-next.patch: Index: drm-next.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-next.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- drm-next.patch 1 May 2009 18:41:25 -0000 1.15 +++ drm-next.patch 5 May 2009 10:28:11 -0000 1.16 @@ -7112,15 +7112,6 @@ index b05cb67..0ab2d3a 100644 } static void -@@ -1600,7 +1612,7 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop - - if (changed && crtc) - drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x, -- crtc->y, crtc->fb); -+ crtc->y, crtc->fb, 0); - out: - return ret; - } diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c index b49c5ff..7a6bf9f 100644 --- a/drivers/gpu/drm/mga/mga_dma.c drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -r1.46 -r1.47 --- drm-nouveau.patch 4 May 2009 22:47:47 -0000 1.46 +++ drm-nouveau.patch 5 May 2009 10:28:11 -0000 1.47 @@ -24059,7 +24059,7 @@ index 0000000..771c7ab + rval = drm_crtc_helper_set_mode(&crtc->base, + &crtc->base.mode, + crtc->base.x, -+ crtc->base.y, NULL, 0); ++ crtc->base.y, NULL); + if (rval) + return rval; + } else { Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1589 retrieving revision 1.1590 diff -u -p -r1.1589 -r1.1590 --- kernel.spec 4 May 2009 22:44:11 -0000 1.1589 +++ kernel.spec 5 May 2009 10:28:13 -0000 1.1590 @@ -692,7 +692,6 @@ Patch1823: drm-intel-tiled-front.patch Patch1824: drm-intel-hdmi-edid-fix.patch Patch1825: drm-intel-tiling-transition.patch Patch1826: linux-2.6-drm-r128-ioremap.patch -Patch1827: drm-radeon-kms-fixes.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -1344,7 +1343,6 @@ ApplyPatch drm-intel-tiled-front.patch ApplyPatch drm-intel-hdmi-edid-fix.patch ApplyPatch drm-intel-tiling-transition.patch ApplyPatch linux-2.6-drm-r128-ioremap.patch -ApplyPatch drm-radeon-kms-fixes.patch # linux1394 git patches ApplyPatch linux-2.6-firewire-git-update.patch @@ -1967,6 +1965,9 @@ fi # and build. %changelog +* Tue May 05 2009 Dave Airlie 2.6.29.2-128 +- radeon kms: backport some fixes - put back old internal interface + * Tue May 05 2009 Ben Skeggs 2.6.29.2-127 - drm-nouveau.patch: bump dac load detection delay to match ddx --- drm-radeon-kms-fixes.patch DELETED --- From mhlavink at fedoraproject.org Tue May 5 10:41:18 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 10:41:18 +0000 (UTC) Subject: rpms/ksh/devel .cvsignore,1.16,1.17 sources,1.16,1.17 Message-ID: <20090505104118.987E870108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ksh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21970 Modified Files: .cvsignore sources Log Message: update sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ksh/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 20 Jan 2009 12:07:54 -0000 1.16 +++ .cvsignore 5 May 2009 10:40:48 -0000 1.17 @@ -1,2 +1,2 @@ -INIT.2008-11-04.tgz -ast-ksh.2008-11-04.tgz +INIT.2009-05-01.tgz +ast-ksh.2009-05-01.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ksh/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- sources 20 Jan 2009 12:07:55 -0000 1.16 +++ sources 5 May 2009 10:40:48 -0000 1.17 @@ -1,2 +1,2 @@ -adb05b9940046d3ca6b4b24038131725 INIT.2008-11-04.tgz -630096418741335fd757cda3f054aa11 ast-ksh.2008-11-04.tgz +e3e36a3440ae23969275ec62996285df INIT.2009-05-01.tgz +d8d2b3b5edb6255b0b9eb6ad471e9c25 ast-ksh.2009-05-01.tgz From transif at fedoraproject.org Tue May 5 10:45:08 2009 From: transif at fedoraproject.org (Transifex System User) Date: Tue, 5 May 2009 10:45:08 +0000 (UTC) Subject: comps/po ml.po,1.19,1.20 Message-ID: <20090505104508.15DE870108@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22488/po Modified Files: ml.po Log Message: Sending translation for Malayalam Index: ml.po =================================================================== RCS file: /cvs/pkgs/comps/po/ml.po,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- ml.po 29 Apr 2009 20:00:21 -0000 1.19 +++ ml.po 5 May 2009 10:44:37 -0000 1.20 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: comps.HEAD.ml\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-04-08 17:45+0530\n" +"POT-Creation-Date: 2009-05-05 08:08+0000\n" +"PO-Revision-Date: 2009-05-05 16:14+0530\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -410,28 +410,24 @@ msgstr "???????????????????????????????? msgid "" "Install these packages in order to develop GTK+ and GNOME graphical " "applications." -msgstr "" -"GTK????????????????????? ??????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????? ??????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????? ?????????????????????." +msgstr "GTK????????????????????? ??????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????? ??????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????? ?????????????????????." #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76 #: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91 msgid "" "Install these packages in order to develop GTK+ and XFCE graphical " "applications." -msgstr "" -"GTK-????????????????????? XFCE-????????????????????? ???????????????????????????????????? ????????????????????????????????? ??????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????? ?????????????????????." +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:81 ../comps-f11.xml.in.h:92 ../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????????????????????? ???????????????????????????????????? ????????????????????????????????? ??????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????? ?????????????????????." +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:82 ../comps-f11.xml.in.h:93 -msgid "" -"Install these tools to enable the system to print or act as a print server." +msgid "Install these tools to enable the system to print or act as a print server." msgstr "" "?????????????????????????????????????????? ????????????????????? ???????????????????????? ????????????????????????????????????????????? ???????????? ???????????????????????? ???????????????????????? ????????? ????????????????????????????????? ??????????????????????????????????????????????????? " "??? ????????????????????????????????? ??????????????????????????????????????? ?????????????????????." @@ -439,10 +435,8 @@ msgstr "" #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79 #: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94 ../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 "" -"?????????????????? ???????????????????????????????????? (X) ?????????????????? ??????????????????????????????????????? ????????????????????????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????? ?????????????????????." +msgid "Install this group of packages to use the base graphical (X) user interface." +msgstr "?????????????????? ???????????????????????????????????? (X) ?????????????????? ??????????????????????????????????????? ????????????????????????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????? ?????????????????????." #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81 #: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97 @@ -687,8 +681,7 @@ msgstr "???????????????????????????????? #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137 #: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:169 #: ../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." +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:138 @@ -820,8 +813,7 @@ msgstr "??????????????? ???????????????? #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160 #: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:200 -msgid "" -"The packages in this group are core libraries needed to develop applications." +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:161 @@ -832,22 +824,18 @@ msgstr "IMAP ,SMTP ????????????????????? #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162 #: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:202 -msgid "" -"These packages allow you to develop applications for the X Window System." -msgstr "" -"X Window ?????????????????????????????????????????? ??????????????????????????? ??????????????????????????????????????? ??????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????????. " +msgid "These packages allow you to develop applications for the X Window System." +msgstr "X Window ?????????????????????????????????????????? ??????????????????????????? ??????????????????????????????????????? ??????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????????. " #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163 #: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:203 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 -msgid "" -"These packages are helpful when developing web applications or web pages." +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:164 #: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:204 -msgid "" -"These packages include network-based servers such as DHCP, Kerberos and NIS." +msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "DHCP, Kerberos, NIS ??????????????? ?????????????????????????????????????????????-???????????????????????? ????????????????????????????????? ??? ?????????????????????????????????????????? ??????????????????????????????????????????. " #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165 @@ -874,8 +862,7 @@ msgstr "??????????????? ???????????????? 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:169 #: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:209 @@ -948,8 +935,7 @@ msgstr "" #: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:218 #: ../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:179 #: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:219 @@ -974,15 +960,13 @@ msgstr "" #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181 #: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:221 #: ../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." +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:182 #: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:222 #: ../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." +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:183 @@ -997,8 +981,7 @@ msgstr "" #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184 #: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:225 -msgid "" -"This package group allows you to run a DNS name server (BIND) on the system." +msgid "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" "?????????????????????????????????????????? DNS ??????????????? ???????????????????????? (BIND) ???????????????????????????????????????????????????????????????????????????????????? ????????????????????? ??? ???????????????????????? " "???????????????????????????????????????." @@ -1291,19 +1274,16 @@ msgid "Amazigh Support" msgstr "????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:13 -#, fuzzy msgid "Azerbaijani Support" -msgstr "?????????????????????????????? ?????????????????????" +msgstr "?????????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:27 -#, fuzzy msgid "Chichewa Support" -msgstr "?????????????????? ?????????????????????" +msgstr "???????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:31 -#, fuzzy msgid "Coptic Support" -msgstr "???????????????????????????????????? ?????????????????????" +msgstr "???????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:37 msgid "Design and Simulation tools for hardware engineers" @@ -1314,9 +1294,8 @@ msgid "Electronic Lab" msgstr "???????????????????????????????????? ????????????" #: ../comps-f11.xml.in.h:58 -#, fuzzy msgid "Fijian Support" -msgstr "?????????????????????????????? ?????????????????????" +msgstr "???????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:61 msgid "Font design and packaging" @@ -1331,47 +1310,40 @@ msgid "Friulian Support" msgstr "?????????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:83 -#, fuzzy msgid "Hiligaynon Support" -msgstr "?????????????????????????????? ?????????????????????" +msgstr "???????????????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:96 -#, fuzzy msgid "Interlingua Support" -msgstr "????????????????????????????????? ?????????????????????" +msgstr "??????????????????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:109 -#, fuzzy msgid "Kazakh Support" -msgstr "??????????????? ?????????????????????" +msgstr "???????????? ?????????????????????" #: ../comps-f11.xml.in.h:111 msgid "Kinyarwanda Support" msgstr "????????????????????????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:118 -#, fuzzy msgid "Latin Support" -msgstr "????????????????????????????????? ?????????????????????" +msgstr "??????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:126 -#, fuzzy msgid "Luxembourgish Support" -msgstr "?????????????????????????????? ?????????????????????" +msgstr "?????????????????????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:130 msgid "Malagasy Support" msgstr "????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:133 -#, fuzzy msgid "Maltese Support" -msgstr "???????????? ?????????????????????" +msgstr "????????????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:134 -#, fuzzy msgid "Manx Support" -msgstr "???????????? ?????????????????????" +msgstr "??????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:137 msgid "MinGW cross-compiler" @@ -1390,14 +1362,12 @@ msgid "Online Help and Documentation" msgstr "??????????????????????????? ????????????????????? ????????????????????????" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "???????????????????????? ?????????????????????" +msgstr "????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "???????????????????????????????????? ?????????????????????" +msgstr "????????????????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" @@ -1420,14 +1390,12 @@ msgstr "" "????????????????????????????????????????????????????????? ?????????????????????." #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "?????????????????? ?????????????????????" +msgstr "???????????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "???????????????????????? ?????????????????????" +msgstr "?????????????????? ?????????????????????" #: ../comps-f11.xml.in.h:223 msgid "" @@ -1494,18 +1462,15 @@ msgid "This group is a collection of net 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." +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." +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." +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 @@ -1513,6 +1478,6 @@ 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 "?????????????????? ???????????????????????????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????? ????????? ???????????????????????? ??? ??????????????????." + From ruben at fedoraproject.org Tue May 5 10:48:37 2009 From: ruben at fedoraproject.org (Ruben Kerkhof) Date: Tue, 5 May 2009 10:48:37 +0000 (UTC) Subject: rpms/gearmand/devel gearmand.init, NONE, 1.1 gearmand.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090505104837.8F9C270108@cvs1.fedora.phx.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/gearmand/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23686/devel Modified Files: .cvsignore sources Added Files: gearmand.init gearmand.spec import.log Log Message: Initial import --- NEW FILE gearmand.init --- #!/bin/bash # # gearmand Startup script for the Gearman server # # chkconfig: - 85 15 # description: Gearman is a distributed job system. # processname: gearmand # config: /etc/sysconfig/gearmand # pidfile: /var/run/gearmand/gearmand.pid # ### BEGIN INIT INFO # Provides: gearmand # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Default-Start: # Default-Stop: # Short-Description: start and stop the Gearman server # Description: Gearman is a distributed job system. ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ -f /etc/sysconfig/gearmand ]; then . /etc/sysconfig/gearmand fi [ -z "${PIDFILE}" ] && pidfile = "/var/run/gearmand/gearmand.pid" [ -z "${LOCKFILE}" ] && lockfile="/var/lock/subsys/gearmand" gearmand=/usr/bin/gearmand prog=gearmand RETVAL=0 start() { echo -n $"Starting $prog: " daemon --pidfile=$pidfile --user=gearmand $gearmand -d $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && (touch $lockfile; pgrep -f $gearmand > $pidfile) return $RETVAL } stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $gearmand RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $gearmand RETVAL=$? ;; restart|reload) stop start ;; condrestart|try-restart) if status -p $pidfile $gearmand >&/dev/null; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|reload|condrestart|status|help}" RETVAL=3 esac exit $RETVAL --- NEW FILE gearmand.spec --- Name: gearmand Version: 0.5 Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons License: BSD URL: http://www.gearman.org Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, e2fsprogs-devel %ifnarch ppc64 # no google perftools on ppc64 BuildRequires: google-perftools-devel %endif Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires: procps %description Gearman provides a generic framework to farm out work to other machines or dispatch function calls to machines that are better suited to do the work. It allows you to do work in parallel, to load balance processing, and to call functions between languages. It can be used in a variety of applications, from high-availability web sites to the transport for database replication. In other words, it is the nervous system for how distributed processing communicates. %package -n libgearman-devel Summary: Development headers for libgearman Requires: pkgconfig, libgearman = %{version}-%{release} Group: Development/Libraries %description -n libgearman-devel Development headers for %{name} %package -n libgearman Summary: Development libraries for gearman Group: Development/Libraries %description -n libgearman Development libraries for %{name} %prep %setup -q %build %ifarch ppc64 # no tcmalloc on ppc64 %configure --disable-static %else %configure --disable-static --enable-tcmalloc %endif 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 %{buildroot} make install DESTDIR=%{buildroot} rm -v %{buildroot}%{_libdir}/libgearman.la install -D %{SOURCE1} %{buildroot}%{_initrddir}/gearmand %clean rm -rf %{buildroot} %pre getent group gearmand >/dev/null || groupadd -r gearmand getent passwd gearmand >/dev/null || \ useradd -r -g gearmand -d / -s /sbin/nologin \ -c "Gearmand job server" gearmand exit 0 %post if [ $1 -eq 1 ]; then /sbin/chkconfig --add gearmand fi %preun if [ $1 -eq 0 ]; then /sbin/service gearmand stop >/dev/null 2>&1 || : /sbin/chkconfig --del gearmand fi %post -n libgearman -p /sbin/ldconfig %postun -n libgearman -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_sbindir}/gearmand %{_bindir}/gearman %{_initrddir}/gearmand %{_mandir}/man1/gearman.1.gz %files -n libgearman-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %dir %{_includedir}/libgearman %{_includedir}/libgearman/*.h %{_libdir}/pkgconfig/gearmand.pc %{_libdir}/libgearman.so %{_mandir}/man3/gearman*.3.gz %files -n libgearman %defattr(-,root,root,-) %doc COPYING %{_libdir}/libgearman.so.* %changelog * Mon Apr 27 2009 Ruben Kerkhof 0.5-1 - Upstream released new version - Cleanups for review (bz #487148) * Wed Feb 25 2009 Ruben Kerkhof 0.3-2 - Add init script * Sat Feb 07 2009 Ruben Kerkhof 0.3-1 - Initial import --- NEW FILE import.log --- gearmand-0_5-1_fc11:HEAD:gearmand-0.5-1.fc11.src.rpm:1241520465 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gearmand/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:38:38 -0000 1.1 +++ .cvsignore 5 May 2009 10:48:07 -0000 1.2 @@ -0,0 +1 @@ +gearmand-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gearmand/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:38:39 -0000 1.1 +++ sources 5 May 2009 10:48:07 -0000 1.2 @@ -0,0 +1 @@ +41946441094bc260c46b1391ae6ef3a4 gearmand-0.5.tar.gz From mhlavink at fedoraproject.org Tue May 5 10:57:52 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 10:57:52 +0000 (UTC) Subject: rpms/ksh/F-11 ksh.spec,1.46,1.47 sources,1.16,1.17 Message-ID: <20090505105752.C234B70108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ksh/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24614 Modified Files: ksh.spec sources Log Message: updated to 2009-05-01 Index: ksh.spec =================================================================== RCS file: /cvs/extras/rpms/ksh/F-11/ksh.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -r1.46 -r1.47 --- ksh.spec 10 Mar 2009 10:28:17 -0000 1.46 +++ ksh.spec 5 May 2009 10:57:22 -0000 1.47 @@ -1,12 +1,12 @@ -%define releasedate 2008-11-04 +%define releasedate 2009-05-01 Name: ksh Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ Group: System Environment/Shells License: CPL -Version: 20081104 -Release: 3%{?dist} +Version: 20090501 +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 Source3: kshrc.rhs @@ -84,6 +84,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Michal Hlavinka - 20090501-1 +- updated to 2009-05-01 + * Tue Mar 10 2009 Michal Hlavinka - 20081104-3 - fix typos in spec file Index: sources =================================================================== RCS file: /cvs/extras/rpms/ksh/F-11/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- sources 20 Jan 2009 12:07:55 -0000 1.16 +++ sources 5 May 2009 10:57:22 -0000 1.17 @@ -1,2 +1,2 @@ -adb05b9940046d3ca6b4b24038131725 INIT.2008-11-04.tgz -630096418741335fd757cda3f054aa11 ast-ksh.2008-11-04.tgz +e3e36a3440ae23969275ec62996285df INIT.2009-05-01.tgz +d8d2b3b5edb6255b0b9eb6ad471e9c25 ast-ksh.2009-05-01.tgz From mhlavink at fedoraproject.org Tue May 5 11:00:31 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 11:00:31 +0000 (UTC) Subject: rpms/ksh/F-11 ksh.spec,1.47,1.48 Message-ID: <20090505110031.A1D9C70108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ksh/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24972 Modified Files: ksh.spec Log Message: bump release for rebuild Index: ksh.spec =================================================================== RCS file: /cvs/extras/rpms/ksh/F-11/ksh.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -r1.47 -r1.48 --- ksh.spec 5 May 2009 10:57:22 -0000 1.47 +++ ksh.spec 5 May 2009 11:00:01 -0000 1.48 @@ -6,7 +6,7 @@ URL: http://www.kornshell.com/ Group: System Environment/Shells License: CPL Version: 20090501 -Release: 1%{?dist} +Release: 2%{?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 Source3: kshrc.rhs @@ -84,6 +84,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Michal Hlavinka - 20090501-2 +- skip release -1 because of broken koji + * Tue May 05 2009 Michal Hlavinka - 20090501-1 - updated to 2009-05-01 From mhlavink at fedoraproject.org Tue May 5 11:17:31 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 11:17:31 +0000 (UTC) Subject: rpms/ecryptfs-utils/F-11 ecryptfs-utils-74-build.patch, NONE, 1.1 ecryptfs-utils-74-group.patch, NONE, 1.1 ecryptfs-utils-75-werror.patch, NONE, 1.1 ecryptfs-utils.spec, 1.43, 1.44 sources, 1.25, 1.26 Message-ID: <20090505111731.4628A70108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ecryptfs-utils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26760 Modified Files: ecryptfs-utils.spec sources Added Files: ecryptfs-utils-74-build.patch ecryptfs-utils-74-group.patch ecryptfs-utils-75-werror.patch Log Message: update to v. 75 ecryptfs-utils-74-build.patch: --- NEW FILE ecryptfs-utils-74-build.patch --- diff -up ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 ecryptfs-utils-74/src/libecryptfs/Makefile.am --- ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 2009-04-20 11:03:03.000000000 +0200 +++ ecryptfs-utils-74/src/libecryptfs/Makefile.am 2009-04-23 17:03:16.178703120 +0200 @@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil lib_LTLIBRARIES = libecryptfs.la +noinst_LIBRARIES = libecryptfs.a + pkgconfig_DATA = libecryptfs.pc libecryptfs_la_SOURCES = \ @@ -20,10 +22,13 @@ libecryptfs_la_SOURCES = \ ecryptfs-stat.c \ $(top_srcdir)/src/key_mod/ecryptfs_key_mod_passphrase.c +libecryptfs_a_SOURCES = $(libecryptfs_la_SOURCES) + libecryptfs_la_LDFLAGS = \ -version-info @LIBECRYPTFS_LT_CURRENT@:@LIBECRYPTFS_LT_REVISION@:@LIBECRYPTFS_LT_AGE@ \ -no-undefined libecryptfs_la_CFLAGS = $(AM_CFLAGS) $(CRYPTO_CFLAGS) $(KEYUTILS_CFLAGS) +libecryptfs_a_CFLAGS = $(libecryptfs_la_CFLAGS) libecryptfs_la_LIBADD = $(CRYPTO_LIBS) $(KEYUTILS_LIBS) splint: diff -up ecryptfs-utils-74/src/utils/Makefile.am.486139 ecryptfs-utils-74/src/utils/Makefile.am --- ecryptfs-utils-74/src/utils/Makefile.am.486139 2009-04-20 11:03:03.000000000 +0200 +++ ecryptfs-utils-74/src/utils/Makefile.am 2009-04-23 17:12:38.297756365 +0200 @@ -35,12 +35,12 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) umount_ecryptfs_SOURCES = umount.ecryptfs.c umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) -umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la +umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.a $(KEYUTILS_LIBS) $(CRYPTO_LIBS) ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS) ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) ecryptfs_wrap_passphrase_SOURCES = ecryptfs_wrap_passphrase.c -ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la +ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la ecryptfs_unwrap_passphrase_SOURCES = ecryptfs_unwrap_passphrase.c ecryptfs_unwrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la ecryptfs_insert_wrapped_passphrase_into_keyring_SOURCES = ecryptfs_insert_wrapped_passphrase_into_keyring.c ecryptfs-utils-74-group.patch: --- NEW FILE ecryptfs-utils-74-group.patch --- diff -up ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1.group ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1 --- ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1.group 2009-03-05 22:17:36.000000000 +0100 +++ ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1 2009-05-04 13:14:54.861539319 +0200 @@ -6,7 +6,7 @@ ecryptfs-mount-private \- interactive eC \fBecryptfs-mount-private\fP .SH DESCRIPTION -\fBecryptfs-mount-private\fP is a wrapper script for the \fBmount.ecryptfs_private\fP utility that will interactively prompt for the user's login password, if necessary. +\fBecryptfs-mount-private\fP is a wrapper script for the \fBmount.ecryptfs_private\fP utility that will interactively prompt for the user's login password, if necessary. You need to be a member of \fBecryptfs\fB group to use this. .SH FILES \fI~/.Private\fP - underlying directory containing encrypted data diff -up ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1.group ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1 --- ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1.group 2009-03-18 22:59:07.000000000 +0100 +++ ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1 2009-05-04 13:14:54.861539319 +0200 @@ -43,7 +43,7 @@ Setup this user such that the encrypted .SH DESCRIPTION -\fBecryptfs-setup-private\fP is a program that sets up a private cryptographic mountpoint for a non-root user. +\fBecryptfs-setup-private\fP is a program that sets up a private cryptographic mountpoint for a non-root user, who is a member of \fBecryptfs\fP group. Be sure to properly escape your parameters according to your shell's special character nuances, and also surround the parameters by double quotes, if necessary. Any of the parameters may be: diff -up ecryptfs-utils-74/doc/manpage/mount.ecryptfs.8.group ecryptfs-utils-74/doc/manpage/mount.ecryptfs.8 diff -up ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1.group ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1 --- ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1.group 2009-03-05 22:17:36.000000000 +0100 +++ ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1 2009-05-04 13:20:07.673112485 +0200 @@ -8,7 +8,7 @@ mount.ecryptfs_private \- eCryptfs priva \fBNOTE:\fP This program will \fBnot\fP dynamically load the relevant keys. For this reason, it is recommended that users use \fBecryptfs-mount-private\fP(1) instead! .SH DESCRIPTION -\fBmount.ecryptfs_private\fP is a mount helper utility for non-root users to cryptographically mount a private directory, ~/Private. +\fBmount.ecryptfs_private\fP is a mount helper utility for non-root users, who are members of \fBecryptfs\fP group, to cryptographically mount a private directory, ~/Private. If, and only if: - the private mount passphrase is in their kernel keyring, and diff -up ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1.group ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1 --- ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1.group 2009-03-05 22:17:36.000000000 +0100 +++ ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1 2009-05-04 13:14:54.862538533 +0200 @@ -14,7 +14,7 @@ Options available for the \fBumount.ecry Force the unmount, ignoring the value of the mount counter in \fI/tmp/ecryptfs-USERNAME-Private\fP .SH DESCRIPTION -\fBumount.ecryptfs_private\fP is a mount helper utility for non-root users to unmount a cryptographically mounted private directory, ~/Private. +\fBumount.ecryptfs_private\fP is a mount helper utility for non-root users, who ares members of \fBecryptfs\fP group, to unmount a cryptographically mounted private directory, ~/Private. If, and only if: - the private mount passphrase is in their kernel keyring, and diff -up ecryptfs-utils-74/src/utils/ecryptfs-setup-private.group ecryptfs-utils-74/src/utils/ecryptfs-setup-private --- ecryptfs-utils-74/src/utils/ecryptfs-setup-private.group 2009-03-24 20:32:52.000000000 +0100 +++ ecryptfs-utils-74/src/utils/ecryptfs-setup-private 2009-05-04 13:14:54.862538533 +0200 @@ -188,6 +188,11 @@ else id "$USER" >/dev/null || error "User [$USER] does not exist" fi +# Check if user is member of ecryptfs group +if ! groups "$USER" | sed -e 's| |\n|g' | grep -n 'ecryptfs$'; then + error "User needs to be a member of ecryptfs group" +fi + # Obtain the user's home directory HOME=`getent passwd "$USER" | awk -F: '{print $6}'` if [ ! -d "$HOME" ]; then ecryptfs-utils-75-werror.patch: --- NEW FILE ecryptfs-utils-75-werror.patch --- diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c --- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror 2009-05-01 00:53:13.000000000 +0200 +++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-04 17:49:49.940220924 +0200 @@ -18,6 +18,7 @@ * 02111-1307, USA. */ +#include "config.h" #include #ifdef ENABLE_NSS #include @@ -39,7 +40,6 @@ #include #include #include -#include "config.h" #include "../include/ecryptfs.h" #ifndef ENOKEY diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c --- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror 2009-05-04 17:50:33.587240171 +0200 +++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c 2009-05-04 17:50:33.615345763 +0200 @@ -42,7 +42,6 @@ int main(int argc, char *argv[]) char *wrapping_passphrase; char salt[ECRYPTFS_SALT_SIZE]; char salt_hex[ECRYPTFS_SALT_SIZE_HEX]; - struct passwd *pwd; int rc = 0; if (argc == 1) { Index: ecryptfs-utils.spec =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- ecryptfs-utils.spec 21 Mar 2009 07:21:44 -0000 1.43 +++ ecryptfs-utils.spec 5 May 2009 11:16:59 -0000 1.44 @@ -2,19 +2,29 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: ecryptfs-utils -Version: 73 +Version: 75 Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ URL: https://launchpad.net/ecryptfs -Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz -Source1: http://bazaar.launchpad.net/%7Eecryptfs/ecryptfs/ecryptfs-utils/annotate/head%3A/src/desktop/ecryptfs-mount-private.desktop +Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz + +#fix wrong Makefile for umount.ecryptfs +Patch2: ecryptfs-utils-74-build.patch + +#restrict suid mount.ecryptfs_private to ecryptfs group only +#required for ecryptfs-utils <=75 +Patch3: ecryptfs-utils-74-group.patch + +#allow building with -Werror +#required for ecryptfs-utils <= 75 +Patch4: ecryptfs-utils-75-werror.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: keyutils BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel -BuildRequires: trousers-devel python python-devel nss-devel desktop-file-utils -Conflicts: kernel < 2.6.19 +BuildRequires: trousers-devel nss-devel desktop-file-utils %description eCryptfs is a stacked cryptographic filesystem that ships in Linux @@ -28,6 +38,7 @@ Install ecryptfs-utils if you would like Summary: The eCryptfs userspace development package Group: System Environment/Base Requires: keyutils-libs-devel %{name} = %{version}-%{release} +Requires: pkgconfig %description devel Userspace development files for eCryptfs. @@ -36,6 +47,7 @@ Userspace development files for eCryptfs Summary: Python bindings for the eCryptfs utils Group: System Environment/Base Requires: ecryptfs-utils %{name} = %{version}-%{release} +BuildRequires: python python-devel swig >= 1.3.31 %description python The ecryptfs-utils-python package contains a module that permits @@ -44,23 +56,41 @@ the interface supplied by the ecryptfs-u %prep %setup -q +%patch2 -p1 -b .build +%patch3 -p1 -b .group +%patch4 -p1 -b .werror %build -%configure --disable-rpath --enable-tspi --enable-nss +export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror" +%configure --disable-rpath --enable-tspi --enable-nss --enable-static +make clean #disable rpath 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 + +#remove -Werror flag for swig temporarily (swig is nasty #496613) +sed -i 's|-Werror||' src/libecryptfs-swig/Makefile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +find $RPM_BUILD_ROOT%{_libdir}/ -name '*.a' | xargs rm -f find $RPM_BUILD_ROOT%{_libdir}/ -name '*.la' | xargs rm -f -mv $RPM_BUILD_ROOT/%{_libdir}/libecryptfs.so* $RPM_BUILD_ROOT/%{_lib} rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} -install -D -m 644 doc/ecryptfs-mount-private.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.txt -desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/%{name} %{SOURCE1} +#install files Makefile forgot install +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-setup-private.desktop +touch -r src/desktop/ecryptfs-mount-private.desktop \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +touch -r src/desktop/ecryptfs-setup-private.desktop \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-record-passphrase + +%pre +groupadd -r -f ecryptfs %post -p /sbin/ldconfig @@ -74,10 +104,10 @@ rm -rf $RPM_BUILD_ROOT %doc README COPYING AUTHORS NEWS THANKS %doc doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt %doc doc/ecryptfs-pkcs11-helper-doc.txt -%attr(4755,root,root) /sbin/mount.ecryptfs -%attr(4755,root,root) /sbin/umount.ecryptfs -%attr(4755,root,root) /sbin/mount.ecryptfs_private -%attr(4755,root,root) /sbin/umount.ecryptfs_private +/sbin/mount.ecryptfs +/sbin/umount.ecryptfs +%attr(4755,root,ecryptfs) /sbin/mount.ecryptfs_private +/sbin/umount.ecryptfs_private %{_bindir}/ecryptfs-manager %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring %{_bindir}/ecryptfs-rewrap-passphrase @@ -92,13 +122,15 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ecryptfs-umount-private %{_bindir}/ecryptfs-stat %{_bindir}/ecryptfsd -/%{_lib}/libecryptfs.so.0.0.0 -/%{_lib}/libecryptfs.so.0 +%{_bindir}/ecryptfs-dot-private %{_libdir}/ecryptfs +%{_libdir}/libecryptfs.so.0 +%{_libdir}/libecryptfs.so.0.0.0 /%{_lib}/security/pam_ecryptfs.so %dir %{_datadir}/%{name} %{_datadir}/%{name}/ecryptfs-mount-private.txt %{_datadir}/%{name}/ecryptfs-mount-private.desktop +%{_datadir}/%{name}/ecryptfs-setup-private.desktop %{_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 @@ -119,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -/%{_lib}/libecryptfs.so +%{_libdir}/libecryptfs.so %{_libdir}/pkgconfig/libecryptfs.pc %{_includedir}/ecryptfs.h @@ -135,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Mon May 04 2009 Michal Hlavinka 75-1 +- updated to 75 +- restrict mount.ecryptfs_private to ecryptfs group members only + * Sat Mar 21 2009 Michal Hlavinka 73-1 - updated to 73 - move libs from /usr/lib to /lib (#486139) Index: sources =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sources 21 Mar 2009 07:30:12 -0000 1.25 +++ sources 5 May 2009 11:16:59 -0000 1.26 @@ -1 +1 @@ -8e651749b9d75ee9a4d4894483022857 ecryptfs-utils_73.orig.tar.gz +2c4e8be38d1ea8cadd9f870f15430f07 ecryptfs-utils_75.orig.tar.gz From mhlavink at fedoraproject.org Tue May 5 11:20:43 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 11:20:43 +0000 (UTC) Subject: rpms/ksh/F-11 ksh-20070328-builtins.patch,1.1,1.2 Message-ID: <20090505112043.59ED270108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ksh/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27969 Modified Files: ksh-20070328-builtins.patch Log Message: trim patch for new sources ksh-20070328-builtins.patch: Index: ksh-20070328-builtins.patch =================================================================== RCS file: /cvs/extras/rpms/ksh/F-11/ksh-20070328-builtins.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ksh-20070328-builtins.patch 23 May 2007 06:52:45 -0000 1.1 +++ ksh-20070328-builtins.patch 5 May 2009 11:20:42 -0000 1.2 @@ -1,6 +1,7 @@ ---- ksh-20070328/src/cmd/ksh93/data/builtins.c.builtoff 2007-05-22 13:14:33.000000000 +0200 -+++ ksh-20070328/src/cmd/ksh93/data/builtins.c 2007-05-22 13:14:51.000000000 +0200 -@@ -128,6 +128,7 @@ +diff -up ksh-20090501/src/cmd/ksh93/data/builtins.c.builtins ksh-20090501/src/cmd/ksh93/data/builtins.c +--- ksh-20090501/src/cmd/ksh93/data/builtins.c.builtins 2009-04-12 09:38:03.000000000 +0200 ++++ ksh-20090501/src/cmd/ksh93/data/builtins.c 2009-05-05 11:20:30.601284246 +0200 +@@ -125,6 +125,7 @@ const struct shtable3 shtab_builtins[] = #ifdef SHOPT_CMDLIB_HDR #include SHOPT_CMDLIB_HDR #else @@ -8,11 +9,11 @@ CMDLIST(basename) CMDLIST(chmod) CMDLIST(dirname) -@@ -141,6 +142,7 @@ +@@ -139,6 +140,7 @@ const struct shtable3 shtab_builtins[] = CMDLIST(wc) CMDLIST(sync) #endif +#endif - "", 0, 0 - }; - + #if SHOPT_REGRESS + "__regress__", NV_BLTIN|BLT_ENV, bltin(__regress__), + #endif From hadess at fedoraproject.org Tue May 5 11:30:40 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 5 May 2009 11:30:40 +0000 (UTC) Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.72,1.73 Message-ID: <20090505113041.25FC770108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29080 Modified Files: nautilus-sendto.spec Log Message: * Tue May 05 2009 Bastien Nocera 1.1.5-2 - Disable the evolution plugin, it will be in Evo itself in 2.27.x See http://bugzilla.gnome.org/show_bug.cgi?id=579099 Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -p -r1.72 -r1.73 --- nautilus-sendto.spec 5 May 2009 10:07:55 -0000 1.72 +++ nautilus-sendto.spec 5 May 2009 11:30:08 -0000 1.73 @@ -1,6 +1,6 @@ Name: nautilus-sendto Version: 1.1.5 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Nautilus context menu for sending files Group: User Interface/Desktops @@ -22,7 +22,6 @@ BuildRequires: perl-XML-Parser intltool BuildRequires: dbus-glib-devel >= 0.70 BuildRequires: gupnp-av-devel BuildRequires: empathy-devel -BuildRequires: evolution-devel BuildRequires: gajim Requires(pre): GConf2 @@ -97,6 +96,11 @@ fi %{_mandir}/man1/nautilus-sendto.1.gz %changelog +* Tue May 05 2009 Bastien Nocera 1.1.5-2 +- Disable the evolution plugin, it will be in Evo itself in 2.27.x + See http://bugzilla.gnome.org/show_bug.cgi?id=579099 + + * Tue May 05 2009 Bastien Nocera 1.1.5-1.1 - Update to 1.1.5 From mmaslano at fedoraproject.org Tue May 5 11:39:34 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Tue, 5 May 2009 11:39:34 +0000 (UTC) Subject: rpms/perl-DBD-SQLite/F-11 .cvsignore, 1.6, 1.7 perl-DBD-SQLite.spec, 1.22, 1.23 sources, 1.6, 1.7 Message-ID: <20090505113934.8DF7670108@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-SQLite/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30142 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: * Tue May 5 2009 Marcela Maslanova 1.23-1 - update to the latest version, change BR Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-11/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 10 Dec 2007 19:44:47 -0000 1.6 +++ .cvsignore 5 May 2009 11:39:03 -0000 1.7 @@ -1 +1 @@ -DBD-SQLite-1.14.tar.gz +DBD-SQLite-1.23.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-11/perl-DBD-SQLite.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- perl-DBD-SQLite.spec 26 Feb 2009 14:09:01 -0000 1.22 +++ perl-DBD-SQLite.spec 5 May 2009 11:39:03 -0000 1.23 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite -Version: 1.14 -Release: 9%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -9,16 +9,15 @@ URL: http://search.cpan.org/d 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 +BuildRequires: perl-DBI >= 1.57 # if sqlite >= 3.1.3 then # perl-DBD-SQLite uses the external library # else # perl-DBD-SQLite is self-contained (uses the sqlite local copy) -BuildRequires: sqlite-devel +#BuildRequires: sqlite-devel BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(File::Spec) +BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -34,7 +33,6 @@ As of version 1.09 it can use the extern %prep %setup -q -n DBD-SQLite-%{version} -%patch0 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -68,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 5 2009 Marcela Maslanova 1.23-1 +- update to the latest version, change BR + * Thu Feb 26 2009 Fedora Release Engineering - 1.14-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 10 Dec 2007 19:44:47 -0000 1.6 +++ sources 5 May 2009 11:39:03 -0000 1.7 @@ -1 +1 @@ -78a89cc8fd46bb2a5d537433dcccc8e6 DBD-SQLite-1.14.tar.gz +3fb6d567a507b4f347d56a6ba38966d0 DBD-SQLite-1.23.tar.gz From mhlavink at fedoraproject.org Tue May 5 11:43:07 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 11:43:07 +0000 (UTC) Subject: rpms/ecryptfs-utils/F-11 ecryptfs-utils-75-werror.patch,1.1,1.2 Message-ID: <20090505114307.3D97B70108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ecryptfs-utils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30633 Modified Files: ecryptfs-utils-75-werror.patch Log Message: adapt werror patch ecryptfs-utils-75-werror.patch: Index: ecryptfs-utils-75-werror.patch =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-werror.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ecryptfs-utils-75-werror.patch 5 May 2009 11:16:59 -0000 1.1 +++ ecryptfs-utils-75-werror.patch 5 May 2009 11:42:36 -0000 1.2 @@ -1,6 +1,6 @@ diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c --- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror 2009-05-01 00:53:13.000000000 +0200 -+++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-04 17:49:49.940220924 +0200 ++++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-05 13:38:57.597408166 +0200 @@ -18,6 +18,7 @@ * 02111-1307, USA. */ @@ -17,9 +17,71 @@ diff -up ecryptfs-utils-75/src/libecrypt #include "../include/ecryptfs.h" #ifndef ENOKEY +diff -up ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c +--- ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror 2009-04-30 23:40:12.000000000 +0200 ++++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c 2009-05-05 13:40:11.506220610 +0200 +@@ -42,31 +42,6 @@ + + #define PRIVATE_DIR "Private" + +-static void error(const char *msg) +-{ +- syslog(LOG_ERR, "errno = [%i]; strerror = [%m]\n", errno); +- switch (errno) { +- case ENOKEY: +- syslog(LOG_ERR, "%s: Requested key not available\n", msg); +- return; +- +- case EKEYEXPIRED: +- syslog(LOG_ERR, "%s: Key has expired\n", msg); +- return; +- +- case EKEYREVOKED: +- syslog(LOG_ERR, "%s: Key has been revoked\n", msg); +- return; +- +- case EKEYREJECTED: +- syslog(LOG_ERR, "%s: Key was rejected by service\n", msg); +- return; +- default: +- syslog(LOG_ERR, "%s: Unknown key error\n", msg); +- return; +- } +-} +- + /* returns: 0 for pam automounting not set, 1 for set, <0 for error */ + static int ecryptfs_pam_automount_set(const char *homedir) + { +@@ -249,8 +224,6 @@ static int private_dir(pam_handle_t *pam + char *autoumount = "auto-umount"; + struct stat s; + pid_t pid; +- struct utmp *u; +- int count = 0; + + if ((pwd = fetch_pwd(pamh)) == NULL) { + /* fetch_pwd() logged a message */ +@@ -297,7 +270,7 @@ static int private_dir(pam_handle_t *pam + if (stat(recorded, &s) != 0 && stat("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", &s) == 0) { + /* User has not recorded their passphrase */ + unlink("/var/lib/update-notifier/user.d/ecryptfs-record-passphrase"); +- symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase"); ++ rc = symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase"); + fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666); + close(fd); + } +@@ -390,7 +363,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand + } + } else { + syslog(LOG_ERR, "Error getting passwd info for user [%s]; " +- "rc = [%ld]\n", username, rc); ++ "rc = [%d]\n", username, rc); + goto out; + } + saved_uid = geteuid(); diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c ---- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror 2009-05-04 17:50:33.587240171 +0200 -+++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c 2009-05-04 17:50:33.615345763 +0200 +--- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror 2009-05-01 01:04:38.000000000 +0200 ++++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c 2009-05-05 13:38:57.603470839 +0200 @@ -42,7 +42,6 @@ int main(int argc, char *argv[]) char *wrapping_passphrase; char salt[ECRYPTFS_SALT_SIZE]; From mhlavink at fedoraproject.org Tue May 5 11:45:07 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 11:45:07 +0000 (UTC) Subject: rpms/ksh/F-10 ksh-20070328-builtins.patch, 1.1, 1.2 ksh.spec, 1.41, 1.42 sources, 1.15, 1.16 Message-ID: <20090505114507.243DF70108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ksh/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30984 Modified Files: ksh-20070328-builtins.patch ksh.spec sources Log Message: updated to 2009-05-01 ksh-20070328-builtins.patch: Index: ksh-20070328-builtins.patch =================================================================== RCS file: /cvs/extras/rpms/ksh/F-10/ksh-20070328-builtins.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ksh-20070328-builtins.patch 23 May 2007 06:52:45 -0000 1.1 +++ ksh-20070328-builtins.patch 5 May 2009 11:44:36 -0000 1.2 @@ -1,6 +1,7 @@ ---- ksh-20070328/src/cmd/ksh93/data/builtins.c.builtoff 2007-05-22 13:14:33.000000000 +0200 -+++ ksh-20070328/src/cmd/ksh93/data/builtins.c 2007-05-22 13:14:51.000000000 +0200 -@@ -128,6 +128,7 @@ +diff -up ksh-20090501/src/cmd/ksh93/data/builtins.c.builtins ksh-20090501/src/cmd/ksh93/data/builtins.c +--- ksh-20090501/src/cmd/ksh93/data/builtins.c.builtins 2009-04-12 09:38:03.000000000 +0200 ++++ ksh-20090501/src/cmd/ksh93/data/builtins.c 2009-05-05 11:20:30.601284246 +0200 +@@ -125,6 +125,7 @@ const struct shtable3 shtab_builtins[] = #ifdef SHOPT_CMDLIB_HDR #include SHOPT_CMDLIB_HDR #else @@ -8,11 +9,11 @@ CMDLIST(basename) CMDLIST(chmod) CMDLIST(dirname) -@@ -141,6 +142,7 @@ +@@ -139,6 +140,7 @@ const struct shtable3 shtab_builtins[] = CMDLIST(wc) CMDLIST(sync) #endif +#endif - "", 0, 0 - }; - + #if SHOPT_REGRESS + "__regress__", NV_BLTIN|BLT_ENV, bltin(__regress__), + #endif Index: ksh.spec =================================================================== RCS file: /cvs/extras/rpms/ksh/F-10/ksh.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- ksh.spec 21 Oct 2008 17:16:49 -0000 1.41 +++ ksh.spec 5 May 2009 11:44:36 -0000 1.42 @@ -1,5 +1,5 @@ #ExclusiveArch: x86_64 -%define releasedate 2008-07-25 +%define releasedate 2009-05-01 #ExcludeArch: ia64 Name: ksh @@ -7,8 +7,8 @@ Summary: The Original ATT Korn Shel URL: http://www.kornshell.com/ Group: System Environment/Shells License: CPL -Version: 20080725 -Release: 4%{?dist} +Version: 20090501 +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 Source2: http://www.research.att.com/~gsf/download/tgz/ast-ksh-locale.%{releasedate}.tgz @@ -112,6 +112,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Michal Hlavinka 20090501-1 +- updated to 2009-05-01 + * Tue Oct 21 2008 Michal Hlavinka 20080202-4 - fix #467025 - Ksh fails to initialise environment when login from graphic console Index: sources =================================================================== RCS file: /cvs/extras/rpms/ksh/F-10/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 28 Jul 2008 06:55:21 -0000 1.15 +++ sources 5 May 2009 11:44:36 -0000 1.16 @@ -1,3 +1,2 @@ -59bd2850ce70bd93db3760578e237449 INIT.2008-07-25.tgz -aa6031753184ce6a5d08a8abc8c0ab92 ast-ksh.2008-07-25.tgz -cd5b1720c1c0584e13cc689e75b4baf2 ast-ksh-locale.2008-07-25.tgz +e3e36a3440ae23969275ec62996285df INIT.2009-05-01.tgz +d8d2b3b5edb6255b0b9eb6ad471e9c25 ast-ksh.2009-05-01.tgz From mhlavink at fedoraproject.org Tue May 5 11:49:05 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 11:49:05 +0000 (UTC) Subject: rpms/ecryptfs-utils/F-11 ecryptfs-utils-74-group.patch,1.1,1.2 Message-ID: <20090505114905.4FA2A70108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ecryptfs-utils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31576 Modified Files: ecryptfs-utils-74-group.patch Log Message: fix check for ecryptfs group ecryptfs-utils-74-group.patch: Index: ecryptfs-utils-74-group.patch =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-74-group.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ecryptfs-utils-74-group.patch 5 May 2009 11:16:58 -0000 1.1 +++ ecryptfs-utils-74-group.patch 5 May 2009 11:49:03 -0000 1.2 @@ -55,7 +55,7 @@ diff -up ecryptfs-utils-74/src/utils/ecr fi +# Check if user is member of ecryptfs group -+if ! groups "$USER" | sed -e 's| |\n|g' | grep -n 'ecryptfs$'; then ++if ! groups "$USER" | sed -e 's| |\n|g' | grep -q '^ecryptfs$'; then + error "User needs to be a member of ecryptfs group" +fi + From ruben at fedoraproject.org Tue May 5 11:53:45 2009 From: ruben at fedoraproject.org (Ruben Kerkhof) Date: Tue, 5 May 2009 11:53:45 +0000 (UTC) Subject: rpms/gearmand/EL-5 gearmand.init, NONE, 1.1 gearmand.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090505115345.301F570108@cvs1.fedora.phx.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/gearmand/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv476/EL-5 Modified Files: .cvsignore sources Added Files: gearmand.init gearmand.spec import.log Log Message: Initial import --- NEW FILE gearmand.init --- #!/bin/bash # # gearmand Startup script for the Gearman server # # chkconfig: - 85 15 # description: Gearman is a distributed job system. # processname: gearmand # config: /etc/sysconfig/gearmand # pidfile: /var/run/gearmand/gearmand.pid # ### BEGIN INIT INFO # Provides: gearmand # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Default-Start: # Default-Stop: # Short-Description: start and stop the Gearman server # Description: Gearman is a distributed job system. ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ -f /etc/sysconfig/gearmand ]; then . /etc/sysconfig/gearmand fi [ -z "${PIDFILE}" ] && pidfile = "/var/run/gearmand/gearmand.pid" [ -z "${LOCKFILE}" ] && lockfile="/var/lock/subsys/gearmand" gearmand=/usr/bin/gearmand prog=gearmand RETVAL=0 start() { echo -n $"Starting $prog: " daemon --pidfile=$pidfile --user=gearmand $gearmand -d $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && (touch $lockfile; pgrep -f $gearmand > $pidfile) return $RETVAL } stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $gearmand RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $gearmand RETVAL=$? ;; restart|reload) stop start ;; condrestart|try-restart) if status -p $pidfile $gearmand >&/dev/null; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|reload|condrestart|status|help}" RETVAL=3 esac exit $RETVAL --- NEW FILE gearmand.spec --- Name: gearmand Version: 0.5 Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons License: BSD URL: http://www.gearman.org Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, e2fsprogs-devel %ifnarch ppc64 # no google perftools on ppc64 BuildRequires: google-perftools-devel %endif Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires: procps %description Gearman provides a generic framework to farm out work to other machines or dispatch function calls to machines that are better suited to do the work. It allows you to do work in parallel, to load balance processing, and to call functions between languages. It can be used in a variety of applications, from high-availability web sites to the transport for database replication. In other words, it is the nervous system for how distributed processing communicates. %package -n libgearman-devel Summary: Development headers for libgearman Requires: pkgconfig, libgearman = %{version}-%{release} Group: Development/Libraries %description -n libgearman-devel Development headers for %{name} %package -n libgearman Summary: Development libraries for gearman Group: Development/Libraries %description -n libgearman Development libraries for %{name} %prep %setup -q %build %ifarch ppc64 # no tcmalloc on ppc64 %configure --disable-static %else %configure --disable-static --enable-tcmalloc %endif 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 %{buildroot} make install DESTDIR=%{buildroot} rm -v %{buildroot}%{_libdir}/libgearman.la install -D %{SOURCE1} %{buildroot}%{_initrddir}/gearmand %clean rm -rf %{buildroot} %pre getent group gearmand >/dev/null || groupadd -r gearmand getent passwd gearmand >/dev/null || \ useradd -r -g gearmand -d / -s /sbin/nologin \ -c "Gearmand job server" gearmand exit 0 %post if [ $1 -eq 1 ]; then /sbin/chkconfig --add gearmand fi %preun if [ $1 -eq 0 ]; then /sbin/service gearmand stop >/dev/null 2>&1 || : /sbin/chkconfig --del gearmand fi %post -n libgearman -p /sbin/ldconfig %postun -n libgearman -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_sbindir}/gearmand %{_bindir}/gearman %{_initrddir}/gearmand %{_mandir}/man1/gearman.1.gz %files -n libgearman-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %dir %{_includedir}/libgearman %{_includedir}/libgearman/*.h %{_libdir}/pkgconfig/gearmand.pc %{_libdir}/libgearman.so %{_mandir}/man3/gearman*.3.gz %files -n libgearman %defattr(-,root,root,-) %doc COPYING %{_libdir}/libgearman.so.* %changelog * Mon Apr 27 2009 Ruben Kerkhof 0.5-1 - Upstream released new version - Cleanups for review (bz #487148) * Wed Feb 25 2009 Ruben Kerkhof 0.3-2 - Add init script * Sat Feb 07 2009 Ruben Kerkhof 0.3-1 - Initial import --- NEW FILE import.log --- gearmand-0_5-1_fc11:EL-5:gearmand-0.5-1.fc11.src.rpm:1241524373 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gearmand/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:38:38 -0000 1.1 +++ .cvsignore 5 May 2009 11:53:14 -0000 1.2 @@ -0,0 +1 @@ +gearmand-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gearmand/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:38:39 -0000 1.1 +++ sources 5 May 2009 11:53:14 -0000 1.2 @@ -0,0 +1 @@ +41946441094bc260c46b1391ae6ef3a4 gearmand-0.5.tar.gz From hadess at fedoraproject.org Tue May 5 11:54:49 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 5 May 2009 11:54:49 +0000 (UTC) Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.73,1.74 Message-ID: <20090505115449.7034970108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv708 Modified Files: nautilus-sendto.spec Log Message: Fix file list Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -r1.73 -r1.74 --- nautilus-sendto.spec 5 May 2009 11:30:08 -0000 1.73 +++ nautilus-sendto.spec 5 May 2009 11:54:19 -0000 1.74 @@ -88,7 +88,6 @@ fi %{_libdir}/nautilus-sendto/plugins/*.so %{_datadir}/nautilus-sendto %{_bindir}/nautilus-sendto -%{_libdir}/evolution/*/plugins/* %ifnarch s390 s390x %{_libdir}/pidgin/nautilus.so %endif @@ -100,7 +99,6 @@ fi - Disable the evolution plugin, it will be in Evo itself in 2.27.x See http://bugzilla.gnome.org/show_bug.cgi?id=579099 - * Tue May 05 2009 Bastien Nocera 1.1.5-1.1 - Update to 1.1.5 From ruben at fedoraproject.org Tue May 5 11:55:39 2009 From: ruben at fedoraproject.org (Ruben Kerkhof) Date: Tue, 5 May 2009 11:55:39 +0000 (UTC) Subject: rpms/gearmand/F-11 gearmand.init, NONE, 1.1 gearmand.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090505115539.C5BC170108@cvs1.fedora.phx.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/gearmand/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1044/F-11 Modified Files: .cvsignore sources Added Files: gearmand.init gearmand.spec import.log Log Message: Initial import --- NEW FILE gearmand.init --- #!/bin/bash # # gearmand Startup script for the Gearman server # # chkconfig: - 85 15 # description: Gearman is a distributed job system. # processname: gearmand # config: /etc/sysconfig/gearmand # pidfile: /var/run/gearmand/gearmand.pid # ### BEGIN INIT INFO # Provides: gearmand # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Default-Start: # Default-Stop: # Short-Description: start and stop the Gearman server # Description: Gearman is a distributed job system. ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ -f /etc/sysconfig/gearmand ]; then . /etc/sysconfig/gearmand fi [ -z "${PIDFILE}" ] && pidfile = "/var/run/gearmand/gearmand.pid" [ -z "${LOCKFILE}" ] && lockfile="/var/lock/subsys/gearmand" gearmand=/usr/bin/gearmand prog=gearmand RETVAL=0 start() { echo -n $"Starting $prog: " daemon --pidfile=$pidfile --user=gearmand $gearmand -d $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && (touch $lockfile; pgrep -f $gearmand > $pidfile) return $RETVAL } stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $gearmand RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $gearmand RETVAL=$? ;; restart|reload) stop start ;; condrestart|try-restart) if status -p $pidfile $gearmand >&/dev/null; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|reload|condrestart|status|help}" RETVAL=3 esac exit $RETVAL --- NEW FILE gearmand.spec --- Name: gearmand Version: 0.5 Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons License: BSD URL: http://www.gearman.org Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, e2fsprogs-devel %ifnarch ppc64 # no google perftools on ppc64 BuildRequires: google-perftools-devel %endif Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires: procps %description Gearman provides a generic framework to farm out work to other machines or dispatch function calls to machines that are better suited to do the work. It allows you to do work in parallel, to load balance processing, and to call functions between languages. It can be used in a variety of applications, from high-availability web sites to the transport for database replication. In other words, it is the nervous system for how distributed processing communicates. %package -n libgearman-devel Summary: Development headers for libgearman Requires: pkgconfig, libgearman = %{version}-%{release} Group: Development/Libraries %description -n libgearman-devel Development headers for %{name} %package -n libgearman Summary: Development libraries for gearman Group: Development/Libraries %description -n libgearman Development libraries for %{name} %prep %setup -q %build %ifarch ppc64 # no tcmalloc on ppc64 %configure --disable-static %else %configure --disable-static --enable-tcmalloc %endif 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 %{buildroot} make install DESTDIR=%{buildroot} rm -v %{buildroot}%{_libdir}/libgearman.la install -D %{SOURCE1} %{buildroot}%{_initrddir}/gearmand %clean rm -rf %{buildroot} %pre getent group gearmand >/dev/null || groupadd -r gearmand getent passwd gearmand >/dev/null || \ useradd -r -g gearmand -d / -s /sbin/nologin \ -c "Gearmand job server" gearmand exit 0 %post if [ $1 -eq 1 ]; then /sbin/chkconfig --add gearmand fi %preun if [ $1 -eq 0 ]; then /sbin/service gearmand stop >/dev/null 2>&1 || : /sbin/chkconfig --del gearmand fi %post -n libgearman -p /sbin/ldconfig %postun -n libgearman -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_sbindir}/gearmand %{_bindir}/gearman %{_initrddir}/gearmand %{_mandir}/man1/gearman.1.gz %files -n libgearman-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %dir %{_includedir}/libgearman %{_includedir}/libgearman/*.h %{_libdir}/pkgconfig/gearmand.pc %{_libdir}/libgearman.so %{_mandir}/man3/gearman*.3.gz %files -n libgearman %defattr(-,root,root,-) %doc COPYING %{_libdir}/libgearman.so.* %changelog * Mon Apr 27 2009 Ruben Kerkhof 0.5-1 - Upstream released new version - Cleanups for review (bz #487148) * Wed Feb 25 2009 Ruben Kerkhof 0.3-2 - Add init script * Sat Feb 07 2009 Ruben Kerkhof 0.3-1 - Initial import --- NEW FILE import.log --- gearmand-0_5-1_fc11:F-11:gearmand-0.5-1.fc11.src.rpm:1241524486 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gearmand/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 20:38:38 -0000 1.1 +++ .cvsignore 5 May 2009 11:55:09 -0000 1.2 @@ -0,0 +1 @@ +gearmand-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gearmand/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 20:38:39 -0000 1.1 +++ sources 5 May 2009 11:55:09 -0000 1.2 @@ -0,0 +1 @@ +41946441094bc260c46b1391ae6ef3a4 gearmand-0.5.tar.gz From mhlavink at fedoraproject.org Tue May 5 11:56:16 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 11:56:16 +0000 (UTC) Subject: rpms/ksh/F-10 .cvsignore, 1.15, 1.16 ksh.spec, 1.42, 1.43 sources, 1.16, 1.17 Message-ID: <20090505115616.E586E70108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ksh/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1163 Modified Files: .cvsignore ksh.spec sources Log Message: replace language catalogue Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ksh/F-10/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- .cvsignore 28 Jul 2008 06:55:21 -0000 1.15 +++ .cvsignore 5 May 2009 11:55:46 -0000 1.16 @@ -1,3 +1,3 @@ -INIT.2008-07-25.tgz -ast-ksh.2008-07-25.tgz -ast-ksh-locale.2008-07-25.tgz +INIT.2009-05-01.tgz +ast-ksh.2009-05-01.tgz +ast-base-locale.2007-11-05.tgz Index: ksh.spec =================================================================== RCS file: /cvs/extras/rpms/ksh/F-10/ksh.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -p -r1.42 -r1.43 --- ksh.spec 5 May 2009 11:44:36 -0000 1.42 +++ ksh.spec 5 May 2009 11:55:46 -0000 1.43 @@ -11,7 +11,7 @@ Version: 20090501 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 -Source2: http://www.research.att.com/~gsf/download/tgz/ast-ksh-locale.%{releasedate}.tgz +Source2: http://www.research.att.com/~gsf/download/tgz/ast-base-locale.2007-11-05.tgz Source3: kshrc.rhs Source4: dotkshrc #Patch0: ksh-20041225-gcc4.patch @@ -114,6 +114,7 @@ fi %changelog * Tue May 05 2009 Michal Hlavinka 20090501-1 - updated to 2009-05-01 +- change language catalogue to ast-base-locale (493570) * Tue Oct 21 2008 Michal Hlavinka 20080202-4 - fix #467025 - Ksh fails to initialise environment when login from graphic console Index: sources =================================================================== RCS file: /cvs/extras/rpms/ksh/F-10/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- sources 5 May 2009 11:44:36 -0000 1.16 +++ sources 5 May 2009 11:55:46 -0000 1.17 @@ -1,2 +1,3 @@ e3e36a3440ae23969275ec62996285df INIT.2009-05-01.tgz d8d2b3b5edb6255b0b9eb6ad471e9c25 ast-ksh.2009-05-01.tgz +5e7cfb236e27cff9cc95ae4ba00b506e ast-base-locale.2007-11-05.tgz From mhlavink at fedoraproject.org Tue May 5 12:00:03 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 12:00:03 +0000 (UTC) Subject: rpms/ecryptfs-utils/F-11 ecryptfs-utils-75-werror.patch,1.2,1.3 Message-ID: <20090505120003.EF3E470108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ecryptfs-utils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4948 Modified Files: ecryptfs-utils-75-werror.patch Log Message: update werror patch ecryptfs-utils-75-werror.patch: Index: ecryptfs-utils-75-werror.patch =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-werror.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- ecryptfs-utils-75-werror.patch 5 May 2009 11:42:36 -0000 1.2 +++ ecryptfs-utils-75-werror.patch 5 May 2009 12:00:02 -0000 1.3 @@ -1,3 +1,17 @@ +diff -up ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c +--- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror 2009-05-05 13:56:57.142283441 +0200 ++++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c 2009-05-05 13:56:45.788095782 +0200 +@@ -100,8 +100,8 @@ static int ecryptfs_process_flags(struct + return rc; + } + +-#define ECRYPTFS_DONT_VALIDATE_HEADER_SIZE 0 +-#define ECRYPTFS_VALIDATE_HEADER_SIZE 1 ++#define ECRYPTFS_DONT_VALIDATE_HEADER_SIZE 0UL ++#define ECRYPTFS_VALIDATE_HEADER_SIZE 1UL + static int + ecryptfs_parse_header_metadata(struct ecryptfs_crypt_stat_user *crypt_stat, + char *buf, int *bytes_read, diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c --- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror 2009-05-01 00:53:13.000000000 +0200 +++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-05 13:38:57.597408166 +0200 From tbzatek at fedoraproject.org Tue May 5 12:18:13 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Tue, 5 May 2009 12:18:13 +0000 (UTC) Subject: rpms/nautilus/devel .cvsignore, 1.95, 1.96 nautilus-gvfs-desktop-key-2.patch, 1.2, 1.3 nautilus.spec, 1.273, 1.274 sources, 1.100, 1.101 background-no-delay.patch, 1.1, NONE nautilus-2.26.2-icon-whitespace.patch, 1.1, NONE Message-ID: <20090505121813.983C470108@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/nautilus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22980 Modified Files: .cvsignore nautilus-gvfs-desktop-key-2.patch nautilus.spec sources Removed Files: background-no-delay.patch nautilus-2.26.2-icon-whitespace.patch Log Message: * Tue May 5 2009 Tomas Bzatek - 2.27.1-1 - Update to 2.27.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.95 retrieving revision 1.96 diff -u -p -r1.95 -r1.96 --- .cvsignore 13 Apr 2009 19:50:18 -0000 1.95 +++ .cvsignore 5 May 2009 12:17:42 -0000 1.96 @@ -1,2 +1 @@ -nautilus-2.26.1.tar.bz2 -nautilus-2.26.2.tar.bz2 +nautilus-2.27.1.tar.bz2 nautilus-gvfs-desktop-key-2.patch: Index: nautilus-gvfs-desktop-key-2.patch =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/nautilus-gvfs-desktop-key-2.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- nautilus-gvfs-desktop-key-2.patch 16 Feb 2009 16:31:34 -0000 1.2 +++ nautilus-gvfs-desktop-key-2.patch 5 May 2009 12:17:42 -0000 1.3 @@ -1,6 +1,6 @@ -diff -up nautilus-2.25.91/nautilus-autorun-software.desktop.in.in.key nautilus-2.25.91/nautilus-autorun-software.desktop.in.in ---- nautilus-2.25.91/nautilus-autorun-software.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/nautilus-autorun-software.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in +--- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 ++++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 @@ -3,6 +3,7 @@ Encoding=UTF-8 _Name=Autorun Prompt TryExec=nautilus-autorun-software @@ -9,9 +9,9 @@ diff -up nautilus-2.25.91/nautilus-autor Icon=application-x-executable NoDisplay=true Terminal=false -diff -up nautilus-2.25.91/nautilus-autorun-software.desktop.in.key nautilus-2.25.91/nautilus-autorun-software.desktop.in ---- nautilus-2.25.91/nautilus-autorun-software.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/nautilus-autorun-software.desktop.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in +--- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in 2009-02-16 17:24:49.000000000 +0100 @@ -3,6 +3,7 @@ Encoding=UTF-8 _Name=Autorun Prompt TryExec=nautilus-autorun-software @@ -20,9 +20,9 @@ diff -up nautilus-2.25.91/nautilus-autor Icon=application-x-executable NoDisplay=true Terminal=false -diff -up nautilus-2.25.91/nautilus-browser.desktop.in.in.key nautilus-2.25.91/nautilus-browser.desktop.in.in ---- nautilus-2.25.91/nautilus-browser.desktop.in.in.key 2008-10-02 14:26:49.000000000 +0200 -+++ nautilus-2.25.91/nautilus-browser.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in.in +--- nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key 2008-10-02 14:26:49.000000000 +0200 ++++ nautilus-2.25.91/data/nautilus-browser.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 @@ -4,6 +4,7 @@ _Name=File Browser _Comment=Browse the file system with the file manager TryExec=nautilus @@ -31,9 +31,9 @@ diff -up nautilus-2.25.91/nautilus-brows Icon=system-file-manager Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/nautilus-browser.desktop.in.key nautilus-2.25.91/nautilus-browser.desktop.in ---- nautilus-2.25.91/nautilus-browser.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/nautilus-browser.desktop.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in +--- nautilus-2.25.91/data/nautilus-browser.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus-browser.desktop.in 2009-02-16 17:24:49.000000000 +0100 @@ -4,6 +4,7 @@ _Name=File Browser _Comment=Browse the file system with the file manager TryExec=nautilus @@ -42,9 +42,9 @@ diff -up nautilus-2.25.91/nautilus-brows Icon=system-file-manager Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/nautilus-computer.desktop.in.in.key nautilus-2.25.91/nautilus-computer.desktop.in.in ---- nautilus-2.25.91/nautilus-computer.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/nautilus-computer.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in.in +--- nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 ++++ nautilus-2.25.91/data/nautilus-computer.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 @@ -4,6 +4,7 @@ _Name=Computer _Comment=Browse all local and remote disks and folders accessible from this computer TryExec=nautilus @@ -53,9 +53,9 @@ diff -up nautilus-2.25.91/nautilus-compu Icon=computer Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/nautilus-computer.desktop.in.key nautilus-2.25.91/nautilus-computer.desktop.in ---- nautilus-2.25.91/nautilus-computer.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/nautilus-computer.desktop.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in +--- nautilus-2.25.91/data/nautilus-computer.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus-computer.desktop.in 2009-02-16 17:24:49.000000000 +0100 @@ -4,6 +4,7 @@ _Name=Computer _Comment=Browse all local and remote disks and folders accessible from this computer TryExec=nautilus @@ -64,9 +64,9 @@ diff -up nautilus-2.25.91/nautilus-compu Icon=computer Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/nautilus.desktop.in.in.key nautilus-2.25.91/nautilus.desktop.in.in ---- nautilus-2.25.91/nautilus.desktop.in.in.key 2009-02-02 13:28:32.000000000 +0100 -+++ nautilus-2.25.91/nautilus.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus.desktop.in.in.key nautilus-2.25.91/data/nautilus.desktop.in.in +--- nautilus-2.25.91/data/nautilus.desktop.in.in.key 2009-02-02 13:28:32.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 @@ -2,6 +2,7 @@ Encoding=UTF-8 _Name=File Manager @@ -75,9 +75,9 @@ diff -up nautilus-2.25.91/nautilus.deskt Icon=system-file-manager Terminal=false Type=Application -diff -up nautilus-2.25.91/nautilus.desktop.in.key nautilus-2.25.91/nautilus.desktop.in ---- nautilus-2.25.91/nautilus.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/nautilus.desktop.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus.desktop.in.key nautilus-2.25.91/data/nautilus.desktop.in +--- nautilus-2.25.91/data/nautilus.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus.desktop.in 2009-02-16 17:24:49.000000000 +0100 @@ -2,6 +2,7 @@ Encoding=UTF-8 _Name=File Manager @@ -86,9 +86,9 @@ diff -up nautilus-2.25.91/nautilus.deskt Icon=system-file-manager Terminal=false Type=Application -diff -up nautilus-2.25.91/nautilus.desktop.key nautilus-2.25.91/nautilus.desktop ---- nautilus-2.25.91/nautilus.desktop.key 2009-02-16 14:56:33.000000000 +0100 -+++ nautilus-2.25.91/nautilus.desktop 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus.desktop.key nautilus-2.25.91/data/nautilus.desktop +--- nautilus-2.25.91/data/nautilus.desktop.key 2009-02-16 14:56:33.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus.desktop 2009-02-16 17:24:49.000000000 +0100 @@ -97,6 +97,7 @@ Name[zh_HK]=?????????????????? Name[zh_TW]=?????????????????? Name[zu]=Mphathi Hele @@ -97,9 +97,9 @@ diff -up nautilus-2.25.91/nautilus.deskt Icon=system-file-manager Terminal=false Type=Application -diff -up nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in.key nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in ---- nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in +--- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 ++++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 @@ -3,6 +3,7 @@ Encoding=UTF-8 _Name=File Management _Comment=Change the behaviour and appearance of file manager windows @@ -108,9 +108,9 @@ diff -up nautilus-2.25.91/nautilus-file- Icon=system-file-manager Terminal=false Type=Application -diff -up nautilus-2.25.91/nautilus-file-management-properties.desktop.in.key nautilus-2.25.91/nautilus-file-management-properties.desktop.in ---- nautilus-2.25.91/nautilus-file-management-properties.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/nautilus-file-management-properties.desktop.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in +--- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in 2009-02-16 17:24:49.000000000 +0100 @@ -3,6 +3,7 @@ Encoding=UTF-8 _Name=File Management _Comment=Change the behaviour and appearance of file manager windows @@ -119,9 +119,9 @@ diff -up nautilus-2.25.91/nautilus-file- Icon=system-file-manager Terminal=false Type=Application -diff -up nautilus-2.25.91/nautilus-folder-handler.desktop.in.in.key nautilus-2.25.91/nautilus-folder-handler.desktop.in.in ---- nautilus-2.25.91/nautilus-folder-handler.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/nautilus-folder-handler.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in +--- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 ++++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 @@ -3,6 +3,7 @@ Encoding=UTF-8 _Name=Open Folder TryExec=nautilus @@ -130,9 +130,9 @@ diff -up nautilus-2.25.91/nautilus-folde NoDisplay=true Terminal=false Icon=folder-open -diff -up nautilus-2.25.91/nautilus-folder-handler.desktop.in.key nautilus-2.25.91/nautilus-folder-handler.desktop.in ---- nautilus-2.25.91/nautilus-folder-handler.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/nautilus-folder-handler.desktop.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in +--- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in 2009-02-16 17:24:49.000000000 +0100 @@ -3,6 +3,7 @@ Encoding=UTF-8 _Name=Open Folder TryExec=nautilus @@ -141,9 +141,9 @@ diff -up nautilus-2.25.91/nautilus-folde NoDisplay=true Terminal=false Icon=folder-open -diff -up nautilus-2.25.91/nautilus-home.desktop.in.in.key nautilus-2.25.91/nautilus-home.desktop.in.in ---- nautilus-2.25.91/nautilus-home.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/nautilus-home.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.in.key nautilus-2.25.91/data/nautilus-home.desktop.in.in +--- nautilus-2.25.91/data/nautilus-home.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 ++++ nautilus-2.25.91/data/nautilus-home.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 @@ -4,6 +4,7 @@ _Name=Home Folder _Comment=Open your personal folder TryExec=nautilus @@ -152,9 +152,9 @@ diff -up nautilus-2.25.91/nautilus-home. Icon=user-home Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/nautilus-home.desktop.in.key nautilus-2.25.91/nautilus-home.desktop.in ---- nautilus-2.25.91/nautilus-home.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/nautilus-home.desktop.in 2009-02-16 17:24:49.000000000 +0100 +diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.key nautilus-2.25.91/data/nautilus-home.desktop.in +--- nautilus-2.25.91/data/nautilus-home.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 ++++ nautilus-2.25.91/data/nautilus-home.desktop.in 2009-02-16 17:24:49.000000000 +0100 @@ -4,6 +4,7 @@ _Name=Home Folder _Comment=Open your personal folder TryExec=nautilus Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.273 retrieving revision 1.274 diff -u -p -r1.273 -r1.274 --- nautilus.spec 27 Apr 2009 18:12:34 -0000 1.273 +++ nautilus.spec 5 May 2009 12:17:42 -0000 1.274 @@ -15,8 +15,8 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.26.2 -Release: 3%{?dist} +Version: 2.27.1 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2 @@ -49,6 +49,7 @@ BuildRequires: fontconfig BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: libtool >= 1.4.2-10 BuildRequires: autoconf +BuildRequires: automake BuildRequires: startup-notification-devel >= %{startup_notification_version} BuildRequires: libexif-devel >= %{libexif_version} BuildRequires: exempi-devel >= %{exempi_version} @@ -72,7 +73,6 @@ Obsoletes: gnome-volume-manager < 2 # Some changes to default config Patch1: nautilus-2.5.7-rhconfig.patch -Patch3: background-no-delay.patch Patch5: nautilus-2.23.5-selinux.patch @@ -87,8 +87,6 @@ Patch10: nautilus-gvfs-desktop-ke # http://bugzilla.gnome.org/show_bug.cgi?id=519743 Patch17: nautilus-filetype-symlink-fix.patch -# From svn (rev 15184) -Patch18: nautilus-2.26.2-icon-whitespace.patch %description Nautilus is the file manager and graphical shell for the GNOME desktop @@ -120,19 +118,21 @@ for developing nautilus extensions. %setup -q -n %{name}-%{version} %patch1 -p1 -b .rhconfig -%patch3 -p1 -b .no-delay %patch5 -p1 -b .selinux %patch6 -p1 -b .dynamic-search %patch7 -p1 -b .rtl-fix # %patch8 -p1 -b .hide-white-screen %patch10 -p1 -b .gvfs-desktop-key %patch17 -p0 -b .symlink -%patch18 -p0 -b .whitespace %build gtkdocize -autoreconf -i -f +libtoolize +aclocal -I m4 +autoconf +autoheader +automake # -fno-tree-vrp is needed to avoid gcc-4.4.0 optimization failure # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39233 @@ -263,6 +263,9 @@ fi %changelog +* Tue May 5 2009 Tomas Bzatek - 2.27.1-1 +- Update to 2.27.1 + * Mon Apr 27 2009 Matthias Clasen - 2.26.2-3 - Don't drop schemas translations from po files anymore Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/sources,v retrieving revision 1.100 retrieving revision 1.101 diff -u -p -r1.100 -r1.101 --- sources 16 Apr 2009 08:48:21 -0000 1.100 +++ sources 5 May 2009 12:17:43 -0000 1.101 @@ -1 +1 @@ -6b9292ed9dde8b5f86a3b6df1422d5f8 nautilus-2.26.2.tar.bz2 +77956e50bdb6657a3bb935a595f0c038 nautilus-2.27.1.tar.bz2 --- background-no-delay.patch DELETED --- --- nautilus-2.26.2-icon-whitespace.patch DELETED --- From mhlavink at fedoraproject.org Tue May 5 12:19:28 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 12:19:28 +0000 (UTC) Subject: rpms/ecryptfs-utils/F-11 ecryptfs-utils-75-werror.patch,1.3,1.4 Message-ID: <20090505121928.C001870108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ecryptfs-utils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23103 Modified Files: ecryptfs-utils-75-werror.patch Log Message: update werror patch ecryptfs-utils-75-werror.patch: Index: ecryptfs-utils-75-werror.patch =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-werror.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- ecryptfs-utils-75-werror.patch 5 May 2009 12:00:02 -0000 1.3 +++ ecryptfs-utils-75-werror.patch 5 May 2009 12:18:58 -0000 1.4 @@ -1,20 +1,18 @@ diff -up ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c ---- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror 2009-05-05 13:56:57.142283441 +0200 -+++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c 2009-05-05 13:56:45.788095782 +0200 -@@ -100,8 +100,8 @@ static int ecryptfs_process_flags(struct - return rc; - } - --#define ECRYPTFS_DONT_VALIDATE_HEADER_SIZE 0 --#define ECRYPTFS_VALIDATE_HEADER_SIZE 1 -+#define ECRYPTFS_DONT_VALIDATE_HEADER_SIZE 0UL -+#define ECRYPTFS_VALIDATE_HEADER_SIZE 1UL - static int - ecryptfs_parse_header_metadata(struct ecryptfs_crypt_stat_user *crypt_stat, - char *buf, int *bytes_read, +--- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror 2009-03-05 22:17:36.000000000 +0100 ++++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c 2009-05-05 14:16:47.965159244 +0200 +@@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_ + if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES + + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES + + 4)) { +- printf("%s: Invalid metadata size; must have at least [%lu] " ++ printf("%s: Invalid metadata size; must have at least [%zu] " + "bytes; there are only [%zu] bytes\n", __FUNCTION__, + (ECRYPTFS_FILE_SIZE_BYTES + + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c --- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror 2009-05-01 00:53:13.000000000 +0200 -+++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-05 13:38:57.597408166 +0200 ++++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-05 13:57:18.142095484 +0200 @@ -18,6 +18,7 @@ * 02111-1307, USA. */ @@ -33,7 +31,7 @@ diff -up ecryptfs-utils-75/src/libecrypt #ifndef ENOKEY diff -up ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c --- ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror 2009-04-30 23:40:12.000000000 +0200 -+++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c 2009-05-05 13:40:11.506220610 +0200 ++++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c 2009-05-05 13:57:18.142095484 +0200 @@ -42,31 +42,6 @@ #define PRIVATE_DIR "Private" @@ -95,7 +93,7 @@ diff -up ecryptfs-utils-75/src/pam_ecryp saved_uid = geteuid(); diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c --- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror 2009-05-01 01:04:38.000000000 +0200 -+++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c 2009-05-05 13:38:57.603470839 +0200 ++++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c 2009-05-05 13:57:18.142095484 +0200 @@ -42,7 +42,6 @@ int main(int argc, char *argv[]) char *wrapping_passphrase; char salt[ECRYPTFS_SALT_SIZE]; From tmraz at fedoraproject.org Tue May 5 12:32:58 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Tue, 5 May 2009 12:32:58 +0000 (UTC) Subject: rpms/ipsec-tools/F-11 ipsec-tools-0.7.2-natt-linux.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 ipsec-tools.spec, 1.63, 1.64 sources, 1.13, 1.14 ipsec-tools-0.7.1-natt-linux.patch, 1.1, NONE Message-ID: <20090505123258.9534770108@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/ipsec-tools/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25378 Modified Files: .cvsignore ipsec-tools.spec sources Added Files: ipsec-tools-0.7.2-natt-linux.patch Removed Files: ipsec-tools-0.7.1-natt-linux.patch Log Message: * Tue May 5 2009 Tomas Mraz - 0.7.2-1 - Update to a new upstream version ipsec-tools-0.7.2-natt-linux.patch: --- NEW FILE ipsec-tools-0.7.2-natt-linux.patch --- diff -up ipsec-tools-0.7.2/src/racoon/isakmp_inf.c.natt-linux ipsec-tools-0.7.2/src/racoon/isakmp_inf.c --- ipsec-tools-0.7.2/src/racoon/isakmp_inf.c.natt-linux 2009-04-20 15:35:36.000000000 +0200 +++ ipsec-tools-0.7.2/src/racoon/isakmp_inf.c 2009-04-23 14:46:55.000000000 +0200 @@ -1144,7 +1144,6 @@ purge_ipsec_spi(dst0, proto, spi, n) caddr_t mhp[SADB_EXT_MAX + 1]; #ifdef ENABLE_NATT struct sadb_x_nat_t_type *natt_type; - struct sadb_x_nat_t_port *natt_port; #endif plog(LLV_DEBUG2, LOCATION, NULL, @@ -1200,17 +1199,8 @@ purge_ipsec_spi(dst0, proto, spi, n) } #ifdef ENABLE_NATT natt_type = (void *)mhp[SADB_X_EXT_NAT_T_TYPE]; - if (natt_type && natt_type->sadb_x_nat_t_type_type) { - /* NAT-T is enabled for this SADB entry; copy - * the ports from NAT-T extensions */ - natt_port = (void *)mhp[SADB_X_EXT_NAT_T_SPORT]; - if (extract_port(src) == 0 && natt_port != NULL) - set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port)); - - natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT]; - if (extract_port(dst) == 0 && natt_port != NULL) - set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port)); - }else{ + if (natt_type == NULL || + ! natt_type->sadb_x_nat_t_type_type) { /* Force default UDP ports, so CMPSADDR will match SAs with NO encapsulation */ set_port(src, PORT_ISAKMP); diff -up ipsec-tools-0.7.2/src/racoon/pfkey.c.natt-linux ipsec-tools-0.7.2/src/racoon/pfkey.c --- ipsec-tools-0.7.2/src/racoon/pfkey.c.natt-linux 2009-04-23 14:40:08.000000000 +0200 +++ ipsec-tools-0.7.2/src/racoon/pfkey.c 2009-04-23 14:40:08.000000000 +0200 @@ -290,6 +290,13 @@ pfkey_dump_sadb(satype) struct sadb_msg *msg = NULL; size_t bl, ml; int len; +#if defined(__linux__) && defined(ENABLE_NATT) + caddr_t mhp[SADB_EXT_MAX + 1]; + struct sadb_sa *sa; + struct sockaddr *src, *dst; + struct sadb_x_nat_t_type *natt_type; + struct sadb_x_nat_t_port *natt_port; +#endif if ((s = privsep_pfkey_open()) < 0) { plog(LLV_ERROR, LOCATION, NULL, @@ -325,6 +332,45 @@ pfkey_dump_sadb(satype) continue; } +#if defined(__linux__) && defined(ENABLE_NATT) + /* + * NetBSD returns the NAT-T ports in the src and dst sockaddrs + * in addition to the SADB_X_EXT_NAT_T_*PORT structs. + * + * Linux only returns them in the SADB_X_EXT_NAT_T_*PORT + * structs. The racoon codebase is making the assumption that + * the NAT-T ports are reflected by the ports in the src and + * dst sockaddrs. We stick that information into those structs + * here to meet the assumptions elsewhere. + */ + if (pfkey_align(msg, mhp) || pfkey_check(mhp)) { + plog(LLV_ERROR, LOCATION, NULL, + "pfkey_check (%s)\n", ipsec_strerror()); + goto no_fixup; + } + + sa = (struct sadb_sa *)(mhp[SADB_EXT_SA]); + if (!sa || !mhp[SADB_EXT_ADDRESS_SRC] || !mhp[SADB_EXT_ADDRESS_DST]) { + goto no_fixup; + } + + src = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_SRC]); + dst = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_DST]); + + natt_type = (struct sadb_x_nat_t_type *)(mhp[SADB_X_EXT_NAT_T_TYPE]); + + if (natt_type && natt_type->sadb_x_nat_t_type_type) { + /* set the src and dst ports */ + natt_port = (struct sadb_x_nat_t_port *)(mhp[SADB_X_EXT_NAT_T_SPORT]); + if (natt_port != NULL && extract_port(src) == 0) + set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port)); + + natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT]; + if (natt_port != NULL && extract_port(dst) == 0) + set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port)); + } +no_fixup: +#endif /* __linux__ && ENABLE_NATT */ ml = msg->sadb_msg_len << 3; bl = buf ? buf->l : 0; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-11/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- .cvsignore 29 Jul 2008 12:31:24 -0000 1.13 +++ .cvsignore 5 May 2009 12:32:28 -0000 1.14 @@ -1 +1 @@ -ipsec-tools-0.7.1.tar.bz2 +ipsec-tools-0.7.2.tar.bz2 Index: ipsec-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-11/ipsec-tools.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- ipsec-tools.spec 25 Feb 2009 07:46:48 -0000 1.63 +++ ipsec-tools.spec 5 May 2009 12:32:28 -0000 1.64 @@ -1,6 +1,6 @@ Name: ipsec-tools -Version: 0.7.1 -Release: 8%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: Tools for configuring and using IPSEC License: BSD Group: System Environment/Base @@ -16,9 +16,8 @@ Patch4: ipsec-tools-0.7.1-loopback.patch Patch5: ipsec-tools-0.7-iface.patch Patch6: ipsec-tools-0.7-dupsplit.patch Patch9: ipsec-tools-0.7-splitcidr.patch -Patch10: ipsec-tools-0.7.1-natt-linux.patch +Patch10: ipsec-tools-0.7.2-natt-linux.patch Patch11: ipsec-tools-0.7.1-pie.patch -Patch12: ipsec-tools-0.7.1-leaks.patch Patch13: ipsec-tools-0.7.1-dpd-fixes.patch BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool @@ -44,7 +43,6 @@ package builds: %patch9 -p1 -b .splitcidr %patch10 -p1 -b .natt-linux %patch11 -p1 -b .pie -%patch12 -p1 -b .leaks %patch13 -p1 -b .dpd-fixes ./bootstrap @@ -124,6 +122,9 @@ fi %config(noreplace) /etc/racoon/racoon.conf %changelog +* Tue May 5 2009 Tomas Mraz - 0.7.2-1 +- Update to a new upstream version + * Wed Feb 25 2009 Fedora Release Engineering - 0.7.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-11/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 29 Jul 2008 12:31:24 -0000 1.13 +++ sources 5 May 2009 12:32:28 -0000 1.14 @@ -1 +1 @@ -30b196a2829556182c39aed9f83c0bbf ipsec-tools-0.7.1.tar.bz2 +72861f005746ee27984b2ee715ecc629 ipsec-tools-0.7.2.tar.bz2 --- ipsec-tools-0.7.1-natt-linux.patch DELETED --- From tmraz at fedoraproject.org Tue May 5 12:39:02 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Tue, 5 May 2009 12:39:02 +0000 (UTC) Subject: rpms/ipsec-tools/F-10 ipsec-tools-0.7.2-natt-linux.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 ipsec-tools.spec, 1.61, 1.62 sources, 1.13, 1.14 ipsec-tools-0.7.1-natt-linux.patch, 1.1, NONE Message-ID: <20090505123902.7841670108@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/ipsec-tools/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26080 Modified Files: .cvsignore ipsec-tools.spec sources Added Files: ipsec-tools-0.7.2-natt-linux.patch Removed Files: ipsec-tools-0.7.1-natt-linux.patch Log Message: * Tue May 5 2009 Tomas Mraz - 0.7.2-1 - Update to a new upstream version ipsec-tools-0.7.2-natt-linux.patch: --- NEW FILE ipsec-tools-0.7.2-natt-linux.patch --- diff -up ipsec-tools-0.7.2/src/racoon/isakmp_inf.c.natt-linux ipsec-tools-0.7.2/src/racoon/isakmp_inf.c --- ipsec-tools-0.7.2/src/racoon/isakmp_inf.c.natt-linux 2009-04-20 15:35:36.000000000 +0200 +++ ipsec-tools-0.7.2/src/racoon/isakmp_inf.c 2009-04-23 14:46:55.000000000 +0200 @@ -1144,7 +1144,6 @@ purge_ipsec_spi(dst0, proto, spi, n) caddr_t mhp[SADB_EXT_MAX + 1]; #ifdef ENABLE_NATT struct sadb_x_nat_t_type *natt_type; - struct sadb_x_nat_t_port *natt_port; #endif plog(LLV_DEBUG2, LOCATION, NULL, @@ -1200,17 +1199,8 @@ purge_ipsec_spi(dst0, proto, spi, n) } #ifdef ENABLE_NATT natt_type = (void *)mhp[SADB_X_EXT_NAT_T_TYPE]; - if (natt_type && natt_type->sadb_x_nat_t_type_type) { - /* NAT-T is enabled for this SADB entry; copy - * the ports from NAT-T extensions */ - natt_port = (void *)mhp[SADB_X_EXT_NAT_T_SPORT]; - if (extract_port(src) == 0 && natt_port != NULL) - set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port)); - - natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT]; - if (extract_port(dst) == 0 && natt_port != NULL) - set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port)); - }else{ + if (natt_type == NULL || + ! natt_type->sadb_x_nat_t_type_type) { /* Force default UDP ports, so CMPSADDR will match SAs with NO encapsulation */ set_port(src, PORT_ISAKMP); diff -up ipsec-tools-0.7.2/src/racoon/pfkey.c.natt-linux ipsec-tools-0.7.2/src/racoon/pfkey.c --- ipsec-tools-0.7.2/src/racoon/pfkey.c.natt-linux 2009-04-23 14:40:08.000000000 +0200 +++ ipsec-tools-0.7.2/src/racoon/pfkey.c 2009-04-23 14:40:08.000000000 +0200 @@ -290,6 +290,13 @@ pfkey_dump_sadb(satype) struct sadb_msg *msg = NULL; size_t bl, ml; int len; +#if defined(__linux__) && defined(ENABLE_NATT) + caddr_t mhp[SADB_EXT_MAX + 1]; + struct sadb_sa *sa; + struct sockaddr *src, *dst; + struct sadb_x_nat_t_type *natt_type; + struct sadb_x_nat_t_port *natt_port; +#endif if ((s = privsep_pfkey_open()) < 0) { plog(LLV_ERROR, LOCATION, NULL, @@ -325,6 +332,45 @@ pfkey_dump_sadb(satype) continue; } +#if defined(__linux__) && defined(ENABLE_NATT) + /* + * NetBSD returns the NAT-T ports in the src and dst sockaddrs + * in addition to the SADB_X_EXT_NAT_T_*PORT structs. + * + * Linux only returns them in the SADB_X_EXT_NAT_T_*PORT + * structs. The racoon codebase is making the assumption that + * the NAT-T ports are reflected by the ports in the src and + * dst sockaddrs. We stick that information into those structs + * here to meet the assumptions elsewhere. + */ + if (pfkey_align(msg, mhp) || pfkey_check(mhp)) { + plog(LLV_ERROR, LOCATION, NULL, + "pfkey_check (%s)\n", ipsec_strerror()); + goto no_fixup; + } + + sa = (struct sadb_sa *)(mhp[SADB_EXT_SA]); + if (!sa || !mhp[SADB_EXT_ADDRESS_SRC] || !mhp[SADB_EXT_ADDRESS_DST]) { + goto no_fixup; + } + + src = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_SRC]); + dst = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_DST]); + + natt_type = (struct sadb_x_nat_t_type *)(mhp[SADB_X_EXT_NAT_T_TYPE]); + + if (natt_type && natt_type->sadb_x_nat_t_type_type) { + /* set the src and dst ports */ + natt_port = (struct sadb_x_nat_t_port *)(mhp[SADB_X_EXT_NAT_T_SPORT]); + if (natt_port != NULL && extract_port(src) == 0) + set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port)); + + natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT]; + if (natt_port != NULL && extract_port(dst) == 0) + set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port)); + } +no_fixup: +#endif /* __linux__ && ENABLE_NATT */ ml = msg->sadb_msg_len << 3; bl = buf ? buf->l : 0; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-10/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- .cvsignore 29 Jul 2008 12:31:24 -0000 1.13 +++ .cvsignore 5 May 2009 12:38:31 -0000 1.14 @@ -1 +1 @@ -ipsec-tools-0.7.1.tar.bz2 +ipsec-tools-0.7.2.tar.bz2 Index: ipsec-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-10/ipsec-tools.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- ipsec-tools.spec 10 Nov 2008 12:23:46 -0000 1.61 +++ ipsec-tools.spec 5 May 2009 12:38:32 -0000 1.62 @@ -1,6 +1,6 @@ Name: ipsec-tools -Version: 0.7.1 -Release: 6%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: Tools for configuring and using IPSEC License: BSD Group: System Environment/Base @@ -16,9 +16,8 @@ Patch4: ipsec-tools-0.7.1-loopback.patch Patch5: ipsec-tools-0.7-iface.patch Patch6: ipsec-tools-0.7-dupsplit.patch Patch9: ipsec-tools-0.7-splitcidr.patch -Patch10: ipsec-tools-0.7.1-natt-linux.patch +Patch10: ipsec-tools-0.7.2-natt-linux.patch Patch11: ipsec-tools-0.7.1-pie.patch -Patch12: ipsec-tools-0.7.1-leaks.patch Patch13: ipsec-tools-0.7.1-dpd-fixes.patch BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool @@ -44,7 +43,6 @@ package builds: %patch9 -p1 -b .splitcidr %patch10 -p1 -b .natt-linux %patch11 -p1 -b .pie -%patch12 -p1 -b .leaks %patch13 -p1 -b .dpd-fixes ./bootstrap @@ -124,6 +122,15 @@ fi %config(noreplace) /etc/racoon/racoon.conf %changelog +* Tue May 5 2009 Tomas Mraz - 0.7.2-1 +- Update to a new upstream version + +* Wed Feb 25 2009 Fedora Release Engineering - 0.7.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 15 2009 Tomas Mraz - 0.7.1-7 +- rebuild with new openssl + * Mon Nov 10 2008 Tomas Mraz - 0.7.1-6 - fix patch porting error in the dpd-fixes patch (#470575) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-10/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 29 Jul 2008 12:31:24 -0000 1.13 +++ sources 5 May 2009 12:38:32 -0000 1.14 @@ -1 +1 @@ -30b196a2829556182c39aed9f83c0bbf ipsec-tools-0.7.1.tar.bz2 +72861f005746ee27984b2ee715ecc629 ipsec-tools-0.7.2.tar.bz2 --- ipsec-tools-0.7.1-natt-linux.patch DELETED --- From berrange at fedoraproject.org Tue May 5 13:01:45 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 5 May 2009 13:01:45 +0000 (UTC) Subject: rpms/libvirt/F-11 libvirt-0.6.2-shared-readonly-label.patch, NONE, 1.1 libvirt.spec, 1.125, 1.126 Message-ID: <20090505130145.A462370108@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29280 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-shared-readonly-label.patch Log Message: Fix labelling of shared/readonly disks (rhbz #493692) libvirt-0.6.2-shared-readonly-label.patch: --- NEW FILE libvirt-0.6.2-shared-readonly-label.patch --- diff -rup libvirt-0.6.2/src/security_selinux.c libvirt-0.6.2.new/src/security_selinux.c --- libvirt-0.6.2/src/security_selinux.c 2009-04-03 15:36:56.000000000 +0100 +++ libvirt-0.6.2.new/src/security_selinux.c 2009-05-05 13:39:42.000000000 +0100 @@ -24,11 +24,12 @@ #include "virterror_internal.h" #include "util.h" #include "memory.h" - +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_SECURITY static char default_domain_context[1024]; +static char default_content_context[1024]; static char default_image_context[1024]; #define SECURITY_SELINUX_VOID_DOI "0" #define SECURITY_SELINUX_NAME "selinux" @@ -148,8 +149,13 @@ SELinuxInitialize(virConnectPtr conn) close(fd); ptr = strchrnul(default_image_context, '\n'); - *ptr = '\0'; - + if (*ptr == '\n') { + *ptr = '\0'; + strcpy(default_content_context, ptr+1); + ptr = strchrnul(default_content_context, '\n'); + if (*ptr == '\n') + *ptr = '\0'; + } return 0; } @@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, co { char ebuf[1024]; + VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon); + if(setfilecon(path, tcon) < 0) { virSecurityReportError(conn, VIR_ERR_ERROR, _("%s: unable to set security context " @@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConn char *newpath = NULL; const char *path = disk->src; + /* Don't restore labels on readoly/shared disks, because + * other VMs may still be accessing these */ if (disk->readonly || disk->shared) return 0; @@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectP { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (secdef->imagelabel) + if (disk->shared) { + return SELinuxSetFilecon(conn, disk->src, default_image_context); + } else if (disk->readonly) { + return SELinuxSetFilecon(conn, disk->src, default_content_context); + } else if (secdef->imagelabel) { return SELinuxSetFilecon(conn, disk->src, secdef->imagelabel); + } return 0; } @@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr co if (secdef->imagelabel) { for (i = 0 ; i < vm->def->ndisks ; i++) { - if (vm->def->disks[i]->readonly || - vm->def->disks[i]->shared) continue; - if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0) return -1; } Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -p -r1.125 -r1.126 --- libvirt.spec 28 Apr 2009 10:57:59 -0000 1.125 +++ libvirt.spec 5 May 2009 13:01:15 -0000 1.126 @@ -66,13 +66,15 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream Patch0: libvirt-0.6.2-qemu-drive-format.patch +# Fix shared/readonly disk labelling +Patch1: libvirt-0.6.2-shared-readonly-label.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -228,6 +230,7 @@ of recent versions of Linux (and other O %setup -q %patch0 -p1 +%patch1 -p1 %patch200 -p0 @@ -551,6 +554,9 @@ fi %endif %changelog +* Tue May 5 2009 Daniel P. Berrange - 0.6.2-4.fc11 +- Fix labelling of shared/readonly disks (rhbz #493692) + * Tue Apr 28 2009 Daniel Veillard - 0.6.2-3.fc11 - Fix missing directories in spec (#496945 and gtk-doc) From caolanm at fedoraproject.org Tue May 5 13:05:57 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 5 May 2009 13:05:57 +0000 (UTC) Subject: rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch, NONE, 1.1 openoffice.org.spec, 1.1905, 1.1906 Message-ID: <20090505130557.5B95270108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29803/F-11 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch Log Message: Resolves(partially): rhbz#495901 No default font-width for wmf export openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch: --- NEW FILE openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch --- diff -ru svtools.orig/source/filter.vcl/wmf/wmfwr.cxx svtools/source/filter.vcl/wmf/wmfwr.cxx --- svtools.orig/source/filter.vcl/wmf/wmfwr.cxx 2009-05-05 12:57:34.000000000 +0100 +++ svtools/source/filter.vcl/wmf/wmfwr.cxx 2009-05-05 13:55:47.000000000 +0100 @@ -439,14 +439,7 @@ WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT); - if ( !rFont.GetSize().Width() ) - { - VirtualDevice aDev; - FontMetric aMetric( aDev.GetFontMetric( rFont ) ); - WriteHeightWidth(Size(aMetric.GetWidth(),-rFont.GetSize().Height())); - } - else - WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height())); + WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height())); *pWMF << (short)rFont.GetOrientation() << (short)rFont.GetOrientation(); Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v retrieving revision 1.1905 retrieving revision 1.1906 diff -u -p -r1.1905 -r1.1906 --- openoffice.org.spec 30 Apr 2009 14:33:31 -0000 1.1905 +++ openoffice.org.spec 5 May 2009 13:05:25 -0000 1.1906 @@ -139,6 +139,7 @@ Patch63: openoffice.org-3.1.0.ooo101355. Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch +Patch67: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1636,6 +1637,7 @@ cat %{PATCH11} >> svtools/source/dialogs %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch %patch66 -p0 -b .ooo100469.sal.ia64_arm.patch +%patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4131,8 +4133,9 @@ fi unopkg list --shared > /dev/null 2>&1 || : %changelog -* Thu Apr 30 2009 Caol??n McNamara - 1:3.1.0-11.3 +* Tue May 05 2009 Caol??n McNamara - 1:3.1.0-11.3 - add in the ia64 and arm fixes for the secondary arch people +- Resolves(partially): rhbz#495901 No default font-width for wmf export * Tue Apr 27 2009 Caol??n McNamara - 1:3.1.0-11.2 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch From caolanm at fedoraproject.org Tue May 5 13:05:57 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 5 May 2009 13:05:57 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch, NONE, 1.1 openoffice.org.spec, 1.1906, 1.1907 Message-ID: <20090505130557.B1F9A70108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29803/devel Modified Files: openoffice.org.spec Added Files: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch Log Message: Resolves(partially): rhbz#495901 No default font-width for wmf export openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch: --- NEW FILE openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch --- diff -ru svtools.orig/source/filter.vcl/wmf/wmfwr.cxx svtools/source/filter.vcl/wmf/wmfwr.cxx --- svtools.orig/source/filter.vcl/wmf/wmfwr.cxx 2009-05-05 12:57:34.000000000 +0100 +++ svtools/source/filter.vcl/wmf/wmfwr.cxx 2009-05-05 13:55:47.000000000 +0100 @@ -439,14 +439,7 @@ WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT); - if ( !rFont.GetSize().Width() ) - { - VirtualDevice aDev; - FontMetric aMetric( aDev.GetFontMetric( rFont ) ); - WriteHeightWidth(Size(aMetric.GetWidth(),-rFont.GetSize().Height())); - } - else - WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height())); + WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height())); *pWMF << (short)rFont.GetOrientation() << (short)rFont.GetOrientation(); Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1906 retrieving revision 1.1907 diff -u -p -r1.1906 -r1.1907 --- openoffice.org.spec 30 Apr 2009 14:33:32 -0000 1.1906 +++ openoffice.org.spec 5 May 2009 13:05:27 -0000 1.1907 @@ -139,6 +139,7 @@ Patch63: openoffice.org-3.1.0.ooo101355. Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch +Patch67: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1636,6 +1637,7 @@ cat %{PATCH11} >> svtools/source/dialogs %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch %patch66 -p0 -b .ooo100469.sal.ia64_arm.patch +%patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4131,8 +4133,9 @@ fi unopkg list --shared > /dev/null 2>&1 || : %changelog -* Thu Apr 30 2009 Caol??n McNamara - 1:3.1.0-11.3 +* Tue May 05 2009 Caol??n McNamara - 1:3.1.0-11.3 - add in the ia64 and arm fixes for the secondary arch people +- Resolves(partially): rhbz#495901 No default font-width for wmf export * Tue Apr 27 2009 Caol??n McNamara - 1:3.1.0-11.2 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch From spot at fedoraproject.org Tue May 5 13:24:20 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 5 May 2009 13:24:20 +0000 (UTC) Subject: rpms/audio-entropyd/F-11 audio-entropyd.spec, 1.15, 1.16 sources, 1.4, 1.5 Message-ID: <20090505132420.58DCA70108@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/audio-entropyd/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31696/F-11 Modified Files: audio-entropyd.spec sources Log Message: 2.0.1 Index: audio-entropyd.spec =================================================================== RCS file: /cvs/pkgs/rpms/audio-entropyd/F-11/audio-entropyd.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- audio-entropyd.spec 13 Apr 2009 21:44:23 -0000 1.15 +++ audio-entropyd.spec 5 May 2009 13:23:49 -0000 1.16 @@ -1,6 +1,6 @@ Name: audio-entropyd -Version: 1.0.5 -Release: 4%{?dist} +Version: 2.0.1 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Summary: Generate entropy from audio output @@ -8,7 +8,6 @@ URL: http://www.vanheusden.co Source0: http://www.vanheusden.com/aed/audio-entropyd-%{version}.tgz Source1: audio-entropyd Source2: audio-entropyd.conf -Patch0: audio-entropyd-1.0.5-alsa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel Requires(post): chkconfig @@ -20,7 +19,6 @@ Audio-entropyd generates entropy-data fo %prep %setup -q -%patch0 -p1 -b .alsa %build make OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -53,12 +51,15 @@ fi %files %defattr(-,root,root,-) -%doc COPYING README README.2 TODO +%doc COPYING README TODO %{_initrddir}/audio-entropyd %{_sbindir}/audio-entropyd %config(noreplace) %{_sysconfdir}/sysconfig/audio-entropyd %changelog +* Tue May 5 2009 Tom "spot" Callaway - 2.0.1-1 +- upstream took my alsa patch (improved on it too) + * Wed Mar 25 2009 Tom "spot" Callaway - 1.0.5-4 - port from OSS to ALSA Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/audio-entropyd/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 29 Sep 2008 15:30:28 -0000 1.4 +++ sources 5 May 2009 13:23:49 -0000 1.5 @@ -1 +1 @@ -9f1f85872c9e6cee20d55da14c840079 audio-entropyd-1.0.5.tgz +f8d71e214755b93a2da3dfa29157ef37 audio-entropyd-2.0.1.tgz From spot at fedoraproject.org Tue May 5 13:24:20 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 5 May 2009 13:24:20 +0000 (UTC) Subject: rpms/audio-entropyd/devel .cvsignore, 1.4, 1.5 audio-entropyd.spec, 1.15, 1.16 sources, 1.4, 1.5 Message-ID: <20090505132420.BE82F70108@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/audio-entropyd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31696/devel Modified Files: .cvsignore audio-entropyd.spec sources Log Message: 2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 29 Sep 2008 15:30:28 -0000 1.4 +++ .cvsignore 5 May 2009 13:23:50 -0000 1.5 @@ -1 +1 @@ -audio-entropyd-1.0.5.tgz +audio-entropyd-2.0.1.tgz Index: audio-entropyd.spec =================================================================== RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/audio-entropyd.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- audio-entropyd.spec 13 Apr 2009 21:44:23 -0000 1.15 +++ audio-entropyd.spec 5 May 2009 13:23:50 -0000 1.16 @@ -1,6 +1,6 @@ Name: audio-entropyd -Version: 1.0.5 -Release: 4%{?dist} +Version: 2.0.1 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Summary: Generate entropy from audio output @@ -8,7 +8,6 @@ URL: http://www.vanheusden.co Source0: http://www.vanheusden.com/aed/audio-entropyd-%{version}.tgz Source1: audio-entropyd Source2: audio-entropyd.conf -Patch0: audio-entropyd-1.0.5-alsa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel Requires(post): chkconfig @@ -20,7 +19,6 @@ Audio-entropyd generates entropy-data fo %prep %setup -q -%patch0 -p1 -b .alsa %build make OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -53,12 +51,15 @@ fi %files %defattr(-,root,root,-) -%doc COPYING README README.2 TODO +%doc COPYING README TODO %{_initrddir}/audio-entropyd %{_sbindir}/audio-entropyd %config(noreplace) %{_sysconfdir}/sysconfig/audio-entropyd %changelog +* Tue May 5 2009 Tom "spot" Callaway - 2.0.1-1 +- upstream took my alsa patch (improved on it too) + * Wed Mar 25 2009 Tom "spot" Callaway - 1.0.5-4 - port from OSS to ALSA Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 29 Sep 2008 15:30:28 -0000 1.4 +++ sources 5 May 2009 13:23:50 -0000 1.5 @@ -1 +1 @@ -9f1f85872c9e6cee20d55da14c840079 audio-entropyd-1.0.5.tgz +f8d71e214755b93a2da3dfa29157ef37 audio-entropyd-2.0.1.tgz From spot at fedoraproject.org Tue May 5 13:35:56 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 5 May 2009 13:35:56 +0000 (UTC) Subject: rpms/xpdf/EL-5 02_permissions.dpatch, NONE, 1.1 10_add_accelerators.dpatch, NONE, 1.1 fix-437725.dpatch, NONE, 1.1 fix-444648.dpatch, NONE, 1.1 fix-462544.dpatch, NONE, 1.1 fix-479467.dpatch, NONE, 1.1 xpdf-3.02-crash.patch, NONE, 1.1 xpdf-3.02-mousebuttons_view.patch, NONE, 1.1 xpdf-3.02pl3.patch, NONE, 1.1 xpdf.spec, 1.8, 1.9 Message-ID: <20090505133556.B3ACB70108@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/extras/rpms/xpdf/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1354 Modified Files: xpdf.spec Added Files: 02_permissions.dpatch 10_add_accelerators.dpatch fix-437725.dpatch fix-444648.dpatch fix-462544.dpatch fix-479467.dpatch xpdf-3.02-crash.patch xpdf-3.02-mousebuttons_view.patch xpdf-3.02pl3.patch Log Message: update to 3.02pl3, inherit changes from devel --- NEW FILE 02_permissions.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## permissions.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Remove PDF file permission checks @DPATCH@ diff -urNad xpdf-3.02~/xpdf/PDFCore.cc xpdf-3.02/xpdf/PDFCore.cc --- xpdf-3.02~/xpdf/PDFCore.cc 2007-02-28 09:05:52.000000000 +1100 +++ xpdf-3.02/xpdf/PDFCore.cc 2007-04-24 23:43:59.000000000 +1000 @@ -4,6 +4,8 @@ // // Copyright 2004 Glyph & Cog, LLC // +// Modified for Debian by Hamish Moffatt, 18 August 2005. +// //======================================================================== #include @@ -1563,9 +1565,11 @@ int x0, y0, x1, y1, t; GString *s; +#ifdef ENFORCE_PERMISSIONS if (!doc->okToCopy()) { return NULL; } +#endif if ((page = findPage(pg))) { cvtUserToDev(pg, xMin, yMin, &x0, &y0); cvtUserToDev(pg, xMax, yMax, &x1, &y1); diff -urNad xpdf-3.02~/xpdf/XPDFCore.cc xpdf-3.02/xpdf/XPDFCore.cc --- xpdf-3.02~/xpdf/XPDFCore.cc 2007-02-28 09:05:52.000000000 +1100 +++ xpdf-3.02/xpdf/XPDFCore.cc 2007-04-24 23:46:39.000000000 +1000 @@ -4,6 +4,8 @@ // // Copyright 2002-2003 Glyph & Cog, LLC // +// Modified for Debian by Hamish Moffatt, 22 May 2002. +// //======================================================================== #include @@ -384,11 +386,15 @@ #ifndef NO_TEXT_SELECT if (selectULX != selectLRX && selectULY != selectLRY) { +#ifdef ENFORCE_PERMISSIONS if (doc->okToCopy()) { copySelection(); } else { error(-1, "Copying of text from this document is not allowed."); } +#else + copySelection(); +#endif } #endif } @@ -407,9 +413,11 @@ int pg; double ulx, uly, lrx, lry; +#ifdef ENFORCE_PERMISSIONS if (!doc->okToCopy()) { return; } +#endif if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) { //~ for multithreading: need a mutex here if (currentSelection) { diff -urNad xpdf-3.02~/xpdf/XPDFViewer.cc xpdf-3.02/xpdf/XPDFViewer.cc --- xpdf-3.02~/xpdf/XPDFViewer.cc 2007-02-28 09:05:52.000000000 +1100 +++ xpdf-3.02/xpdf/XPDFViewer.cc 2007-04-24 23:43:59.000000000 +1000 @@ -4,6 +4,8 @@ // // Copyright 2002-2003 Glyph & Cog, LLC // +// Modified for Debian by Hamish Moffatt, 22 May 2002. +// //======================================================================== #include @@ -3406,10 +3408,12 @@ PSOutputDev *psOut; doc = viewer->core->getDoc(); +#ifdef ENFORCE_PERMISSIONS if (!doc->okToPrint()) { error(-1, "Printing this document is not allowed."); return; } +#endif viewer->core->setBusyCursor(gTrue); diff -urNad xpdf-3.02~/xpdf/pdfimages.cc xpdf-3.02/xpdf/pdfimages.cc --- xpdf-3.02~/xpdf/pdfimages.cc 2007-02-28 09:05:52.000000000 +1100 +++ xpdf-3.02/xpdf/pdfimages.cc 2007-04-24 23:43:59.000000000 +1000 @@ -4,6 +4,8 @@ // // Copyright 1998-2003 Glyph & Cog, LLC // +// Modified for Debian by Hamish Moffatt, 22 May 2002. +// //======================================================================== #include @@ -119,11 +121,13 @@ } // check for copy permission +#ifdef ENFORCE_PERMISSIONS if (!doc->okToCopy()) { error(-1, "Copying of images from this document is not allowed."); exitCode = 3; goto err1; } +#endif // get page range if (firstPage < 1) diff -urNad xpdf-3.02~/xpdf/pdftops.cc xpdf-3.02/xpdf/pdftops.cc --- xpdf-3.02~/xpdf/pdftops.cc 2007-02-28 09:05:52.000000000 +1100 +++ xpdf-3.02/xpdf/pdftops.cc 2007-04-24 23:43:59.000000000 +1000 @@ -4,6 +4,8 @@ // // Copyright 1996-2003 Glyph & Cog, LLC // +// Modified for Debian by Hamish Moffatt, 22 May 2002. +// //======================================================================== #include @@ -278,12 +280,14 @@ goto err1; } +#ifdef ENFORCE_PERMISSIONS // check for print permission if (!doc->okToPrint()) { error(-1, "Printing this document is not allowed."); exitCode = 3; goto err1; } +#endif // construct PostScript file name if (argc == 3) { diff -urNad xpdf-3.02~/xpdf/pdftotext.cc xpdf-3.02/xpdf/pdftotext.cc --- xpdf-3.02~/xpdf/pdftotext.cc 2007-02-28 09:05:52.000000000 +1100 +++ xpdf-3.02/xpdf/pdftotext.cc 2007-04-24 23:43:59.000000000 +1000 @@ -4,6 +4,8 @@ // // Copyright 1997-2003 Glyph & Cog, LLC // +// Modified for Debian by Hamish Moffatt, 22 May 2002. +// //======================================================================== #include @@ -160,12 +162,14 @@ goto err2; } +#ifdef ENFORCE_PERMISSIONS // check for copy permission if (!doc->okToCopy()) { error(-1, "Copying of text from this document is not allowed."); exitCode = 3; goto err2; } +#endif // construct text file name if (argc == 3) { --- NEW FILE 10_add_accelerators.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 10_add_accelerators.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Add keyboard accelerators for rotate (#385962) @DPATCH@ diff -urNad xpdf-3.02~/xpdf/XPDFViewer.cc xpdf-3.02/xpdf/XPDFViewer.cc --- xpdf-3.02~/xpdf/XPDFViewer.cc 2007-04-25 01:40:50.000000000 +1000 +++ xpdf-3.02/xpdf/XPDFViewer.cc 2007-04-25 01:42:13.000000000 +1000 @@ -1958,16 +1958,22 @@ n = 0; s = XmStringCreateLocalized("Rotate counterclockwise"); XtSetArg(args[n], XmNlabelString, s); ++n; + s2 = XmStringCreateLocalized("["); + XtSetArg(args[n], XmNacceleratorText, s2); ++n; btn = XmCreatePushButton(popupMenu, "rotateCCW", args, n); XmStringFree(s); + XmStringFree(s2); XtManageChild(btn); XtAddCallback(btn, XmNactivateCallback, &rotateCCWCbk, (XtPointer)this); n = 0; s = XmStringCreateLocalized("Rotate clockwise"); XtSetArg(args[n], XmNlabelString, s); ++n; + s2 = XmStringCreateLocalized("]"); + XtSetArg(args[n], XmNacceleratorText, s2); ++n; btn = XmCreatePushButton(popupMenu, "rotateCW", args, n); XmStringFree(s); + XmStringFree(s2); XtManageChild(btn); XtAddCallback(btn, XmNactivateCallback, &rotateCWCbk, (XtPointer)this); --- NEW FILE fix-437725.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## fix-437725.dpatch from Arno Renevier ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix segmentation fault when pressing Ctrl-W in full screen mode @DPATCH@ --- a/xpdf/XPDFViewer.cc 2007-08-13 22:41:36.000000000 +0200 +++ b/xpdf/XPDFViewer.cc 2007-08-13 23:01:07.000000000 +0200 @@ -400,18 +400,21 @@ void XPDFViewer::clear() { title = app->getTitle() ? app->getTitle()->getCString() : (char *)xpdfAppName; XtVaSetValues(win, XmNtitle, title, XmNiconName, title, NULL); - s = XmStringCreateLocalized(""); - XtVaSetValues(pageNumText, XmNlabelString, s, NULL); - XmStringFree(s); - s = XmStringCreateLocalized(" of 0"); - XtVaSetValues(pageCountLabel, XmNlabelString, s, NULL); - XmStringFree(s); - // disable buttons - XtVaSetValues(prevTenPageBtn, XmNsensitive, False, NULL); - XtVaSetValues(prevPageBtn, XmNsensitive, False, NULL); - XtVaSetValues(nextTenPageBtn, XmNsensitive, False, NULL); - XtVaSetValues(nextPageBtn, XmNsensitive, False, NULL); + if (toolBar != None) { + s = XmStringCreateLocalized(""); + XtVaSetValues(pageNumText, XmNlabelString, s, NULL); + XmStringFree(s); + s = XmStringCreateLocalized(" of 0"); + XtVaSetValues(pageCountLabel, XmNlabelString, s, NULL); + XmStringFree(s); + + // disable buttons + XtVaSetValues(prevTenPageBtn, XmNsensitive, False, NULL); + XtVaSetValues(prevPageBtn, XmNsensitive, False, NULL); + XtVaSetValues(nextTenPageBtn, XmNsensitive, False, NULL); + XtVaSetValues(nextPageBtn, XmNsensitive, False, NULL); + } // remove the old outline #ifndef DISABLE_OUTLINE --- NEW FILE fix-444648.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## fix-444648.dpatch by Bernhard R. Link ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Do proper PS stream encoding on 64 bit architectures @DPATCH@ --- xpdf-3.02/xpdf/Stream.cc.BAD 2008-12-10 12:16:16.000000000 -0500 +++ xpdf-3.02/xpdf/Stream.cc 2008-12-10 12:16:21.000000000 -0500 @@ -4514,7 +4514,7 @@ void ASCII85Encoder::reset() { GBool ASCII85Encoder::fillBuf() { Guint t; char buf1[5]; - int c0, c1, c2, c3; + unsigned int c0, c1, c2, c3; int n, i; if (eof) { --- NEW FILE fix-462544.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## fix-462544.dpatch from Jiri Palecek ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix segmentation fault in image handling @DPATCH@ --- xpdf-3.02/xpdf/SplashOutputDev.cc 2007-02-27 23:05:52.000000000 +0100 +++ xpdf-3.02.new/xpdf/SplashOutputDev.cc 2008-02-17 17:28:46.000000000 +0100 @@ -2475,14 +2461,14 @@ tx = (int)floor(xMin); if (tx < 0) { tx = 0; - } else if (tx > bitmap->getWidth()) { - tx = bitmap->getWidth(); + } else if (tx >= bitmap->getWidth()) { + tx = bitmap->getWidth()-1; } ty = (int)floor(yMin); if (ty < 0) { ty = 0; - } else if (ty > bitmap->getHeight()) { - ty = bitmap->getHeight(); + } else if (ty >= bitmap->getHeight()) { + ty = bitmap->getHeight()-1; } w = (int)ceil(xMax) - tx + 1; if (tx + w > bitmap->getWidth()) { --- NEW FILE fix-479467.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## fix-479467.dpatch from Stephan Beyer ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix segmentation fault when pressing g in full screen mode @DPATCH@ diff -ruN xpdf-3.02.old/xpdf/XPDFViewer.cc xpdf-3.02.fix/xpdf/XPDFViewer.cc --- xpdf-3.02.old/xpdf/XPDFViewer.cc 2007-02-27 23:05:52.000000000 +0100 +++ xpdf-3.02.fix/xpdf/XPDFViewer.cc 2008-05-04 21:29:34.000000000 +0200 @@ -834,6 +834,9 @@ void XPDFViewer::cmdFocusToPageNum(GString *args[], int nArgs, XEvent *event) { + if (core->getFullScreen()) { + return; + } XmTextFieldSetSelection(pageNumText, 0, strlen(XmTextFieldGetString(pageNumText)), XtLastTimestampProcessed(display)); xpdf-3.02-crash.patch: --- NEW FILE xpdf-3.02-crash.patch --- diff -up xpdf-3.02/fofi/FoFiType1.cc.crash xpdf-3.02/fofi/FoFiType1.cc --- xpdf-3.02/fofi/FoFiType1.cc.crash 2007-02-27 17:05:51.000000000 -0500 +++ xpdf-3.02/fofi/FoFiType1.cc 2009-02-11 11:31:04.000000000 -0500 @@ -235,9 +235,14 @@ void FoFiType1::parse() { } } } else { - if (strtok(buf, " \t") && - (p = strtok(NULL, " \t\n\r")) && !strcmp(p, "def")) { - break; + p = strtok(buf, " \t\n\r"); + if (p) + { + if (!strcmp(p, "def")) break; + if (!strcmp(p, "readonly")) break; + // the spec does not says this but i'm mantaining old xpdf behaviour that accepts "foo def" as end of the encoding array + p = strtok(buf, " \t\n\r"); + if (p && !strcmp(p, "def")) break; } } } diff -up xpdf-3.02/splash/Splash.cc.crash xpdf-3.02/splash/Splash.cc --- xpdf-3.02/splash/Splash.cc.crash 2007-02-27 17:05:52.000000000 -0500 +++ xpdf-3.02/splash/Splash.cc 2009-02-11 11:34:45.000000000 -0500 @@ -1501,6 +1501,11 @@ SplashError Splash::fillWithPattern(Spla xPath->aaScale(); } xPath->sort(); + if (!&xPath->segs[0]) + { + delete xPath; + return splashErrEmptyPath; + } scanner = new SplashXPathScanner(xPath, eo); // get the min and max x and y values @@ -1573,6 +1578,11 @@ SplashError Splash::xorFill(SplashPath * } xPath = new SplashXPath(path, state->matrix, state->flatness, gTrue); xPath->sort(); + if (!&xPath->segs[0]) + { + delete xPath; + return splashErrEmptyPath; + } scanner = new SplashXPathScanner(xPath, eo); // get the min and max x and y values xpdf-3.02-mousebuttons_view.patch: --- NEW FILE xpdf-3.02-mousebuttons_view.patch --- --- xpdf-3.02/xpdf/XPDFViewer.cc~ 2009-02-02 01:58:55.000000000 -0700 +++ xpdf-3.02/xpdf/XPDFViewer.cc 2009-02-02 02:27:04.000000000 -0700 @@ -592,13 +592,13 @@ void XPDFViewer::mouseCbk(void *data, XE int i; if (event->type == ButtonPress) { - if (event->xbutton.button >= 1 && event->xbutton.button <= 7) { + if (event->xbutton.button >= 1 && event->xbutton.button <= 9) { keyCode = xpdfKeyCodeMousePress1 + event->xbutton.button - 1; } else { return; } } else if (event->type == ButtonRelease) { - if (event->xbutton.button >= 1 && event->xbutton.button <= 7) { + if (event->xbutton.button >= 1 && event->xbutton.button <= 9) { keyCode = xpdfKeyCodeMouseRelease1 + event->xbutton.button - 1; } else { return; xpdf-3.02pl3.patch: --- NEW FILE xpdf-3.02pl3.patch --- diff -r -c xpdf-3.02.orig/goo/gmem.cc xpdf-3.02/goo/gmem.cc *** xpdf-3.02.orig/goo/gmem.cc Tue Feb 27 14:05:51 2007 --- xpdf-3.02/goo/gmem.cc Thu Mar 19 15:47:25 2009 *************** *** 55,61 **** void *data; unsigned long *trl, *p; ! if (size <= 0) { return NULL; } size1 = gMemDataSize(size); --- 55,69 ---- void *data; unsigned long *trl, *p; ! if (size < 0) { ! #if USE_EXCEPTIONS ! throw GMemException(); ! #else ! fprintf(stderr, "Invalid memory allocation size\n"); ! exit(1); ! #endif ! } ! if (size == 0) { return NULL; } size1 = gMemDataSize(size); *************** *** 91,97 **** #else void *p; ! if (size <= 0) { return NULL; } if (!(p = malloc(size))) { --- 99,113 ---- #else void *p; ! if (size < 0) { ! #if USE_EXCEPTIONS ! throw GMemException(); ! #else ! fprintf(stderr, "Invalid memory allocation size\n"); ! exit(1); ! #endif ! } ! if (size == 0) { return NULL; } if (!(p = malloc(size))) { *************** *** 112,118 **** void *q; size_t oldSize; ! if (size <= 0) { if (p) { gfree(p); } --- 128,142 ---- void *q; size_t oldSize; ! if (size < 0) { ! #if USE_EXCEPTIONS ! throw GMemException(); ! #else ! fprintf(stderr, "Invalid memory allocation size\n"); ! exit(1); ! #endif ! } ! if (size == 0) { if (p) { gfree(p); } *************** *** 131,137 **** #else void *q; ! if (size <= 0) { if (p) { free(p); } --- 155,169 ---- #else void *q; ! if (size < 0) { ! #if USE_EXCEPTIONS ! throw GMemException(); ! #else ! fprintf(stderr, "Invalid memory allocation size\n"); ! exit(1); ! #endif ! } ! if (size == 0) { if (p) { free(p); } diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.cc xpdf-3.02/xpdf/JBIG2Stream.cc *** xpdf-3.02.orig/xpdf/JBIG2Stream.cc Tue Feb 27 14:05:52 2007 --- xpdf-3.02/xpdf/JBIG2Stream.cc Tue Mar 31 10:55:23 2009 *************** *** 422,433 **** table[i] = table[len]; // assign prefixes ! i = 0; ! prefix = 0; ! table[i++].prefix = prefix++; ! for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) { ! prefix <<= table[i].prefixLen - table[i-1].prefixLen; ! table[i].prefix = prefix++; } } --- 422,435 ---- table[i] = table[len]; // assign prefixes ! if (table[0].rangeLen != jbig2HuffmanEOT) { ! i = 0; ! prefix = 0; ! table[i++].prefix = prefix++; ! for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) { ! prefix <<= table[i].prefixLen - table[i-1].prefixLen; ! table[i].prefix = prefix++; ! } } } *************** *** 491,497 **** } if (p->bits < 0) { error(str->getPos(), "Bad two dim code in JBIG2 MMR stream"); ! return 0; } bufLen -= p->bits; return p->n; --- 493,499 ---- } if (p->bits < 0) { error(str->getPos(), "Bad two dim code in JBIG2 MMR stream"); ! return EOF; } bufLen -= p->bits; return p->n; *************** *** 507,513 **** ++nBytesRead; } while (1) { ! if (bufLen >= 7 && ((buf >> (bufLen - 7)) & 0x7f) == 0) { if (bufLen <= 12) { code = buf << (12 - bufLen); } else { --- 509,515 ---- ++nBytesRead; } while (1) { ! if (bufLen >= 11 && ((buf >> (bufLen - 7)) & 0x7f) == 0) { if (bufLen <= 12) { code = buf << (12 - bufLen); } else { *************** *** 550,563 **** ++nBytesRead; } while (1) { ! if (bufLen >= 6 && ((buf >> (bufLen - 6)) & 0x3f) == 0) { if (bufLen <= 13) { code = buf << (13 - bufLen); } else { code = buf >> (bufLen - 13); } p = &blackTab1[code & 0x7f]; ! } else if (bufLen >= 4 && ((buf >> (bufLen - 4)) & 0x0f) == 0) { if (bufLen <= 12) { code = buf << (12 - bufLen); } else { --- 552,566 ---- ++nBytesRead; } while (1) { ! if (bufLen >= 10 && ((buf >> (bufLen - 6)) & 0x3f) == 0) { if (bufLen <= 13) { code = buf << (13 - bufLen); } else { code = buf >> (bufLen - 13); } p = &blackTab1[code & 0x7f]; ! } else if (bufLen >= 7 && ((buf >> (bufLen - 4)) & 0x0f) == 0 && ! ((buf >> (bufLen - 6)) & 0x03) != 0) { if (bufLen <= 12) { code = buf << (12 - bufLen); } else { *************** *** 683,690 **** h = hA; line = (wA + 7) >> 3; if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ! data = NULL; ! return; } // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); --- 686,694 ---- h = hA; line = (wA + 7) >> 3; if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ! // force a call to gmalloc(-1), which will throw an exception ! h = -1; ! line = 2; } // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); *************** *** 698,705 **** h = bitmap->h; line = bitmap->line; if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ! data = NULL; ! return; } // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); --- 702,710 ---- h = bitmap->h; line = bitmap->line; if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ! // force a call to gmalloc(-1), which will throw an exception ! h = -1; ! line = 2; } // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); *************** *** 754,759 **** --- 759,766 ---- inline void JBIG2Bitmap::getPixelPtr(int x, int y, JBIG2BitmapPtr *ptr) { if (y < 0 || y >= h || x >= w) { ptr->p = NULL; + ptr->shift = 0; // make gcc happy + ptr->x = 0; // make gcc happy } else if (x < 0) { ptr->p = &data[y * line]; ptr->shift = 7; *************** *** 798,803 **** --- 805,814 ---- Guint src0, src1, src, dest, s1, s2, m1, m2, m3; GBool oneByte; + // check for the pathological case where y = -2^31 + if (y < -0x7fffffff) { + return; + } if (y < 0) { y0 = -y; } else { *************** *** 1011,1018 **** --- 1022,1034 ---- JBIG2SymbolDict::JBIG2SymbolDict(Guint segNumA, Guint sizeA): JBIG2Segment(segNumA) { + Guint i; + size = sizeA; bitmaps = (JBIG2Bitmap **)gmallocn(size, sizeof(JBIG2Bitmap *)); + for (i = 0; i < size; ++i) { + bitmaps[i] = NULL; + } genericRegionStats = NULL; refinementRegionStats = NULL; } *************** *** 1021,1027 **** Guint i; for (i = 0; i < size; ++i) { ! delete bitmaps[i]; } gfree(bitmaps); if (genericRegionStats) { --- 1037,1045 ---- Guint i; for (i = 0; i < size; ++i) { ! if (bitmaps[i]) { ! delete bitmaps[i]; ! } } gfree(bitmaps); if (genericRegionStats) { *************** *** 1296,1301 **** --- 1314,1326 ---- goto eofError2; } + // check for missing page information segment + if (!pageBitmap && ((segType >= 4 && segType <= 7) || + (segType >= 20 && segType <= 43))) { + error(getPos(), "First JBIG2 segment associated with a page must be a page information segment"); + goto syntaxError; + } + // read the segment data switch (segType) { case 0: *************** *** 1411,1416 **** --- 1436,1443 ---- Guint i, j, k; Guchar *p; + symWidths = NULL; + // symbol dictionary flags if (!readUWord(&flags)) { goto eofError; *************** *** 1466,1485 **** codeTables = new GList(); numInputSyms = 0; for (i = 0; i < nRefSegs; ++i) { ! seg = findSegment(refSegs[i]); ! if (seg->getType() == jbig2SegSymbolDict) { ! numInputSyms += ((JBIG2SymbolDict *)seg)->getSize(); ! } else if (seg->getType() == jbig2SegCodeTable) { ! codeTables->append(seg); } } // compute symbol code length ! symCodeLen = 0; ! i = 1; ! while (i < numInputSyms + numNewSyms) { ++symCodeLen; ! i <<= 1; } // get the input symbol bitmaps --- 1493,1524 ---- codeTables = new GList(); numInputSyms = 0; for (i = 0; i < nRefSegs; ++i) { ! if ((seg = findSegment(refSegs[i]))) { ! if (seg->getType() == jbig2SegSymbolDict) { ! j = ((JBIG2SymbolDict *)seg)->getSize(); ! if (numInputSyms > UINT_MAX - j) { ! error(getPos(), "Too many input symbols in JBIG2 symbol dictionary"); ! delete codeTables; ! goto eofError; ! } ! numInputSyms += j; ! } else if (seg->getType() == jbig2SegCodeTable) { ! codeTables->append(seg); ! } } } + if (numInputSyms > UINT_MAX - numNewSyms) { + error(getPos(), "Too many input symbols in JBIG2 symbol dictionary"); + delete codeTables; + goto eofError; + } // compute symbol code length ! symCodeLen = 1; ! i = (numInputSyms + numNewSyms) >> 1; ! while (i) { ++symCodeLen; ! i >>= 1; } // get the input symbol bitmaps *************** *** 1491,1501 **** k = 0; inputSymbolDict = NULL; for (i = 0; i < nRefSegs; ++i) { ! seg = findSegment(refSegs[i]); ! if (seg->getType() == jbig2SegSymbolDict) { ! inputSymbolDict = (JBIG2SymbolDict *)seg; ! for (j = 0; j < inputSymbolDict->getSize(); ++j) { ! bitmaps[k++] = inputSymbolDict->getBitmap(j); } } } --- 1530,1541 ---- k = 0; inputSymbolDict = NULL; for (i = 0; i < nRefSegs; ++i) { ! if ((seg = findSegment(refSegs[i]))) { ! if (seg->getType() == jbig2SegSymbolDict) { ! inputSymbolDict = (JBIG2SymbolDict *)seg; ! for (j = 0; j < inputSymbolDict->getSize(); ++j) { ! bitmaps[k++] = inputSymbolDict->getBitmap(j); ! } } } } *************** *** 1510,1515 **** --- 1550,1558 ---- } else if (huffDH == 1) { huffDHTable = huffTableE; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffDW == 0) { *************** *** 1517,1533 **** --- 1560,1585 ---- } else if (huffDW == 1) { huffDWTable = huffTableC; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffBMSize == 0) { huffBMSizeTable = huffTableA; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffBMSizeTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffAggInst == 0) { huffAggInstTable = huffTableA; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffAggInstTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } *************** *** 1560,1566 **** } // allocate symbol widths storage - symWidths = NULL; if (huff && !refAgg) { symWidths = (Guint *)gmallocn(numNewSyms, sizeof(Guint)); } --- 1612,1617 ---- *************** *** 1602,1607 **** --- 1653,1662 ---- goto syntaxError; } symWidth += dw; + if (i >= numNewSyms) { + error(getPos(), "Too many symbols in JBIG2 symbol dictionary"); + goto syntaxError; + } // using a collective bitmap, so don't read a bitmap here if (huff && !refAgg) { *************** *** 1638,1643 **** --- 1693,1702 ---- arithDecoder->decodeInt(&refDX, iardxStats); arithDecoder->decodeInt(&refDY, iardyStats); } + if (symID >= numInputSyms + i) { + error(getPos(), "Invalid symbol ID in JBIG2 symbol dictionary"); + goto syntaxError; + } refBitmap = bitmaps[symID]; bitmaps[numInputSyms + i] = readGenericRefinementRegion(symWidth, symHeight, *************** *** 1704,1709 **** --- 1763,1774 ---- } else { arithDecoder->decodeInt(&run, iaexStats); } + if (i + run > numInputSyms + numNewSyms || + (ex && j + run > numExSyms)) { + error(getPos(), "Too many exported symbols in JBIG2 symbol dictionary"); + delete symbolDict; + goto syntaxError; + } if (ex) { for (cnt = 0; cnt < run; ++cnt) { symbolDict->setBitmap(j++, bitmaps[i++]->copy()); *************** *** 1713,1718 **** --- 1778,1788 ---- } ex = !ex; } + if (j != numExSyms) { + error(getPos(), "Too few symbols in JBIG2 symbol dictionary"); + delete symbolDict; + goto syntaxError; + } for (i = 0; i < numNewSyms; ++i) { delete bitmaps[numInputSyms + i]; *************** *** 1735,1740 **** --- 1805,1814 ---- return gTrue; + codeTableError: + error(getPos(), "Missing code table in JBIG2 symbol dictionary"); + delete codeTables; + syntaxError: for (i = 0; i < numNewSyms; ++i) { if (bitmaps[numInputSyms + i]) { *************** *** 1837,1842 **** --- 1911,1918 ---- } } else { error(getPos(), "Invalid segment reference in JBIG2 text region"); + delete codeTables; + return; } } symCodeLen = 0; *************** *** 1871,1876 **** --- 1947,1955 ---- } else if (huffFS == 1) { huffFSTable = huffTableG; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffFSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffDS == 0) { *************** *** 1880,1885 **** --- 1959,1967 ---- } else if (huffDS == 2) { huffDSTable = huffTableJ; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffDSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffDT == 0) { *************** *** 1889,1894 **** --- 1971,1979 ---- } else if (huffDT == 2) { huffDTTable = huffTableM; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffDTTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffRDW == 0) { *************** *** 1896,1901 **** --- 1981,1989 ---- } else if (huffRDW == 1) { huffRDWTable = huffTableO; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffRDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffRDH == 0) { *************** *** 1903,1908 **** --- 1991,1999 ---- } else if (huffRDH == 1) { huffRDHTable = huffTableO; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffRDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffRDX == 0) { *************** *** 1910,1915 **** --- 2001,2009 ---- } else if (huffRDX == 1) { huffRDXTable = huffTableO; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffRDXTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffRDY == 0) { *************** *** 1917,1927 **** --- 2011,2027 ---- } else if (huffRDY == 1) { huffRDYTable = huffTableO; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffRDYTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } if (huffRSize == 0) { huffRSizeTable = huffTableA; } else { + if (i >= (Guint)codeTables->getLength()) { + goto codeTableError; + } huffRSizeTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable(); } *************** *** 2016,2023 **** --- 2116,2130 ---- return; + codeTableError: + error(getPos(), "Missing code table in JBIG2 text region"); + gfree(codeTables); + delete syms; + return; + eofError: error(getPos(), "Unexpected EOF in JBIG2 stream"); + return; } JBIG2Bitmap *JBIG2Stream::readTextRegion(GBool huff, GBool refine, *************** *** 2324,2331 **** error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } ! seg = findSegment(refSegs[0]); ! if (seg->getType() != jbig2SegPatternDict) { error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } --- 2431,2438 ---- error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } ! if (!(seg = findSegment(refSegs[0])) || ! seg->getType() != jbig2SegPatternDict) { error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } *************** *** 2483,2489 **** // read the bitmap bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse, ! NULL, atx, aty, mmr ? 0 : length - 18); // combine the region bitmap into the page bitmap if (imm) { --- 2590,2596 ---- // read the bitmap bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse, ! NULL, atx, aty, mmr ? length - 18 : 0); // combine the region bitmap into the page bitmap if (imm) { *************** *** 2505,2510 **** --- 2612,2654 ---- error(getPos(), "Unexpected EOF in JBIG2 stream"); } + inline void JBIG2Stream::mmrAddPixels(int a1, int blackPixels, + int *codingLine, int *a0i, int w) { + if (a1 > codingLine[*a0i]) { + if (a1 > w) { + error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1); + a1 = w; + } + if ((*a0i & 1) ^ blackPixels) { + ++*a0i; + } + codingLine[*a0i] = a1; + } + } + + inline void JBIG2Stream::mmrAddPixelsNeg(int a1, int blackPixels, + int *codingLine, int *a0i, int w) { + if (a1 > codingLine[*a0i]) { + if (a1 > w) { + error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1); + a1 = w; + } + if ((*a0i & 1) ^ blackPixels) { + ++*a0i; + } + codingLine[*a0i] = a1; + } else if (a1 < codingLine[*a0i]) { + if (a1 < 0) { + error(getPos(), "Invalid JBIG2 MMR code"); + a1 = 0; + } + while (*a0i > 0 && a1 <= codingLine[*a0i - 1]) { + --*a0i; + } + codingLine[*a0i] = a1; + } + } + JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h, int templ, GBool tpgdOn, GBool useSkip, JBIG2Bitmap *skip, *************** *** 2517,2523 **** JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3; int *refLine, *codingLine; int code1, code2, code3; ! int x, y, a0, pix, i, refI, codingI; bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); --- 2661,2667 ---- JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3; int *refLine, *codingLine; int code1, code2, code3; ! int x, y, a0i, b1i, blackPixels, pix, i; bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); *************** *** 2527,2535 **** if (mmr) { mmrDecoder->reset(); refLine = (int *)gmallocn(w + 2, sizeof(int)); ! codingLine = (int *)gmallocn(w + 2, sizeof(int)); ! codingLine[0] = codingLine[1] = w; for (y = 0; y < h; ++y) { --- 2671,2688 ---- if (mmr) { mmrDecoder->reset(); + if (w > INT_MAX - 2) { + error(getPos(), "Bad width in JBIG2 generic bitmap"); + // force a call to gmalloc(-1), which will throw an exception + w = -3; + } + // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = w + // ---> max codingLine size = w + 1 + // refLine has one extra guard entry at the end + // ---> max refLine size = w + 2 + codingLine = (int *)gmallocn(w + 1, sizeof(int)); refLine = (int *)gmallocn(w + 2, sizeof(int)); ! codingLine[0] = w; for (y = 0; y < h; ++y) { *************** *** 2537,2664 **** for (i = 0; codingLine[i] < w; ++i) { refLine[i] = codingLine[i]; } ! refLine[i] = refLine[i + 1] = w; // decode a line ! refI = 0; // b1 = refLine[refI] ! codingI = 0; // a1 = codingLine[codingI] ! a0 = 0; ! do { code1 = mmrDecoder->get2DCode(); switch (code1) { case twoDimPass: ! if (refLine[refI] < w) { ! a0 = refLine[refI + 1]; ! refI += 2; ! } ! break; case twoDimHoriz: ! if (codingI & 1) { ! code1 = 0; ! do { ! code1 += code3 = mmrDecoder->getBlackCode(); ! } while (code3 >= 64); ! code2 = 0; ! do { ! code2 += code3 = mmrDecoder->getWhiteCode(); ! } while (code3 >= 64); ! } else { ! code1 = 0; ! do { ! code1 += code3 = mmrDecoder->getWhiteCode(); ! } while (code3 >= 64); ! code2 = 0; ! do { ! code2 += code3 = mmrDecoder->getBlackCode(); ! } while (code3 >= 64); ! } ! if (code1 > 0 || code2 > 0) { ! a0 = codingLine[codingI++] = a0 + code1; ! a0 = codingLine[codingI++] = a0 + code2; ! while (refLine[refI] <= a0 && refLine[refI] < w) { ! refI += 2; ! } ! } ! break; ! case twoDimVert0: ! a0 = codingLine[codingI++] = refLine[refI]; ! if (refLine[refI] < w) { ! ++refI; ! } ! break; ! case twoDimVertR1: ! a0 = codingLine[codingI++] = refLine[refI] + 1; ! if (refLine[refI] < w) { ! ++refI; ! while (refLine[refI] <= a0 && refLine[refI] < w) { ! refI += 2; ! } ! } ! break; ! case twoDimVertR2: ! a0 = codingLine[codingI++] = refLine[refI] + 2; ! if (refLine[refI] < w) { ! ++refI; ! while (refLine[refI] <= a0 && refLine[refI] < w) { ! refI += 2; ! } ! } ! break; case twoDimVertR3: ! a0 = codingLine[codingI++] = refLine[refI] + 3; ! if (refLine[refI] < w) { ! ++refI; ! while (refLine[refI] <= a0 && refLine[refI] < w) { ! refI += 2; ! } ! } ! break; ! case twoDimVertL1: ! a0 = codingLine[codingI++] = refLine[refI] - 1; ! if (refI > 0) { ! --refI; ! } else { ! ++refI; ! } ! while (refLine[refI] <= a0 && refLine[refI] < w) { ! refI += 2; ! } ! break; ! case twoDimVertL2: ! a0 = codingLine[codingI++] = refLine[refI] - 2; ! if (refI > 0) { ! --refI; ! } else { ! ++refI; ! } ! while (refLine[refI] <= a0 && refLine[refI] < w) { ! refI += 2; ! } ! break; case twoDimVertL3: ! a0 = codingLine[codingI++] = refLine[refI] - 3; ! if (refI > 0) { ! --refI; ! } else { ! ++refI; ! } ! while (refLine[refI] <= a0 && refLine[refI] < w) { ! refI += 2; ! } ! break; default: error(getPos(), "Illegal code in JBIG2 MMR bitmap data"); break; } ! } while (a0 < w); ! codingLine[codingI++] = w; // convert the run lengths to a bitmap line i = 0; ! while (codingLine[i] < w) { for (x = codingLine[i]; x < codingLine[i+1]; ++x) { bitmap->setPixel(x, y); } i += 2; } } --- 2690,2846 ---- for (i = 0; codingLine[i] < w; ++i) { refLine[i] = codingLine[i]; } ! refLine[i++] = w; ! refLine[i] = w; // decode a line ! codingLine[0] = 0; ! a0i = 0; ! b1i = 0; ! blackPixels = 0; ! // invariant: ! // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] <= w ! // exception at left edge: ! // codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible ! // exception at right edge: ! // refLine[b1i] = refLine[b1i+1] = w is possible ! while (codingLine[a0i] < w) { code1 = mmrDecoder->get2DCode(); switch (code1) { case twoDimPass: ! mmrAddPixels(refLine[b1i + 1], blackPixels, codingLine, &a0i, w); ! if (refLine[b1i + 1] < w) { ! b1i += 2; ! } ! break; case twoDimHoriz: ! code1 = code2 = 0; ! if (blackPixels) { ! do { ! code1 += code3 = mmrDecoder->getBlackCode(); ! } while (code3 >= 64); ! do { ! code2 += code3 = mmrDecoder->getWhiteCode(); ! } while (code3 >= 64); ! } else { ! do { ! code1 += code3 = mmrDecoder->getWhiteCode(); ! } while (code3 >= 64); ! do { ! code2 += code3 = mmrDecoder->getBlackCode(); ! } while (code3 >= 64); ! } ! mmrAddPixels(codingLine[a0i] + code1, blackPixels, ! codingLine, &a0i, w); ! if (codingLine[a0i] < w) { ! mmrAddPixels(codingLine[a0i] + code2, blackPixels ^ 1, ! codingLine, &a0i, w); ! } ! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) { ! b1i += 2; ! } ! break; case twoDimVertR3: ! mmrAddPixels(refLine[b1i] + 3, blackPixels, codingLine, &a0i, w); ! blackPixels ^= 1; ! if (codingLine[a0i] < w) { ! ++b1i; ! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) { ! b1i += 2; ! } ! } ! break; ! case twoDimVertR2: ! mmrAddPixels(refLine[b1i] + 2, blackPixels, codingLine, &a0i, w); ! blackPixels ^= 1; ! if (codingLine[a0i] < w) { ! ++b1i; ! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) { ! b1i += 2; ! } ! } ! break; ! case twoDimVertR1: ! mmrAddPixels(refLine[b1i] + 1, blackPixels, codingLine, &a0i, w); ! blackPixels ^= 1; ! if (codingLine[a0i] < w) { ! ++b1i; ! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) { ! b1i += 2; ! } ! } ! break; ! case twoDimVert0: ! mmrAddPixels(refLine[b1i], blackPixels, codingLine, &a0i, w); ! blackPixels ^= 1; ! if (codingLine[a0i] < w) { ! ++b1i; ! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) { ! b1i += 2; ! } ! } ! break; case twoDimVertL3: ! mmrAddPixelsNeg(refLine[b1i] - 3, blackPixels, codingLine, &a0i, w); ! blackPixels ^= 1; ! if (codingLine[a0i] < w) { ! if (b1i > 0) { ! --b1i; ! } else { ! ++b1i; ! } ! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) { ! b1i += 2; ! } ! } ! break; ! case twoDimVertL2: ! mmrAddPixelsNeg(refLine[b1i] - 2, blackPixels, codingLine, &a0i, w); ! blackPixels ^= 1; ! if (codingLine[a0i] < w) { ! if (b1i > 0) { ! --b1i; ! } else { ! ++b1i; ! } ! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) { ! b1i += 2; ! } ! } ! break; ! case twoDimVertL1: ! mmrAddPixelsNeg(refLine[b1i] - 1, blackPixels, codingLine, &a0i, w); ! blackPixels ^= 1; ! if (codingLine[a0i] < w) { ! if (b1i > 0) { ! --b1i; ! } else { ! ++b1i; ! } ! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) { ! b1i += 2; ! } ! } ! break; ! case EOF: ! mmrAddPixels(w, 0, codingLine, &a0i, w); ! break; default: error(getPos(), "Illegal code in JBIG2 MMR bitmap data"); + mmrAddPixels(w, 0, codingLine, &a0i, w); break; } ! } // convert the run lengths to a bitmap line i = 0; ! while (1) { for (x = codingLine[i]; x < codingLine[i+1]; ++x) { bitmap->setPixel(x, y); } + if (codingLine[i+1] >= w || codingLine[i+2] >= w) { + break; + } i += 2; } } *************** *** 2706,2712 **** ltp = !ltp; } if (ltp) { ! bitmap->duplicateRow(y, y-1); continue; } } --- 2888,2896 ---- ltp = !ltp; } if (ltp) { ! if (y > 0) { ! bitmap->duplicateRow(y, y-1); ! } continue; } } *************** *** 2909,2916 **** return; } if (nRefSegs == 1) { ! seg = findSegment(refSegs[0]); ! if (seg->getType() != jbig2SegBitmap) { error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment"); return; } --- 3093,3100 ---- return; } if (nRefSegs == 1) { ! if (!(seg = findSegment(refSegs[0])) || ! seg->getType() != jbig2SegBitmap) { error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment"); return; } *************** *** 3004,3009 **** --- 3188,3197 ---- tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2); tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2); tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2); + } else { + tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy + tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0; + tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0; } for (x = 0; x < w; ++x) { *************** *** 3075,3080 **** --- 3263,3272 ---- tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2); tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2); tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2); + } else { + tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy + tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0; + tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0; } for (x = 0; x < w; ++x) { diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.h xpdf-3.02/xpdf/JBIG2Stream.h *** xpdf-3.02.orig/xpdf/JBIG2Stream.h Tue Feb 27 14:05:52 2007 --- xpdf-3.02/xpdf/JBIG2Stream.h Tue Mar 31 10:50:07 2009 *************** *** 78,83 **** --- 78,87 ---- Guint *refSegs, Guint nRefSegs); void readGenericRegionSeg(Guint segNum, GBool imm, GBool lossless, Guint length); + void mmrAddPixels(int a1, int blackPixels, + int *codingLine, int *a0i, int w); + void mmrAddPixelsNeg(int a1, int blackPixels, + int *codingLine, int *a0i, int w); JBIG2Bitmap *readGenericBitmap(GBool mmr, int w, int h, int templ, GBool tpgdOn, GBool useSkip, JBIG2Bitmap *skip, Index: xpdf.spec =================================================================== RCS file: /cvs/extras/rpms/xpdf/EL-5/xpdf.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- xpdf.spec 6 Jan 2008 01:36:27 -0000 1.8 +++ xpdf.spec 5 May 2009 13:35:26 -0000 1.9 @@ -1,7 +1,7 @@ Summary: A PDF file viewer for the X Window System Name: xpdf Version: 3.02 -Release: 5%{?dist}.1 +Release: 13%{?dist} License: GPLv2 Epoch: 1 Url: http://www.foolabs.com/xpdf/ @@ -37,7 +37,7 @@ Patch6: xpdf-3.00-core.patch Patch7: xpdf-3.00-xfont.patch Patch9: xpdf-3.00-papersize.patch Patch10: xpdf-3.00-gcc4.patch -Patch11: xpdf-3.01-crash.patch +Patch11: xpdf-3.02-crash.patch Patch12: xpdf-3.00-64bit.patch # Patch13: xpdf-3.01-resize.patch # Patch14: xpdf-3.01-freetype-internals.patch @@ -46,14 +46,30 @@ Patch16: xpdf-3.02-fontlist.patch Patch17: xpdf-3.02-x86_64-fix.patch Patch18: xpdf-3.02-mousebuttons.patch Patch19: xpdf-3.02-additionalzoom.patch +Patch20: xpdf-3.02-mousebuttons_view.patch # Security patches Patch100: xpdf-3.02pl1.patch Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch +Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch + +# Debian patches +Patch200: 02_permissions.dpatch +Patch201: 10_add_accelerators.dpatch +# Fix crash with ctrl-W in full screen mode +Patch202: fix-437725.dpatch +# Proper stream encoding on 64bit platforms +Patch203: fix-444648.dpatch +# Fix segfault in image handling +Patch204: fix-462544.dpatch +# Fix crash with "g" in full screen mode +Patch205: fix-479467.dpatch Requires: urw-fonts Requires: xdg-utils Requires: poppler-utils +Requires: xorg-x11-fonts-ISO8859-1-75dpi +Requires: xorg-x11-fonts-ISO8859-1-100dpi # BuildRequires: lesstif-devel # RHEL 5 uses openmotif @@ -81,7 +97,7 @@ standard X fonts. %prep %setup -q -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 12 -a 13 -a 14 -a 15 -a 16 -%patch -p1 +%patch0 -p1 %patch3 -p1 -b .ext %patch6 -p1 -b .core %patch7 -p1 -b .fonts @@ -97,10 +113,20 @@ standard X fonts. %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 # security patches %patch100 -p1 -b .security %patch101 -p1 -b .security2 +%patch102 -p1 -b .security3 + +# debian patches +%patch200 -p1 -b .permissions +%patch201 -p1 -b .accelerators +%patch202 -p1 -b .fullscreen-crashfix +%patch203 -p1 -b .64bit-stream +%patch204 -p1 -b .segfaultfix +%patch205 -p1 -b .fullscreen-crashfix2 %build find -name "*orig" | xargs rm -f @@ -247,6 +273,17 @@ update-desktop-database &> /dev/null ||: %{_datadir}/xpdf/latin2 %changelog +* Tue May 5 2009 Tom "spot" Callaway 1:3.02-13 +- apply xpdf-3.02pl3 security patch to fix: + CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180 + CVE-2009-1181, CVE-2009-1182, CVE-2009-1183 +- add Requires: xorg-x11-fonts-ISO8859-1-100dpi (bz 485404) +- cleanup crash patch a bit (bz 483664) +- improve support for more mouse buttons (bz 483669) +- apply debian patches +- Fix Patch0:/%%patch mismatch. +- add missing Requires: xorg-x11-fonts-ISO8859-1-75dpi + * Sat Jan 5 2008 Tom "spot" Callaway 1:3.02-5.1 - RHEL-5 uses openmotif instead of lesstif From caolanm at fedoraproject.org Tue May 5 13:36:43 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 5 May 2009 13:36:43 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch, NONE, 1.1 openoffice.org.spec, 1.1907, 1.1908 Message-ID: <20090505133643.3430670108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1445/devel Modified Files: openoffice.org.spec Added Files: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch Log Message: Resolves: ooo#101567 add Maithili locale data openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch: --- NEW FILE openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch --- diff -ru i18npool.orig/source/localedata/data/makefile.mk i18npool/source/localedata/data/makefile.mk --- i18npool.orig/source/localedata/data/makefile.mk 2009-05-05 14:17:18.000000000 +0100 +++ i18npool/source/localedata/data/makefile.mk 2009-05-05 14:18:03.000000000 +0100 @@ -177,6 +177,7 @@ $(MISC)$/localedata_lo_LA.cxx \ $(MISC)$/localedata_lt_LT.cxx \ $(MISC)$/localedata_lv_LV.cxx \ + $(MISC)$/localedata_mai_IN.cxx \ $(MISC)$/localedata_mk_MK.cxx \ $(MISC)$/localedata_ml_IN.cxx \ $(MISC)$/localedata_mn_MN.cxx \ @@ -362,6 +363,7 @@ $(SLO)$/localedata_lb_LU.obj \ $(SLO)$/localedata_lt_LT.obj \ $(SLO)$/localedata_lv_LV.obj \ + $(SLO)$/localedata_mai_IN.obj \ $(SLO)$/localedata_mk_MK.obj \ $(SLO)$/localedata_mt_MT.obj \ $(SLO)$/localedata_nb_NO.obj \ --- /dev/null 2009-04-24 16:10:37.781015686 +0100 +++ i18npool/source/localedata/data/mai_IN.xml 2009-05-05 14:31:17.000000000 +0100 @@ -0,0 +1,357 @@ + + + + + +mai +Maithili + + +IN +India + + + + +. +, +. +: +. +, +, +, + + + + +??? +??? +??? +??? + +??????????????????????????? +????????????????????? +metric + + + +General + + +0 + + +0.00 + + +#,##0 + + +#,##0.00 + + +#,###.00 + + +0.00E+00 + + +0.00E+000 + + +0% + + +0.00% + + +[CURRENCY]#,##0;([CURRENCY]#,##0) + + +[CURRENCY]#,##0.00;([CURRENCY]#,##0.00) + + +[CURRENCY]#,##0;[RED]([CURRENCY]#,##0) + + +[CURRENCY]#,##0.00;[RED]([CURRENCY]#,##0.00) + + +CCC#,##0.00 + + +[CURRENCY]#,##0.--;[RED]([CURRENCY]#,##0.--) + + +D.MM.YY + + +NNNNDD, MMMM YYYY + + +DD.MM.YY + + +DD.MM.YYYY + + +D, MMM YY + + +D, MMM YYYY + + +D, MMM YYYY + + +D, MMMM YYYY + + +D, MMMM YY + + +NN, DD.MMM.YY + + +NN, D, MMM YY + + +NN, D, MMMM YYYY + + +NNNND, MMMM YYYY + + +MM.DD + + +YY-MM-DD +ISO 8601 + + +YYYY-MM-DD +ISO 8601 + + +MM.YY + + +MMM.DD + + +MMMM + + +QQ YY + + +WW + + +HH:MM + + +HH:MM:SS + + +HH:MM AM/PM + + +HH:MM:SS AM/PM + + +[HH]:MM:SS + + +MM:SS.00 + + +[HH]:MM:SS.00 + + +DD.MM.YY HH:MM + + +DD.MM.YYYY HH:MM:SS AM/PM + + + + + +IGNORE_CASE + + + + +IGNORE_CASE + + + +???-??? +14 +???.??????. +???.??????. + + + + + +sun +????????? +?????????????????? + + +mon +????????? +?????????????????? + + +tue +???????????? +????????????????????? + + +wed +????????? +?????????????????? + + +thu +???????????? +????????????????????? + + +fri +??????????????? +???????????????????????? + + +sat +????????? +?????????????????? + + + + +jan +?????? +??????????????? + + +feb +?????? +??????????????? + + +mar +??????????????? +??????????????? + + +apr +??????????????? +?????????????????? + + +may +?????? +?????? + + +jun +????????? +????????? + + +jul +???????????? +??????????????? + + +aug +?????? +??????????????? + + +sep +????????? +????????????????????? + + +oct +??????????????? +????????????????????? + + +nov +?????? +?????????????????? + + +dec +????????? +????????????????????? + + + + +bc +???.??????. +??????????????? ??????????????? + + +ad +???. +??????????????? + + + +sun + +1 + + + + +??????. +??????????????? +??????. +??????????????? +2 + + + + + + + + + +????????? +????????? +???????????? ????????? ????????? +???????????? ????????? ????????? +???????????? ????????? ????????? +???????????? ????????? ????????? +??????????????? +????????????????????? +???????????? ??????????????? +???????????? ??????????????? +???????????? ??????????????? +???????????? ??????????????? + + + + + + + + + + + + + + + Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1907 retrieving revision 1.1908 diff -u -p -r1.1907 -r1.1908 --- openoffice.org.spec 5 May 2009 13:05:27 -0000 1.1907 +++ openoffice.org.spec 5 May 2009 13:36:12 -0000 1.1908 @@ -140,6 +140,7 @@ Patch64: openoffice.org-3.1.0.ooo101379. Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch Patch67: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch +Patch68: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1638,6 +1639,7 @@ cat %{PATCH11} >> svtools/source/dialogs %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch %patch66 -p0 -b .ooo100469.sal.ia64_arm.patch %patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch +%patch68 -p0 -b .ooo101567.i18npool.mailocaledata.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4136,6 +4138,8 @@ fi * Tue May 05 2009 Caol??n McNamara - 1:3.1.0-11.3 - add in the ia64 and arm fixes for the secondary arch people - Resolves(partially): rhbz#495901 No default font-width for wmf export +- ooo#101567 add Maithili locale data (some dodgy negative value and + listseperator though) * Tue Apr 27 2009 Caol??n McNamara - 1:3.1.0-11.2 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch From caolanm at fedoraproject.org Tue May 5 13:36:42 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 5 May 2009 13:36:42 +0000 (UTC) Subject: rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch, NONE, 1.1 openoffice.org.spec, 1.1906, 1.1907 Message-ID: <20090505133642.C371D70108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1445/F-11 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch Log Message: Resolves: ooo#101567 add Maithili locale data openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch: --- NEW FILE openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch --- diff -ru i18npool.orig/source/localedata/data/makefile.mk i18npool/source/localedata/data/makefile.mk --- i18npool.orig/source/localedata/data/makefile.mk 2009-05-05 14:17:18.000000000 +0100 +++ i18npool/source/localedata/data/makefile.mk 2009-05-05 14:18:03.000000000 +0100 @@ -177,6 +177,7 @@ $(MISC)$/localedata_lo_LA.cxx \ $(MISC)$/localedata_lt_LT.cxx \ $(MISC)$/localedata_lv_LV.cxx \ + $(MISC)$/localedata_mai_IN.cxx \ $(MISC)$/localedata_mk_MK.cxx \ $(MISC)$/localedata_ml_IN.cxx \ $(MISC)$/localedata_mn_MN.cxx \ @@ -362,6 +363,7 @@ $(SLO)$/localedata_lb_LU.obj \ $(SLO)$/localedata_lt_LT.obj \ $(SLO)$/localedata_lv_LV.obj \ + $(SLO)$/localedata_mai_IN.obj \ $(SLO)$/localedata_mk_MK.obj \ $(SLO)$/localedata_mt_MT.obj \ $(SLO)$/localedata_nb_NO.obj \ --- /dev/null 2009-04-24 16:10:37.781015686 +0100 +++ i18npool/source/localedata/data/mai_IN.xml 2009-05-05 14:31:17.000000000 +0100 @@ -0,0 +1,357 @@ + + + + + +mai +Maithili + + +IN +India + + + + +. +, +. +: +. +, +, +, + + + + +??? +??? +??? +??? + +??????????????????????????? +????????????????????? +metric + + + +General + + +0 + + +0.00 + + +#,##0 + + +#,##0.00 + + +#,###.00 + + +0.00E+00 + + +0.00E+000 + + +0% + + +0.00% + + +[CURRENCY]#,##0;([CURRENCY]#,##0) + + +[CURRENCY]#,##0.00;([CURRENCY]#,##0.00) + + +[CURRENCY]#,##0;[RED]([CURRENCY]#,##0) + + +[CURRENCY]#,##0.00;[RED]([CURRENCY]#,##0.00) + + +CCC#,##0.00 + + +[CURRENCY]#,##0.--;[RED]([CURRENCY]#,##0.--) + + +D.MM.YY + + +NNNNDD, MMMM YYYY + + +DD.MM.YY + + +DD.MM.YYYY + + +D, MMM YY + + +D, MMM YYYY + + +D, MMM YYYY + + +D, MMMM YYYY + + +D, MMMM YY + + +NN, DD.MMM.YY + + +NN, D, MMM YY + + +NN, D, MMMM YYYY + + +NNNND, MMMM YYYY + + +MM.DD + + +YY-MM-DD +ISO 8601 + + +YYYY-MM-DD +ISO 8601 + + +MM.YY + + +MMM.DD + + +MMMM + + +QQ YY + + +WW + + +HH:MM + + +HH:MM:SS + + +HH:MM AM/PM + + +HH:MM:SS AM/PM + + +[HH]:MM:SS + + +MM:SS.00 + + +[HH]:MM:SS.00 + + +DD.MM.YY HH:MM + + +DD.MM.YYYY HH:MM:SS AM/PM + + + + + +IGNORE_CASE + + + + +IGNORE_CASE + + + +???-??? +14 +???.??????. +???.??????. + + + + + +sun +????????? +?????????????????? + + +mon +????????? +?????????????????? + + +tue +???????????? +????????????????????? + + +wed +????????? +?????????????????? + + +thu +???????????? +????????????????????? + + +fri +??????????????? +???????????????????????? + + +sat +????????? +?????????????????? + + + + +jan +?????? +??????????????? + + +feb +?????? +??????????????? + + +mar +??????????????? +??????????????? + + +apr +??????????????? +?????????????????? + + +may +?????? +?????? + + +jun +????????? +????????? + + +jul +???????????? +??????????????? + + +aug +?????? +??????????????? + + +sep +????????? +????????????????????? + + +oct +??????????????? +????????????????????? + + +nov +?????? +?????????????????? + + +dec +????????? +????????????????????? + + + + +bc +???.??????. +??????????????? ??????????????? + + +ad +???. +??????????????? + + + +sun + +1 + + + + +??????. +??????????????? +??????. +??????????????? +2 + + + + + + + + + +????????? +????????? +???????????? ????????? ????????? +???????????? ????????? ????????? +???????????? ????????? ????????? +???????????? ????????? ????????? +??????????????? +????????????????????? +???????????? ??????????????? +???????????? ??????????????? +???????????? ??????????????? +???????????? ??????????????? + + + + + + + + + + + + + + + Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v retrieving revision 1.1906 retrieving revision 1.1907 diff -u -p -r1.1906 -r1.1907 --- openoffice.org.spec 5 May 2009 13:05:25 -0000 1.1906 +++ openoffice.org.spec 5 May 2009 13:36:12 -0000 1.1907 @@ -140,6 +140,7 @@ Patch64: openoffice.org-3.1.0.ooo101379. Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch Patch67: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch +Patch68: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1638,6 +1639,7 @@ cat %{PATCH11} >> svtools/source/dialogs %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch %patch66 -p0 -b .ooo100469.sal.ia64_arm.patch %patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch +%patch68 -p0 -b .ooo101567.i18npool.mailocaledata.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4136,6 +4138,8 @@ fi * Tue May 05 2009 Caol??n McNamara - 1:3.1.0-11.3 - add in the ia64 and arm fixes for the secondary arch people - Resolves(partially): rhbz#495901 No default font-width for wmf export +- ooo#101567 add Maithili locale data (some dodgy negative value and + listseperator though) * Tue Apr 27 2009 Caol??n McNamara - 1:3.1.0-11.2 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch From berrange at fedoraproject.org Tue May 5 13:38:57 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 5 May 2009 13:38:57 +0000 (UTC) Subject: rpms/libvirt/devel libvirt-0.6.3-shared-readonly-label.patch, NONE, 1.1 libvirt.spec, 1.127, 1.128 Message-ID: <20090505133857.2892270108@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1851 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-shared-readonly-label.patch Log Message: Fix readonly/shared disk image labelling (rhbz #493692) libvirt-0.6.3-shared-readonly-label.patch: --- NEW FILE libvirt-0.6.3-shared-readonly-label.patch --- diff -rup libvirt-0.6.2/src/security_selinux.c libvirt-0.6.2.new/src/security_selinux.c --- libvirt-0.6.2/src/security_selinux.c 2009-04-03 15:36:56.000000000 +0100 +++ libvirt-0.6.2.new/src/security_selinux.c 2009-05-05 13:39:42.000000000 +0100 @@ -24,11 +24,12 @@ #include "virterror_internal.h" #include "util.h" #include "memory.h" - +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_SECURITY static char default_domain_context[1024]; +static char default_content_context[1024]; static char default_image_context[1024]; #define SECURITY_SELINUX_VOID_DOI "0" #define SECURITY_SELINUX_NAME "selinux" @@ -148,8 +149,13 @@ SELinuxInitialize(virConnectPtr conn) close(fd); ptr = strchrnul(default_image_context, '\n'); - *ptr = '\0'; - + if (*ptr == '\n') { + *ptr = '\0'; + strcpy(default_content_context, ptr+1); + ptr = strchrnul(default_content_context, '\n'); + if (*ptr == '\n') + *ptr = '\0'; + } return 0; } @@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, co { char ebuf[1024]; + VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon); + if(setfilecon(path, tcon) < 0) { virSecurityReportError(conn, VIR_ERR_ERROR, _("%s: unable to set security context " @@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConn char *newpath = NULL; const char *path = disk->src; + /* Don't restore labels on readoly/shared disks, because + * other VMs may still be accessing these */ if (disk->readonly || disk->shared) return 0; @@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectP { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (secdef->imagelabel) + if (disk->shared) { + return SELinuxSetFilecon(conn, disk->src, default_image_context); + } else if (disk->readonly) { + return SELinuxSetFilecon(conn, disk->src, default_content_context); + } else if (secdef->imagelabel) { return SELinuxSetFilecon(conn, disk->src, secdef->imagelabel); + } return 0; } @@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr co if (secdef->imagelabel) { for (i = 0 ; i < vm->def->ndisks ; i++) { - if (vm->def->disks[i]->readonly || - vm->def->disks[i]->shared) continue; - if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0) return -1; } Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -p -r1.127 -r1.128 --- libvirt.spec 28 Apr 2009 10:53:22 -0000 1.127 +++ libvirt.spec 5 May 2009 13:38:26 -0000 1.128 @@ -55,13 +55,14 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream # N/A +Patch1: libvirt-0.6.3-shared-readonly-label.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -215,6 +216,7 @@ of recent versions of Linux (and other O %prep %setup -q +%patch1 -p1 %patch200 -p0 @@ -545,6 +547,9 @@ fi %endif %changelog +* Tue May 5 2009 Daniel Berrange - 0.6.3-4.fc12 +- Fix readonly/shared disk image labelling (rhbz #493692) + * Tue Apr 28 2009 Daniel Veillard - 0.6.3-3.fc12 - was also missing /usr/share/gtk-doc/html/libvirt in -devel From hadess at fedoraproject.org Tue May 5 13:53:50 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 5 May 2009 13:53:50 +0000 (UTC) Subject: rpms/bluez/devel bluez-socket-mobile-cf-connection-kit.patch, NONE, 1.1 bluez.spec, 1.62, 1.63 Message-ID: <20090505135350.A3BCF70108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3397 Modified Files: bluez.spec Added Files: bluez-socket-mobile-cf-connection-kit.patch Log Message: * Tue May 05 2009 Bastien Nocera 4.38-2 - Add patch to activate the Socket Mobile CF kit (#498756) bluez-socket-mobile-cf-connection-kit.patch: --- NEW FILE bluez-socket-mobile-cf-connection-kit.patch --- diff --git a/scripts/bluetooth.rules b/scripts/bluetooth.rules index 072335f..f6284ff 100644 --- a/scripts/bluetooth.rules +++ b/scripts/bluetooth.rules @@ -33,3 +33,7 @@ SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="PCMCIA", ATTRS{prod_id # CC&C BT0100M SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Bluetooth BT0100M", ENV{HCIOPTS}="bcsp 115200", RUN+="bluetooth_serial" + +# SocketMobile CF Connection Kit +SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Socket", ATTRS{prod_id2}=="CF+ Personal Network Card Rev 2.5", ENV{HCIOPTS}="socket", RUN+="bluetooth_serial" + Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- bluez.spec 4 May 2009 11:46:00 -0000 1.62 +++ bluez.spec 5 May 2009 13:53:20 -0000 1.63 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.38 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -19,6 +19,8 @@ Patch1: bluez-utils-oui-usage.patch Patch2: bluez-try-utf8-harder.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/1754 Patch3: bluez-activate-wacom-mode2.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=498756 +Patch4: bluez-socket-mobile-cf-connection-kit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -116,6 +118,7 @@ This includes hidd, dund and pand. %patch1 -p0 -b .oui %patch2 -p1 -b .non-utf8-name %patch3 -p1 -b .wacom +%patch4 -p1 -b .socket-mobile %build %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund @@ -251,6 +254,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/pand %changelog +* Tue May 05 2009 Bastien Nocera 4.38-2 +- Add patch to activate the Socket Mobile CF kit (#498756) + * Mon May 04 2009 Bastien Nocera 4.38-1 - Update to 4.38 From rdieter at fedoraproject.org Tue May 5 13:58:57 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 5 May 2009 13:58:57 +0000 (UTC) Subject: rpms/ktorrent/devel ktorrent-3.2.1-kdebug#188447.patch, NONE, 1.1 ktorrent.spec, 1.96, 1.97 Message-ID: <20090505135857.2420170108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/ktorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4745/devel Modified Files: ktorrent.spec Added Files: ktorrent-3.2.1-kdebug#188447.patch Log Message: * Tue May 05 2009 Rex Dieter - 3.2.1-3 - crash adjusting speed from systray (kdebug#188447, rhbz#499147) ktorrent-3.2.1-kdebug#188447.patch: --- NEW FILE ktorrent-3.2.1-kdebug#188447.patch --- --- branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp 2009/02/01 09:23:03 919524 +++ branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp 2009/04/06 11:34:48 949983 @@ -360,8 +360,6 @@ net::SocketMonitor::setDownloadCap(Settings::maxDownloadRate()*1024); } Settings::self()->writeConfig(); - - update(); } } Index: ktorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -p -r1.96 -r1.97 --- ktorrent.spec 29 Apr 2009 23:53:38 -0000 1.96 +++ ktorrent.spec 5 May 2009 13:58:26 -0000 1.97 @@ -3,7 +3,7 @@ Name: ktorrent Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A BitTorrent program Group: Applications/Internet License: GPLv2+ @@ -11,6 +11,10 @@ URL: http://ktorrent.org/ Source0: http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +## upstream patches +# http://websvn.kde.org/branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp?r1=919524&r2=949983&pathrev=949983&view=patch +Patch100: ktorrent-3.2.1-kdebug#188447.patch + BuildRequires: avahi-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -46,6 +50,8 @@ The headers and libraries used for devel %prep %setup -q +%patch100 -p5 -b .kdebug#188447 + %build mkdir -p %{_target_platform} pushd %{_target_platform} @@ -127,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake %changelog +* Tue May 05 2009 Rex Dieter - 3.2.1-3 +- crash adjusting speed from systray (kdebug#188447, rhbz#499147) + * Wed Apr 29 2009 Rex Dieter - 3.2.1-2 - -DWITH_SYSTEM_GEOIP=1 From rdieter at fedoraproject.org Tue May 5 13:58:56 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 5 May 2009 13:58:56 +0000 (UTC) Subject: rpms/ktorrent/F-11 ktorrent-3.2.1-kdebug#188447.patch, NONE, 1.1 ktorrent.spec, 1.95, 1.96 Message-ID: <20090505135857.01FE670108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/ktorrent/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4745/F-11 Modified Files: ktorrent.spec Added Files: ktorrent-3.2.1-kdebug#188447.patch Log Message: * Tue May 05 2009 Rex Dieter - 3.2.1-3 - crash adjusting speed from systray (kdebug#188447, rhbz#499147) ktorrent-3.2.1-kdebug#188447.patch: --- NEW FILE ktorrent-3.2.1-kdebug#188447.patch --- --- branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp 2009/02/01 09:23:03 919524 +++ branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp 2009/04/06 11:34:48 949983 @@ -360,8 +360,6 @@ net::SocketMonitor::setDownloadCap(Settings::maxDownloadRate()*1024); } Settings::self()->writeConfig(); - - update(); } } Index: ktorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/ktorrent/F-11/ktorrent.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -p -r1.95 -r1.96 --- ktorrent.spec 10 Apr 2009 13:46:53 -0000 1.95 +++ ktorrent.spec 5 May 2009 13:58:26 -0000 1.96 @@ -3,7 +3,7 @@ Name: ktorrent Version: 3.2.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: A BitTorrent program Group: Applications/Internet License: GPLv2+ @@ -11,11 +11,16 @@ URL: http://ktorrent.org/ Source0: http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +## upstream patches +# http://websvn.kde.org/branches/stable/extragear-kde4/network/ktorrent/ktorrent/trayicon.cpp?r1=919524&r2=949983&pathrev=949983&view=patch +Patch100: ktorrent-3.2.1-kdebug#188447.patch + BuildRequires: avahi-devel BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gmp-devel +BuildRequires: GeoIP-devel # libtaskmanager support BuildRequires: kdebase-workspace-devel BuildRequires: kdelibs4-devel >= 4.2.0 @@ -26,7 +31,7 @@ BuildRequires: taglib-devel %global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) -Requires: kdelibs4 >= %{kdelibs4_ver} +Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver} %description KTorrent is a BitTorrent program for KDE. Its main features are native KDE @@ -45,10 +50,14 @@ The headers and libraries used for devel %prep %setup -q +%patch100 -p5 -b .kdebug#188447 + %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kde4} \ + -DWITH_SYSTEM_GEOIP=1 \ + .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -124,6 +133,12 @@ rm -rf $RPM_BUILD_ROOT %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake %changelog +* Tue May 05 2009 Rex Dieter - 3.2.1-3 +- crash adjusting speed from systray (kdebug#188447, rhbz#499147) + +* Wed Apr 29 2009 Rex Dieter - 3.2.1-2 +- -DWITH_SYSTEM_GEOIP=1 + * Mon Apr 06 2009 Rex Dieter - 3.2.1-1 - ktorrent-3.2.1 - optimize scriptlets From mhlavink at fedoraproject.org Tue May 5 14:02:06 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 5 May 2009 14:02:06 +0000 (UTC) Subject: rpms/ecryptfs-utils/F-10 ecryptfs-utils-74-build.patch, NONE, 1.1 ecryptfs-utils-75-werror.patch, NONE, 1.1 ecryptfs-utils.spec, 1.33, 1.34 sources, 1.21, 1.22 Message-ID: <20090505140206.8573870108@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ecryptfs-utils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5180 Modified Files: ecryptfs-utils.spec sources Added Files: ecryptfs-utils-74-build.patch ecryptfs-utils-75-werror.patch Log Message: update to v. 75 ecryptfs-utils-74-build.patch: --- NEW FILE ecryptfs-utils-74-build.patch --- diff -up ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 ecryptfs-utils-74/src/libecryptfs/Makefile.am --- ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 2009-04-20 11:03:03.000000000 +0200 +++ ecryptfs-utils-74/src/libecryptfs/Makefile.am 2009-04-23 17:03:16.178703120 +0200 @@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil lib_LTLIBRARIES = libecryptfs.la +noinst_LIBRARIES = libecryptfs.a + pkgconfig_DATA = libecryptfs.pc libecryptfs_la_SOURCES = \ @@ -20,10 +22,13 @@ libecryptfs_la_SOURCES = \ ecryptfs-stat.c \ $(top_srcdir)/src/key_mod/ecryptfs_key_mod_passphrase.c +libecryptfs_a_SOURCES = $(libecryptfs_la_SOURCES) + libecryptfs_la_LDFLAGS = \ -version-info @LIBECRYPTFS_LT_CURRENT@:@LIBECRYPTFS_LT_REVISION@:@LIBECRYPTFS_LT_AGE@ \ -no-undefined libecryptfs_la_CFLAGS = $(AM_CFLAGS) $(CRYPTO_CFLAGS) $(KEYUTILS_CFLAGS) +libecryptfs_a_CFLAGS = $(libecryptfs_la_CFLAGS) libecryptfs_la_LIBADD = $(CRYPTO_LIBS) $(KEYUTILS_LIBS) splint: diff -up ecryptfs-utils-74/src/utils/Makefile.am.486139 ecryptfs-utils-74/src/utils/Makefile.am --- ecryptfs-utils-74/src/utils/Makefile.am.486139 2009-04-20 11:03:03.000000000 +0200 +++ ecryptfs-utils-74/src/utils/Makefile.am 2009-04-23 17:12:38.297756365 +0200 @@ -35,12 +35,12 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) umount_ecryptfs_SOURCES = umount.ecryptfs.c umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) -umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la +umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.a $(KEYUTILS_LIBS) $(CRYPTO_LIBS) ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS) ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) ecryptfs_wrap_passphrase_SOURCES = ecryptfs_wrap_passphrase.c -ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la +ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la ecryptfs_unwrap_passphrase_SOURCES = ecryptfs_unwrap_passphrase.c ecryptfs_unwrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la ecryptfs_insert_wrapped_passphrase_into_keyring_SOURCES = ecryptfs_insert_wrapped_passphrase_into_keyring.c ecryptfs-utils-75-werror.patch: --- NEW FILE ecryptfs-utils-75-werror.patch --- diff -up ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c --- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror 2009-03-05 22:17:36.000000000 +0100 +++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c 2009-05-05 14:16:47.965159244 +0200 @@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_ if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES + 4)) { - printf("%s: Invalid metadata size; must have at least [%lu] " + printf("%s: Invalid metadata size; must have at least [%zu] " "bytes; there are only [%zu] bytes\n", __FUNCTION__, (ECRYPTFS_FILE_SIZE_BYTES + MAGIC_ECRYPTFS_MARKER_SIZE_BYTES diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c --- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror 2009-05-01 00:53:13.000000000 +0200 +++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-05 13:57:18.142095484 +0200 @@ -18,6 +18,7 @@ * 02111-1307, USA. */ +#include "config.h" #include #ifdef ENABLE_NSS #include @@ -39,7 +40,6 @@ #include #include #include -#include "config.h" #include "../include/ecryptfs.h" #ifndef ENOKEY diff -up ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c --- ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror 2009-04-30 23:40:12.000000000 +0200 +++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c 2009-05-05 13:57:18.142095484 +0200 @@ -42,31 +42,6 @@ #define PRIVATE_DIR "Private" -static void error(const char *msg) -{ - syslog(LOG_ERR, "errno = [%i]; strerror = [%m]\n", errno); - switch (errno) { - case ENOKEY: - syslog(LOG_ERR, "%s: Requested key not available\n", msg); - return; - - case EKEYEXPIRED: - syslog(LOG_ERR, "%s: Key has expired\n", msg); - return; - - case EKEYREVOKED: - syslog(LOG_ERR, "%s: Key has been revoked\n", msg); - return; - - case EKEYREJECTED: - syslog(LOG_ERR, "%s: Key was rejected by service\n", msg); - return; - default: - syslog(LOG_ERR, "%s: Unknown key error\n", msg); - return; - } -} - /* returns: 0 for pam automounting not set, 1 for set, <0 for error */ static int ecryptfs_pam_automount_set(const char *homedir) { @@ -249,8 +224,6 @@ static int private_dir(pam_handle_t *pam char *autoumount = "auto-umount"; struct stat s; pid_t pid; - struct utmp *u; - int count = 0; if ((pwd = fetch_pwd(pamh)) == NULL) { /* fetch_pwd() logged a message */ @@ -297,7 +270,7 @@ static int private_dir(pam_handle_t *pam if (stat(recorded, &s) != 0 && stat("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", &s) == 0) { /* User has not recorded their passphrase */ unlink("/var/lib/update-notifier/user.d/ecryptfs-record-passphrase"); - symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase"); + rc = symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase"); fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666); close(fd); } @@ -390,7 +363,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand } } else { syslog(LOG_ERR, "Error getting passwd info for user [%s]; " - "rc = [%ld]\n", username, rc); + "rc = [%d]\n", username, rc); goto out; } saved_uid = geteuid(); diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c --- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror 2009-05-01 01:04:38.000000000 +0200 +++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c 2009-05-05 13:57:18.142095484 +0200 @@ -42,7 +42,6 @@ int main(int argc, char *argv[]) char *wrapping_passphrase; char salt[ECRYPTFS_SALT_SIZE]; char salt_hex[ECRYPTFS_SALT_SIZE_HEX]; - struct passwd *pwd; int rc = 0; if (argc == 1) { Index: ecryptfs-utils.spec =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- ecryptfs-utils.spec 21 Mar 2009 07:30:45 -0000 1.33 +++ ecryptfs-utils.spec 5 May 2009 14:01:36 -0000 1.34 @@ -2,19 +2,25 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: ecryptfs-utils -Version: 73 +Version: 75 Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ URL: https://launchpad.net/ecryptfs -Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz -Source1: http://bazaar.launchpad.net/%7Eecryptfs/ecryptfs/ecryptfs-utils/annotate/head%3A/src/desktop/ecryptfs-mount-private.desktop +Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz + +#fix wrong Makefile for umount.ecryptfs +Patch2: ecryptfs-utils-74-build.patch + +#allow building with -Werror +#required for ecryptfs-utils <= 75 +Patch4: ecryptfs-utils-75-werror.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: keyutils BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel -BuildRequires: trousers-devel python python-devel nss-devel desktop-file-utils -Conflicts: kernel < 2.6.19 +BuildRequires: trousers-devel nss-devel desktop-file-utils %description eCryptfs is a stacked cryptographic filesystem that ships in Linux @@ -28,6 +34,7 @@ Install ecryptfs-utils if you would like Summary: The eCryptfs userspace development package Group: System Environment/Base Requires: keyutils-libs-devel %{name} = %{version}-%{release} +Requires: pkgconfig %description devel Userspace development files for eCryptfs. @@ -36,6 +43,7 @@ Userspace development files for eCryptfs Summary: Python bindings for the eCryptfs utils Group: System Environment/Base Requires: ecryptfs-utils %{name} = %{version}-%{release} +BuildRequires: python python-devel swig >= 1.3.31 %description python The ecryptfs-utils-python package contains a module that permits @@ -44,23 +52,37 @@ the interface supplied by the ecryptfs-u %prep %setup -q +%patch2 -p1 -b .build +%patch4 -p1 -b .werror %build -%configure --disable-rpath --enable-tspi --enable-nss +export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror" +%configure --disable-rpath --enable-tspi --enable-nss --enable-static +make clean #disable rpath 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 + +#remove -Werror flag for swig temporarily (swig is nasty #496613) +sed -i 's|-Werror||' src/libecryptfs-swig/Makefile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +find $RPM_BUILD_ROOT%{_libdir}/ -name '*.a' | xargs rm -f find $RPM_BUILD_ROOT%{_libdir}/ -name '*.la' | xargs rm -f -mv $RPM_BUILD_ROOT/%{_libdir}/libecryptfs.so* $RPM_BUILD_ROOT/%{_lib} rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} -install -D -m 644 doc/ecryptfs-mount-private.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.txt -desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/%{name} %{SOURCE1} +#install files Makefile forgot install +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-setup-private.desktop +touch -r src/desktop/ecryptfs-mount-private.desktop \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +touch -r src/desktop/ecryptfs-setup-private.desktop \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-record-passphrase %post -p /sbin/ldconfig @@ -74,10 +96,10 @@ rm -rf $RPM_BUILD_ROOT %doc README COPYING AUTHORS NEWS THANKS %doc doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt %doc doc/ecryptfs-pkcs11-helper-doc.txt -%attr(4755,root,root) /sbin/mount.ecryptfs -%attr(4755,root,root) /sbin/umount.ecryptfs +/sbin/mount.ecryptfs +/sbin/umount.ecryptfs %attr(4755,root,root) /sbin/mount.ecryptfs_private -%attr(4755,root,root) /sbin/umount.ecryptfs_private +/sbin/umount.ecryptfs_private %{_bindir}/ecryptfs-manager %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring %{_bindir}/ecryptfs-rewrap-passphrase @@ -92,13 +114,15 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ecryptfs-umount-private %{_bindir}/ecryptfs-stat %{_bindir}/ecryptfsd -/%{_lib}/libecryptfs.so.0.0.0 -/%{_lib}/libecryptfs.so.0 +%{_bindir}/ecryptfs-dot-private %{_libdir}/ecryptfs +%{_libdir}/libecryptfs.so.0 +%{_libdir}/libecryptfs.so.0.0.0 /%{_lib}/security/pam_ecryptfs.so %dir %{_datadir}/%{name} %{_datadir}/%{name}/ecryptfs-mount-private.txt %{_datadir}/%{name}/ecryptfs-mount-private.desktop +%{_datadir}/%{name}/ecryptfs-setup-private.desktop %{_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 @@ -119,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -/%{_lib}/libecryptfs.so +%{_libdir}/libecryptfs.so %{_libdir}/pkgconfig/libecryptfs.pc %{_includedir}/ecryptfs.h @@ -135,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Tue May 05 2009 Michal Hlavinka 75-1 +- updated to 75 + * Sat Mar 21 2009 Michal Hlavinka 73-1 - updated to 73 - move libs from /usr/lib to /lib (#486139) Index: sources =================================================================== RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 21 Mar 2009 07:30:45 -0000 1.21 +++ sources 5 May 2009 14:01:36 -0000 1.22 @@ -1 +1 @@ -8e651749b9d75ee9a4d4894483022857 ecryptfs-utils_73.orig.tar.gz +2c4e8be38d1ea8cadd9f870f15430f07 ecryptfs-utils_75.orig.tar.gz From tmraz at fedoraproject.org Tue May 5 14:15:39 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Tue, 5 May 2009 14:15:39 +0000 (UTC) Subject: rpms/ipsec-tools/F-9 ipsec-tools-0.7.2-natt-linux.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 ipsec-tools.spec, 1.57, 1.58 sources, 1.13, 1.14 ipsec-tools-0.7.1-natt-linux.patch, 1.1, NONE Message-ID: <20090505141539.DEC3670108@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/ipsec-tools/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7144 Modified Files: .cvsignore ipsec-tools.spec sources Added Files: ipsec-tools-0.7.2-natt-linux.patch Removed Files: ipsec-tools-0.7.1-natt-linux.patch Log Message: * Tue May 5 2009 Tomas Mraz - 0.7.2-1 - Update to a new upstream version ipsec-tools-0.7.2-natt-linux.patch: --- NEW FILE ipsec-tools-0.7.2-natt-linux.patch --- diff -up ipsec-tools-0.7.2/src/racoon/isakmp_inf.c.natt-linux ipsec-tools-0.7.2/src/racoon/isakmp_inf.c --- ipsec-tools-0.7.2/src/racoon/isakmp_inf.c.natt-linux 2009-04-20 15:35:36.000000000 +0200 +++ ipsec-tools-0.7.2/src/racoon/isakmp_inf.c 2009-04-23 14:46:55.000000000 +0200 @@ -1144,7 +1144,6 @@ purge_ipsec_spi(dst0, proto, spi, n) caddr_t mhp[SADB_EXT_MAX + 1]; #ifdef ENABLE_NATT struct sadb_x_nat_t_type *natt_type; - struct sadb_x_nat_t_port *natt_port; #endif plog(LLV_DEBUG2, LOCATION, NULL, @@ -1200,17 +1199,8 @@ purge_ipsec_spi(dst0, proto, spi, n) } #ifdef ENABLE_NATT natt_type = (void *)mhp[SADB_X_EXT_NAT_T_TYPE]; - if (natt_type && natt_type->sadb_x_nat_t_type_type) { - /* NAT-T is enabled for this SADB entry; copy - * the ports from NAT-T extensions */ - natt_port = (void *)mhp[SADB_X_EXT_NAT_T_SPORT]; - if (extract_port(src) == 0 && natt_port != NULL) - set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port)); - - natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT]; - if (extract_port(dst) == 0 && natt_port != NULL) - set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port)); - }else{ + if (natt_type == NULL || + ! natt_type->sadb_x_nat_t_type_type) { /* Force default UDP ports, so CMPSADDR will match SAs with NO encapsulation */ set_port(src, PORT_ISAKMP); diff -up ipsec-tools-0.7.2/src/racoon/pfkey.c.natt-linux ipsec-tools-0.7.2/src/racoon/pfkey.c --- ipsec-tools-0.7.2/src/racoon/pfkey.c.natt-linux 2009-04-23 14:40:08.000000000 +0200 +++ ipsec-tools-0.7.2/src/racoon/pfkey.c 2009-04-23 14:40:08.000000000 +0200 @@ -290,6 +290,13 @@ pfkey_dump_sadb(satype) struct sadb_msg *msg = NULL; size_t bl, ml; int len; +#if defined(__linux__) && defined(ENABLE_NATT) + caddr_t mhp[SADB_EXT_MAX + 1]; + struct sadb_sa *sa; + struct sockaddr *src, *dst; + struct sadb_x_nat_t_type *natt_type; + struct sadb_x_nat_t_port *natt_port; +#endif if ((s = privsep_pfkey_open()) < 0) { plog(LLV_ERROR, LOCATION, NULL, @@ -325,6 +332,45 @@ pfkey_dump_sadb(satype) continue; } +#if defined(__linux__) && defined(ENABLE_NATT) + /* + * NetBSD returns the NAT-T ports in the src and dst sockaddrs + * in addition to the SADB_X_EXT_NAT_T_*PORT structs. + * + * Linux only returns them in the SADB_X_EXT_NAT_T_*PORT + * structs. The racoon codebase is making the assumption that + * the NAT-T ports are reflected by the ports in the src and + * dst sockaddrs. We stick that information into those structs + * here to meet the assumptions elsewhere. + */ + if (pfkey_align(msg, mhp) || pfkey_check(mhp)) { + plog(LLV_ERROR, LOCATION, NULL, + "pfkey_check (%s)\n", ipsec_strerror()); + goto no_fixup; + } + + sa = (struct sadb_sa *)(mhp[SADB_EXT_SA]); + if (!sa || !mhp[SADB_EXT_ADDRESS_SRC] || !mhp[SADB_EXT_ADDRESS_DST]) { + goto no_fixup; + } + + src = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_SRC]); + dst = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_DST]); + + natt_type = (struct sadb_x_nat_t_type *)(mhp[SADB_X_EXT_NAT_T_TYPE]); + + if (natt_type && natt_type->sadb_x_nat_t_type_type) { + /* set the src and dst ports */ + natt_port = (struct sadb_x_nat_t_port *)(mhp[SADB_X_EXT_NAT_T_SPORT]); + if (natt_port != NULL && extract_port(src) == 0) + set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port)); + + natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT]; + if (natt_port != NULL && extract_port(dst) == 0) + set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port)); + } +no_fixup: +#endif /* __linux__ && ENABLE_NATT */ ml = msg->sadb_msg_len << 3; bl = buf ? buf->l : 0; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-9/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- .cvsignore 18 Oct 2008 11:51:31 -0000 1.13 +++ .cvsignore 5 May 2009 14:15:09 -0000 1.14 @@ -1 +1 @@ -ipsec-tools-0.7.1.tar.bz2 +ipsec-tools-0.7.2.tar.bz2 Index: ipsec-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-9/ipsec-tools.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- ipsec-tools.spec 10 Nov 2008 12:33:19 -0000 1.57 +++ ipsec-tools.spec 5 May 2009 14:15:09 -0000 1.58 @@ -1,6 +1,6 @@ Name: ipsec-tools -Version: 0.7.1 -Release: 6%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: Tools for configuring and using IPSEC License: BSD Group: System Environment/Base @@ -16,9 +16,8 @@ Patch4: ipsec-tools-0.7.1-loopback.patch Patch5: ipsec-tools-0.7-iface.patch Patch6: ipsec-tools-0.7-dupsplit.patch Patch9: ipsec-tools-0.7-splitcidr.patch -Patch10: ipsec-tools-0.7.1-natt-linux.patch +Patch10: ipsec-tools-0.7.2-natt-linux.patch Patch11: ipsec-tools-0.7.1-pie.patch -Patch12: ipsec-tools-0.7.1-leaks.patch Patch13: ipsec-tools-0.7.1-dpd-fixes.patch BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool @@ -44,7 +43,6 @@ package builds: %patch9 -p1 -b .splitcidr %patch10 -p1 -b .natt-linux %patch11 -p1 -b .pie -%patch12 -p1 -b .leaks %patch13 -p1 -b .dpd-fixes ./bootstrap @@ -124,6 +122,15 @@ fi %config(noreplace) /etc/racoon/racoon.conf %changelog +* Tue May 5 2009 Tomas Mraz - 0.7.2-1 +- Update to a new upstream version + +* Wed Feb 25 2009 Fedora Release Engineering - 0.7.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 15 2009 Tomas Mraz - 0.7.1-7 +- rebuild with new openssl + * Mon Nov 10 2008 Tomas Mraz - 0.7.1-6 - fix patch porting error in the dpd-fixes patch (#470575) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 18 Oct 2008 11:51:31 -0000 1.13 +++ sources 5 May 2009 14:15:09 -0000 1.14 @@ -1 +1 @@ -30b196a2829556182c39aed9f83c0bbf ipsec-tools-0.7.1.tar.bz2 +72861f005746ee27984b2ee715ecc629 ipsec-tools-0.7.2.tar.bz2 --- ipsec-tools-0.7.1-natt-linux.patch DELETED --- From hadess at fedoraproject.org Tue May 5 14:18:40 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 5 May 2009 14:18:40 +0000 (UTC) Subject: rpms/bluez/F-11 bluez-socket-mobile-cf-connection-kit.patch, NONE, 1.1 bluez.spec, 1.61, 1.62 Message-ID: <20090505141840.178AB70108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7633 Modified Files: bluez.spec Added Files: bluez-socket-mobile-cf-connection-kit.patch Log Message: * Tue May 05 2009 Bastien Nocera 4.38-1 - Add patch to activate the Socket Mobile CF kit (#498756) bluez-socket-mobile-cf-connection-kit.patch: --- NEW FILE bluez-socket-mobile-cf-connection-kit.patch --- diff --git a/scripts/bluetooth.rules b/scripts/bluetooth.rules index 072335f..f6284ff 100644 --- a/scripts/bluetooth.rules +++ b/scripts/bluetooth.rules @@ -33,3 +33,7 @@ SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="PCMCIA", ATTRS{prod_id # CC&C BT0100M SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Bluetooth BT0100M", ENV{HCIOPTS}="bcsp 115200", RUN+="bluetooth_serial" + +# SocketMobile CF Connection Kit +SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Socket", ATTRS{prod_id2}=="CF+ Personal Network Card Rev 2.5", ENV{HCIOPTS}="socket", RUN+="bluetooth_serial" + Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- bluez.spec 23 Apr 2009 13:01:47 -0000 1.61 +++ bluez.spec 5 May 2009 14:18:09 -0000 1.62 @@ -1,6 +1,6 @@ Summary: Bluetooth utilities Name: bluez -Version: 4.37 +Version: 4.38 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -14,6 +14,8 @@ Patch1: bluez-utils-oui-usage.patch Patch2: bluez-try-utf8-harder.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/1754 Patch3: bluez-activate-wacom-mode2.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=498756 +Patch4: bluez-socket-mobile-cf-connection-kit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -102,6 +104,7 @@ use in Bluetooth applications. %patch1 -p0 -b .oui %patch2 -p1 -b .non-utf8-name %patch3 -p1 -b .wacom +%patch4 -p1 -b .socket-mobile %build %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund @@ -195,6 +198,9 @@ fi %{_sysconfdir}/alsa/bluetooth.conf %changelog +* Tue May 05 2009 Bastien Nocera 4.38-1 +- Add patch to activate the Socket Mobile CF kit (#498756) + * Thu Apr 23 2009 - Bastien Nocera - 4.37-1 - Update to 4.37 From hadess at fedoraproject.org Tue May 5 14:29:37 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 5 May 2009 14:29:37 +0000 (UTC) Subject: rpms/bluez/F-11 bluez.spec,1.62,1.63 Message-ID: <20090505142937.4964670108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10356 Modified Files: bluez.spec Log Message: * Tue May 05 2009 Bastien Nocera 4.37-2 - Add patch to activate the Socket Mobile CF kit (#498756) Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- bluez.spec 5 May 2009 14:18:09 -0000 1.62 +++ bluez.spec 5 May 2009 14:29:06 -0000 1.63 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez -Version: 4.38 -Release: 1%{?dist} +Version: 4.37 +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -198,7 +198,7 @@ fi %{_sysconfdir}/alsa/bluetooth.conf %changelog -* Tue May 05 2009 Bastien Nocera 4.38-1 +* Tue May 05 2009 Bastien Nocera 4.37-2 - Add patch to activate the Socket Mobile CF kit (#498756) * Thu Apr 23 2009 - Bastien Nocera - 4.37-1 From rrakus at fedoraproject.org Tue May 5 14:32:45 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Tue, 5 May 2009 14:32:45 +0000 (UTC) Subject: rpms/system-config-kdump/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 system-config-kdump.spec, 1.8, 1.9 Message-ID: <20090505143245.51C3670108@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/system-config-kdump/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11193 Modified Files: .cvsignore sources system-config-kdump.spec Log Message: Bump to version 2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/system-config-kdump/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 9 Sep 2008 11:20:11 -0000 1.4 +++ .cvsignore 5 May 2009 14:32:14 -0000 1.5 @@ -1 +1 @@ -system-config-kdump-1.0.14.tar.bz2 +system-config-kdump-2.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/system-config-kdump/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 9 Sep 2008 11:20:11 -0000 1.4 +++ sources 5 May 2009 14:32:14 -0000 1.5 @@ -1 +1 @@ -92d526e53b588144d4740e199f42d113 system-config-kdump-1.0.14.tar.bz2 +fc0af839ac193056ca0295efc9026f4e system-config-kdump-2.0.0.tar.bz2 Index: system-config-kdump.spec =================================================================== RCS file: /cvs/extras/rpms/system-config-kdump/devel/system-config-kdump.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- system-config-kdump.spec 13 Apr 2009 19:48:57 -0000 1.8 +++ system-config-kdump.spec 5 May 2009 14:32:14 -0000 1.9 @@ -1,28 +1,26 @@ Summary: A graphical interface for configuring kernel crash dumping Name: system-config-kdump -Version: 1.0.14 -Release: 6%{?dist} -URL: http://fedora.redhat.com/projects/config-tools/ +Version: 2.0.0 +Release: 1%{?dist} +URL: http://fedorahosted.org/system-config-kdump/ License: GPLv2+ Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source0: %{name}-%{version}.tar.bz2 +Source0: http://fedorahosted.org/released/system-config-kdump/%{name}-%{version}.tar.bz2 ExcludeArch: s390 s390x BuildRequires: desktop-file-utils -BuildRequires: intltool, gettext +BuildRequires: intltool, gettext, gnome-doc-utils, docbook-dtds, rarian-compat, scrollkeeper Requires: pygtk2 >= 2.8.6 Requires: pygtk2-libglade Requires: usermode >= 1.36 Requires: rhpl >= 0.185-1 Requires: kexec-tools +Requires: bitmap-fonts +Requires: yelp Requires(pre): gtk2 >= 2.8.20 Requires(pre): hicolor-icon-theme -Patch1: s-c-kdump-1.0.14-reflect-current-settings.patch -Patch2: system-config-kdump-1.0.14-fedora.patch -Patch3: system-config-kdump-1.0.14-ommit-offset.patch -Patch4: system-config-kdump-1.0.14-off-by-one.patch -Patch5: system-config-kdump-1.0.14-error-handling.patch + %description system-config-kdump is a graphical tool for configuring kernel crash @@ -30,11 +28,6 @@ dumping via kdump and kexec. %prep %setup -q -%patch1 -p1 -b .reflect -%patch2 -p1 -b .fedora -%patch3 -p1 -b .ommit-offset -%patch4 -p1 -b .off-by-one -%patch5 -p1 -b .error-handling %build make @@ -59,12 +52,16 @@ touch --no-create %{_datadir}/icons/hico if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi +%{_bindir}/scrollkeeper-update -q || : + %post touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi +%{_bindir}/scrollkeeper-update -q || : + %files -f %{name}.lang @@ -74,10 +71,21 @@ fi %{_datadir}/applications/* %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-kdump %config(noreplace) %{_sysconfdir}/pam.d/system-config-kdump + +%{_sysconfdir}/dbus-1/system.d/org.fedoraproject.systemconfig.kdump.mechanism.conf +%{_datadir}/dbus-1/system-services/org.fedoraproject.systemconfig.kdump.mechanism.service +%{_datadir}/PolicyKit/policy/org.fedoraproject.systemconfig.kdump.policy + %{_datadir}/icons/hicolor/48x48/apps/system-config-kdump.png + %doc ChangeLog COPYING +%doc %{_datadir}/gnome/help/system-config-kdump +%doc %{_datadir}/omf/system-config-kdump %changelog +* Tue May 05 2009 Roman Rakus - 2.0.0-1 +- Changed to satisfy system config tools clenaup + * Mon Apr 13 2009 Lubomir Rintel - 1.0.14-6 - Improve error handling when applying settings From corsepiu at fedoraproject.org Tue May 5 14:41:56 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Tue, 5 May 2009 14:41:56 +0000 (UTC) Subject: rpms/perl-Test-MinimumVersion/devel .cvsignore, 1.3, 1.4 perl-Test-MinimumVersion.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <20090505144156.ED71A70108@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Test-MinimumVersion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12684 Modified Files: .cvsignore perl-Test-MinimumVersion.spec sources Log Message: * Tue May 05 2009 Ralf Cors??pius - 0.009-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 26 May 2008 03:46:17 -0000 1.3 +++ .cvsignore 5 May 2009 14:41:26 -0000 1.4 @@ -1 +1 @@ -Test-MinimumVersion-0.008.tar.gz +Test-MinimumVersion-0.009.tar.gz Index: perl-Test-MinimumVersion.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/devel/perl-Test-MinimumVersion.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- perl-Test-MinimumVersion.spec 27 Feb 2009 02:37:01 -0000 1.7 +++ perl-Test-MinimumVersion.spec 5 May 2009 14:41:26 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Test-MinimumVersion -Version: 0.008 -Release: 2%{?dist} +Version: 0.009 +Release: 1%{?dist} Summary: Check whether your code requires a newer perl License: GPL+ or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`% BuildArch: noarch BuildRequires: perl(File::Find::Rule::Perl) -BuildRequires: perl(Perl::MinimumVersion) >= 0.14 +BuildRequires: perl(Perl::MinimumVersion) >= 1.20 # For improved tests BuildRequires: perl(Test::Pod) >= 1.00 @@ -49,6 +49,9 @@ make test %{_mandir}/man3/* %changelog +* Tue May 05 2009 Ralf Cors??pius - 0.009-1 +- Upstream update. + * Thu Feb 26 2009 Fedora Release Engineering - 0.008-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 26 May 2008 03:46:17 -0000 1.3 +++ sources 5 May 2009 14:41:26 -0000 1.4 @@ -1 +1 @@ -72d97499be7c40e5a8481998f774899d Test-MinimumVersion-0.008.tar.gz +aafd481f0498f84da52c0fd6c625e430 Test-MinimumVersion-0.009.tar.gz From spot at fedoraproject.org Tue May 5 14:43:25 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 5 May 2009 14:43:25 +0000 (UTC) Subject: rpms/perl-Email-MIME-Encodings/F-11 perl-Email-MIME-Encodings.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <20090505144325.4972870108@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833/F-11 Modified Files: perl-Email-MIME-Encodings.spec sources Log Message: 1.313 Index: perl-Email-MIME-Encodings.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-11/perl-Email-MIME-Encodings.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- perl-Email-MIME-Encodings.spec 13 Mar 2009 19:24:53 -0000 1.9 +++ perl-Email-MIME-Encodings.spec 5 May 2009 14:42:54 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Email-MIME-Encodings -Version: 1.312 +Version: 1.313 Release: 1%{?dist} Summary: Unified interface to MIME encoding and decoding @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 5 2009 Tom "spot" Callaway - 1.313-1 +- update to 1.313 + * Fri Mar 13 2009 Tom "spot" Callaway - 1.312-1 - update to 1.312 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Mar 2009 19:24:53 -0000 1.5 +++ sources 5 May 2009 14:42:54 -0000 1.6 @@ -1 +1 @@ -3e90a4cfec420f6738faadd0f4c14261 Email-MIME-Encodings-1.312.tar.gz +f2580c816fb0c4b2a256540a385bf4fb Email-MIME-Encodings-1.313.tar.gz From spot at fedoraproject.org Tue May 5 14:43:25 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 5 May 2009 14:43:25 +0000 (UTC) Subject: rpms/perl-Email-MIME-Encodings/devel .cvsignore, 1.5, 1.6 perl-Email-MIME-Encodings.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <20090505144325.EF19E70108@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-MIME-Encodings/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833/devel Modified Files: .cvsignore perl-Email-MIME-Encodings.spec sources Log Message: 1.313 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Mar 2009 19:24:53 -0000 1.5 +++ .cvsignore 5 May 2009 14:42:55 -0000 1.6 @@ -1 +1 @@ -Email-MIME-Encodings-1.312.tar.gz +Email-MIME-Encodings-1.313.tar.gz Index: perl-Email-MIME-Encodings.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/devel/perl-Email-MIME-Encodings.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- perl-Email-MIME-Encodings.spec 13 Mar 2009 19:24:53 -0000 1.9 +++ perl-Email-MIME-Encodings.spec 5 May 2009 14:42:55 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Email-MIME-Encodings -Version: 1.312 +Version: 1.313 Release: 1%{?dist} Summary: Unified interface to MIME encoding and decoding @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 5 2009 Tom "spot" Callaway - 1.313-1 +- update to 1.313 + * Fri Mar 13 2009 Tom "spot" Callaway - 1.312-1 - update to 1.312 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 13 Mar 2009 19:24:53 -0000 1.5 +++ sources 5 May 2009 14:42:55 -0000 1.6 @@ -1 +1 @@ -3e90a4cfec420f6738faadd0f4c14261 Email-MIME-Encodings-1.312.tar.gz +f2580c816fb0c4b2a256540a385bf4fb Email-MIME-Encodings-1.313.tar.gz From spot at fedoraproject.org Tue May 5 14:43:24 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 5 May 2009 14:43:24 +0000 (UTC) Subject: rpms/perl-Email-MIME-Encodings/F-10 perl-Email-MIME-Encodings.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <20090505144324.DD58070108@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833/F-10 Modified Files: perl-Email-MIME-Encodings.spec sources Log Message: 1.313 Index: perl-Email-MIME-Encodings.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-10/perl-Email-MIME-Encodings.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- perl-Email-MIME-Encodings.spec 28 Feb 2008 13:11:22 -0000 1.7 +++ perl-Email-MIME-Encodings.spec 5 May 2009 14:42:54 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Email-MIME-Encodings -Version: 1.311 -Release: 3%{?dist} +Version: 1.313 +Release: 1%{?dist} Summary: Unified interface to MIME encoding and decoding Group: Development/Libraries @@ -55,6 +55,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 5 2009 Tom "spot" Callaway - 1.313-1 +- update to 1.313 + +* Fri Mar 13 2009 Tom "spot" Callaway - 1.312-1 +- update to 1.312 + +* Thu Feb 26 2009 Fedora Release Engineering - 1.311-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 27 2008 Tom "spot" Callaway - 1.311-3 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 23 Mar 2007 20:02:05 -0000 1.4 +++ sources 5 May 2009 14:42:54 -0000 1.5 @@ -1 +1 @@ -d64d9f712534e7ded4246b5ee49a2830 Email-MIME-Encodings-1.311.tar.gz +f2580c816fb0c4b2a256540a385bf4fb Email-MIME-Encodings-1.313.tar.gz From spot at fedoraproject.org Tue May 5 14:43:24 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 5 May 2009 14:43:24 +0000 (UTC) Subject: rpms/perl-Email-MIME-Encodings/EL-5 perl-Email-MIME-Encodings.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090505144324.9B88270108@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-MIME-Encodings/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833/EL-5 Modified Files: perl-Email-MIME-Encodings.spec sources Log Message: 1.313 Index: perl-Email-MIME-Encodings.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/EL-5/perl-Email-MIME-Encodings.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- perl-Email-MIME-Encodings.spec 19 Sep 2006 10:39:55 -0000 1.3 +++ perl-Email-MIME-Encodings.spec 5 May 2009 14:42:54 -0000 1.4 @@ -1,10 +1,10 @@ Name: perl-Email-MIME-Encodings -Version: 1.310 -Release: 2%{?dist} +Version: 1.313 +Release: 1%{?dist} Summary: Unified interface to MIME encoding and decoding Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Email-MIME-Encodings/ Source0: http://www.cpan.org/authors/id/R/RJ/RJBS/Email-MIME-Encodings-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -12,6 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildArch: noarch BuildRequires: perl(MIME::Base64) >= 3.05 BuildRequires: perl(MIME::QuotedPrint) >= 3.03 +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -33,7 +35,7 @@ make %{?_smp_mflags} 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 ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -53,6 +55,25 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 5 2009 Tom "spot" Callaway - 1.313-1 +- update to 1.313 + +* Fri Mar 13 2009 Tom "spot" Callaway - 1.312-1 +- update to 1.312 + +* Thu Feb 26 2009 Fedora Release Engineering - 1.311-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 27 2008 Tom "spot" Callaway - 1.311-3 +- Rebuild for perl 5.10 (again) + +* Sun Jan 20 2008 Tom "spot" Callaway - 1.311-2 +- rebuild for new perl + +* Fri Mar 23 2007 Jose Pedro Oliveira - 1.311-1 +- Update to 1.311. + +- New upstream maintainer. * Tue Sep 19 2006 Jose Pedro Oliveira - 1.310-2 - Bump release dir to tagging problems. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 19 Sep 2006 10:39:55 -0000 1.3 +++ sources 5 May 2009 14:42:54 -0000 1.4 @@ -1 +1 @@ -106fc2351d218a0f22b1746cca6d67b2 Email-MIME-Encodings-1.310.tar.gz +f2580c816fb0c4b2a256540a385bf4fb Email-MIME-Encodings-1.313.tar.gz From spot at fedoraproject.org Tue May 5 14:43:25 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 5 May 2009 14:43:25 +0000 (UTC) Subject: rpms/perl-Email-MIME-Encodings/F-9 perl-Email-MIME-Encodings.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <20090505144325.9BE4F70108@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833/F-9 Modified Files: perl-Email-MIME-Encodings.spec sources Log Message: 1.313 Index: perl-Email-MIME-Encodings.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-9/perl-Email-MIME-Encodings.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- perl-Email-MIME-Encodings.spec 28 Feb 2008 13:11:22 -0000 1.7 +++ perl-Email-MIME-Encodings.spec 5 May 2009 14:42:55 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Email-MIME-Encodings -Version: 1.311 -Release: 3%{?dist} +Version: 1.313 +Release: 1%{?dist} Summary: Unified interface to MIME encoding and decoding Group: Development/Libraries @@ -55,6 +55,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 5 2009 Tom "spot" Callaway - 1.313-1 +- update to 1.313 + +* Fri Mar 13 2009 Tom "spot" Callaway - 1.312-1 +- update to 1.312 + +* Thu Feb 26 2009 Fedora Release Engineering - 1.311-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 27 2008 Tom "spot" Callaway - 1.311-3 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 23 Mar 2007 20:02:05 -0000 1.4 +++ sources 5 May 2009 14:42:55 -0000 1.5 @@ -1 +1 @@ -d64d9f712534e7ded4246b5ee49a2830 Email-MIME-Encodings-1.311.tar.gz +f2580c816fb0c4b2a256540a385bf4fb Email-MIME-Encodings-1.313.tar.gz From dwalsh at fedoraproject.org Tue May 5 14:53:44 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 5 May 2009 14:53:44 +0000 (UTC) Subject: rpms/policycoreutils/F-11 policycoreutils-rhat.patch, 1.417, 1.418 policycoreutils.spec, 1.605, 1.606 Message-ID: <20090505145344.48C5A70108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14715 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue May 5 2009 Dan Walsh 2.0.62-12.2 - Fix fixfiles to handle btrfs policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-rhat.patch,v retrieving revision 1.417 retrieving revision 1.418 diff -u -p -r1.417 -r1.418 --- policycoreutils-rhat.patch 24 Apr 2009 17:57:46 -0000 1.417 +++ policycoreutils-rhat.patch 5 May 2009 14:53:42 -0000 1.418 @@ -1,7 +1,7 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.62/audit2allow/audit2allow ---- nsapolicycoreutils/audit2allow/audit2allow 2009-01-13 08:45:35.000000000 -0500 -+++ policycoreutils-2.0.62/audit2allow/audit2allow 2009-04-24 13:18:45.000000000 -0400 -@@ -126,6 +126,7 @@ +diff -up policycoreutils-2.0.62/audit2allow/audit2allow.rhat policycoreutils-2.0.62/audit2allow/audit2allow +--- policycoreutils-2.0.62/audit2allow/audit2allow.rhat 2009-02-18 16:45:01.000000000 -0500 ++++ policycoreutils-2.0.62/audit2allow/audit2allow 2009-05-05 10:49:02.000000000 -0400 +@@ -126,6 +126,7 @@ class AuditToPolicy: elif self.__options.audit: try: messages = audit.get_audit_msgs() @@ -9,120 +9,18 @@ diff --exclude-from=exclude --exclude=se except OSError, e: sys.stderr.write('could not run ausearch - "%s"\n' % str(e)) sys.exit(1) -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-2.0.62/debugfiles.list ---- nsapolicycoreutils/debugfiles.list 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.62/debugfiles.list 2009-04-03 14:13:23.000000000 -0400 -@@ -0,0 +1,64 @@ -+%dir /usr/lib/debug -+%dir /usr/lib/debug/sbin -+%dir /usr/lib/debug/.build-id -+%dir /usr/lib/debug/.build-id/3d -+%dir /usr/lib/debug/.build-id/ec -+%dir /usr/lib/debug/.build-id/9d -+%dir /usr/lib/debug/.build-id/cb -+%dir /usr/lib/debug/.build-id/bc -+%dir /usr/lib/debug/.build-id/0a -+%dir /usr/lib/debug/.build-id/81 -+%dir /usr/lib/debug/.build-id/ad -+%dir /usr/lib/debug/.build-id/7f -+%dir /usr/lib/debug/.build-id/f4 -+%dir /usr/lib/debug/.build-id/15 -+%dir /usr/lib/debug/.build-id/1d -+%dir /usr/lib/debug/.build-id/a8 -+%dir /usr/lib/debug/.build-id/d3 -+%dir /usr/lib/debug/usr -+%dir /usr/lib/debug/usr/sbin -+%dir /usr/lib/debug/usr/bin -+/usr/lib/debug/sbin/setfiles.debug -+/usr/lib/debug/sbin/restorecon.debug -+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug -+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 -+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab -+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug -+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug -+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 -+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce -+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug -+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 -+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug -+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug -+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 -+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug -+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 -+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug -+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be -+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug -+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a -+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug -+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 -+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug -+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 -+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug -+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f -+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b -+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug -+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 -+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug -+/usr/lib/debug/usr/sbin/load_policy.debug -+/usr/lib/debug/usr/sbin/restorecond.debug -+/usr/lib/debug/usr/sbin/semodule.debug -+/usr/lib/debug/usr/sbin/sestatus.debug -+/usr/lib/debug/usr/sbin/setsebool.debug -+/usr/lib/debug/usr/sbin/open_init_pty.debug -+/usr/lib/debug/usr/sbin/run_init.debug -+/usr/lib/debug/usr/bin/semodule_package.debug -+/usr/lib/debug/usr/bin/newrole.debug -+/usr/lib/debug/usr/bin/semodule_link.debug -+/usr/lib/debug/usr/bin/semodule_deps.debug -+/usr/lib/debug/usr/bin/semodule_expand.debug -+/usr/lib/debug/usr/bin/secon.debug -+/usr/src/debug/policycoreutils-2.0.62 -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debuglinks.list policycoreutils-2.0.62/debuglinks.list ---- nsapolicycoreutils/debuglinks.list 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.62/debuglinks.list 2009-04-03 14:13:23.000000000 -0400 -@@ -0,0 +1,29 @@ -+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 /sbin/setfiles -+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug /usr/lib/debug/sbin/setfiles.debug -+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 /usr/sbin/open_init_pty -+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug /usr/lib/debug/usr/sbin/open_init_pty.debug -+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 /usr/sbin/sestatus -+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug /usr/lib/debug/usr/sbin/sestatus.debug -+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 /usr/sbin/semodule -+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug /usr/lib/debug/usr/sbin/semodule.debug -+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 /usr/sbin/load_policy -+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug /usr/lib/debug/usr/sbin/load_policy.debug -+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b /usr/sbin/run_init -+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug /usr/lib/debug/usr/sbin/run_init.debug -+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a /usr/sbin/restorecond -+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug /usr/lib/debug/usr/sbin/restorecond.debug -+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab /usr/sbin/setsebool -+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug /usr/lib/debug/usr/sbin/setsebool.debug -+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 /usr/bin/secon -+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug /usr/lib/debug/usr/bin/secon.debug -+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f /usr/bin/newrole -+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug /usr/lib/debug/usr/bin/newrole.debug -+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 /usr/bin/semodule_link -+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug /usr/lib/debug/usr/bin/semodule_link.debug -+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be /usr/bin/semodule_expand -+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug /usr/lib/debug/usr/bin/semodule_expand.debug -+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce /usr/bin/semodule_package -+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug /usr/lib/debug/usr/bin/semodule_package.debug -+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 /usr/bin/semodule_deps -+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug /usr/lib/debug/usr/bin/semodule_deps.debug -+/usr/lib/debug/sbin/restorecon.debug /usr/lib/debug/sbin/setfiles.debug -Binary files nsapolicycoreutils/debugsources.list and policycoreutils-2.0.62/debugsources.list differ -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.62/Makefile ---- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.62/Makefile 2009-04-03 14:12:56.000000000 -0400 +diff -up policycoreutils-2.0.62/Makefile.rhat policycoreutils-2.0.62/Makefile +--- policycoreutils-2.0.62/Makefile.rhat 2009-02-18 16:45:00.000000000 -0500 ++++ policycoreutils-2.0.62/Makefile 2009-05-05 10:49:02.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.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.62/restorecond/restorecond.conf ---- nsapolicycoreutils/restorecond/restorecond.conf 2009-02-18 16:44:47.000000000 -0500 -+++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-04-03 14:12:56.000000000 -0400 +diff -up policycoreutils-2.0.62/restorecond/restorecond.conf.rhat policycoreutils-2.0.62/restorecond/restorecond.conf +--- policycoreutils-2.0.62/restorecond/restorecond.conf.rhat 2009-02-18 16:45:01.000000000 -0500 ++++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-05-05 10:49:02.000000000 -0400 @@ -5,3 +5,7 @@ /var/run/utmp /var/log/wtmp @@ -131,10 +29,10 @@ diff --exclude-from=exclude --exclude=se +/root/.ssh/* + + -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.62/scripts/chcat ---- nsapolicycoreutils/scripts/chcat 2009-01-13 08:45:35.000000000 -0500 -+++ policycoreutils-2.0.62/scripts/chcat 2009-04-09 12:28:34.000000000 -0400 -@@ -281,14 +281,14 @@ +diff -up policycoreutils-2.0.62/scripts/chcat.rhat policycoreutils-2.0.62/scripts/chcat +--- policycoreutils-2.0.62/scripts/chcat.rhat 2009-02-18 16:45:01.000000000 -0500 ++++ policycoreutils-2.0.62/scripts/chcat 2009-05-05 10:49:02.000000000 -0400 +@@ -281,14 +281,14 @@ def isSensitivity(sensitivity): def expandCats(cats): newcats = [] for c in cats: @@ -157,10 +55,19 @@ diff --exclude-from=exclude --exclude=se if i not in newcats: newcats.append(i) if len(newcats) > 25: -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.62/scripts/fixfiles ---- nsapolicycoreutils/scripts/fixfiles 2009-02-18 16:44:47.000000000 -0500 -+++ policycoreutils-2.0.62/scripts/fixfiles 2009-04-03 14:12:56.000000000 -0400 -@@ -122,7 +122,7 @@ +diff -up policycoreutils-2.0.62/scripts/fixfiles.rhat policycoreutils-2.0.62/scripts/fixfiles +--- policycoreutils-2.0.62/scripts/fixfiles.rhat 2009-02-18 16:45:01.000000000 -0500 ++++ policycoreutils-2.0.62/scripts/fixfiles 2009-05-05 10:49:24.000000000 -0400 +@@ -89,7 +89,7 @@ if [ -f ${PREFC} -a -x /usr/bin/diff ]; + fi; \ + done | \ + while read pattern ; do sh -c "find $pattern \ +- ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs \) -prune -o \ ++ ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o -fstype btrfs \) -prune -o \ + \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print0"; \ + done 2> /dev/null | \ + ${RESTORECON} $* -0 -f - +@@ -122,14 +122,14 @@ if [ ! -z "$PREFC" ]; then fi if [ ! -z "$RPMFILES" ]; then for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do @@ -169,10 +76,30 @@ diff --exclude-from=exclude --exclude=se done exit $? fi -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2009-02-18 16:44:47.000000000 -0500 -+++ policycoreutils-2.0.62/semanage/semanage 2009-04-16 14:46:41.000000000 -0400 -@@ -44,16 +44,17 @@ + if [ ! -z "$FILEPATH" ]; then + if [ -x /usr/bin/find ]; then + /usr/bin/find "$FILEPATH" \ +- ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs \) -prune -o -print0 | \ ++ ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o fstype btrfs \) -prune -o -print0 | \ + ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE + else + ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE +diff -up policycoreutils-2.0.62/semanage/semanage.8.rhat policycoreutils-2.0.62/semanage/semanage.8 +--- policycoreutils-2.0.62/semanage/semanage.8.rhat 2009-02-18 16:45:01.000000000 -0500 ++++ policycoreutils-2.0.62/semanage/semanage.8 2009-05-05 10:49:02.000000000 -0400 +@@ -21,6 +21,8 @@ semanage \- SELinux Policy Management to + .br + .B semanage permissive \-{a|d} type + .br ++.B semanage module \-{a|d} policy_package ++.br + .B semanage translation \-{a|d|m} [\-T] level + .P + +diff -up policycoreutils-2.0.62/semanage/semanage.rhat policycoreutils-2.0.62/semanage/semanage +--- policycoreutils-2.0.62/semanage/semanage.rhat 2009-02-18 16:45:01.000000000 -0500 ++++ policycoreutils-2.0.62/semanage/semanage 2009-05-05 10:49:02.000000000 -0400 +@@ -44,16 +44,17 @@ if __name__ == '__main__': text = _(""" semanage [ -S store ] -i [ input_file | - ] @@ -193,7 +120,7 @@ diff --exclude-from=exclude --exclude=se Primary Options: -@@ -68,6 +69,7 @@ +@@ -68,6 +69,7 @@ Primary Options: -h, --help Display this message -n, --noheading Do not print heading when listing OBJECTS -S, --store Select and alternate SELinux store to manage @@ -201,7 +128,7 @@ diff --exclude-from=exclude --exclude=se Object-specific Options (see above): -@@ -84,6 +86,7 @@ +@@ -84,6 +86,7 @@ Object-specific Options (see above): -F, --file Treat target as an input file for command, change multiple settings -p, --proto Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6) -M, --mask Netmask @@ -209,7 +136,7 @@ diff --exclude-from=exclude --exclude=se -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") -@@ -115,11 +118,14 @@ +@@ -115,11 +118,14 @@ Object-specific Options (see above): valid_option["node"] = [] valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol'] valid_option["fcontext"] = [] @@ -225,7 +152,7 @@ diff --exclude-from=exclude --exclude=se valid_option["permissive"] = [] valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ] return valid_option -@@ -192,7 +198,10 @@ +@@ -192,7 +198,10 @@ Object-specific Options (see above): locallist = False use_file = False store = "" @@ -236,7 +163,7 @@ diff --exclude-from=exclude --exclude=se object = argv[0] option_dict=get_options() if object not in option_dict.keys(): -@@ -201,10 +210,12 @@ +@@ -201,10 +210,12 @@ Object-specific Options (see above): args = argv[1:] gopts, cmds = getopt.getopt(args, @@ -250,7 +177,7 @@ diff --exclude-from=exclude --exclude=se 'ftype=', 'file', 'help', -@@ -241,16 +252,24 @@ +@@ -241,16 +252,24 @@ Object-specific Options (see above): if modify or add: raise ValueError(_("%s bad option") % o) delete = True @@ -276,7 +203,7 @@ diff --exclude-from=exclude --exclude=se if o == "-h" or o == "--help": raise ValueError(_("%s bad option") % o) -@@ -323,6 +342,9 @@ +@@ -323,6 +342,9 @@ Object-specific Options (see above): if object == "boolean": OBJECT = seobject.booleanRecords(store) @@ -286,7 +213,7 @@ diff --exclude-from=exclude --exclude=se if object == "translation": OBJECT = seobject.setransRecords() -@@ -341,6 +363,13 @@ +@@ -341,6 +363,13 @@ Object-specific Options (see above): OBJECT.deleteall() return @@ -300,7 +227,7 @@ diff --exclude-from=exclude --exclude=se if len(cmds) != 1: raise ValueError(_("%s bad option") % o) -@@ -362,11 +391,17 @@ +@@ -362,11 +391,17 @@ Object-specific Options (see above): if object == "interface": OBJECT.add(target, serange, setype) @@ -319,7 +246,7 @@ diff --exclude-from=exclude --exclude=se if object == "permissive": OBJECT.add(target) -@@ -386,6 +421,9 @@ +@@ -386,6 +421,9 @@ Object-specific Options (see above): rlist = roles.split() OBJECT.modify(target, rlist, selevel, serange, prefix) @@ -329,7 +256,7 @@ diff --exclude-from=exclude --exclude=se if object == "port": OBJECT.modify(target, proto, serange, setype) -@@ -396,7 +434,10 @@ +@@ -396,7 +434,10 @@ Object-specific Options (see above): OBJECT.modify(target, mask, proto, serange, setype) if object == "fcontext": @@ -341,7 +268,7 @@ diff --exclude-from=exclude --exclude=se return -@@ -405,7 +446,7 @@ +@@ -405,7 +446,7 @@ Object-specific Options (see above): OBJECT.delete(target, proto) elif object == "fcontext": @@ -350,7 +277,7 @@ diff --exclude-from=exclude --exclude=se elif object == "node": OBJECT.delete(target, mask, proto) -@@ -464,10 +505,10 @@ +@@ -464,10 +505,10 @@ Object-specific Options (see above): else: fd = open(input, 'r') trans = seobject.semanageRecords(store) @@ -363,21 +290,9 @@ diff --exclude-from=exclude --exclude=se else: process_args(sys.argv[1:]) -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.62/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.62/semanage/semanage.8 2009-04-16 13:51:38.000000000 -0400 -@@ -21,6 +21,8 @@ - .br - .B semanage permissive \-{a|d} type - .br -+.B semanage module \-{a|d} policy_package -+.br - .B semanage translation \-{a|d|m} [\-T] level - .P - -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2008-11-14 17:10:15.000000000 -0500 -+++ policycoreutils-2.0.62/semanage/seobject.py 2009-04-16 14:46:58.000000000 -0400 +diff -up policycoreutils-2.0.62/semanage/seobject.py.rhat policycoreutils-2.0.62/semanage/seobject.py +--- policycoreutils-2.0.62/semanage/seobject.py.rhat 2009-02-18 16:45:01.000000000 -0500 ++++ policycoreutils-2.0.62/semanage/seobject.py 2009-05-05 10:49:02.000000000 -0400 @@ -21,16 +21,16 @@ # # @@ -398,7 +313,7 @@ diff --exclude-from=exclude --exclude=se except IOError: import __builtin__ __builtin__.__dict__['_'] = unicode -@@ -96,7 +96,7 @@ +@@ -96,7 +96,7 @@ try: self.audit_fd = audit.audit_open() def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""): @@ -407,7 +322,7 @@ diff --exclude-from=exclude --exclude=se except: class logger: def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""): -@@ -104,7 +104,7 @@ +@@ -104,7 +104,7 @@ except: message = "Successful: " else: message = "Failed: " @@ -416,7 +331,7 @@ diff --exclude-from=exclude --exclude=se if sename != "": message += " sename=" + sename if old_sename != "": -@@ -123,9 +123,9 @@ +@@ -123,9 +123,9 @@ mylog = logger() import xml.etree.ElementTree @@ -428,7 +343,7 @@ diff --exclude-from=exclude --exclude=se for l in tree.findall("layer"): for m in l.findall("module"): for b in m.findall("tunable"): -@@ -160,12 +160,12 @@ +@@ -160,12 +160,12 @@ def validate_level(raw): cat_range = category + "(\." + category +")?" categories = cat_range + "(\," + cat_range + ")*" reg = sensitivity + "(-" + sensitivity + ")?" + "(:" + categories + ")?" @@ -444,7 +359,7 @@ diff --exclude-from=exclude --exclude=se else: context = raw (rc, trans) = selinux.selinux_raw_to_trans_context(context) -@@ -179,9 +179,9 @@ +@@ -179,9 +179,9 @@ def translate(raw, prepend = 1): return trans def untranslate(trans, prepend = 1): @@ -456,7 +371,7 @@ diff --exclude-from=exclude --exclude=se else: context = trans -@@ -234,7 +234,7 @@ +@@ -234,7 +234,7 @@ class setransRecords: rec += "%s=%s\n" % (k, self.ddict[k]) return rec @@ -465,7 +380,7 @@ diff --exclude-from=exclude --exclude=se if heading: print "\n%-25s %s\n" % (_("Level"), _("Translation")) keys = self.ddict.keys() -@@ -273,6 +273,7 @@ +@@ -273,6 +273,7 @@ class setransRecords: (fd, newfilename) = tempfile.mkstemp('', self.filename) os.write(fd, self.out()) os.close(fd) @@ -473,7 +388,7 @@ diff --exclude-from=exclude --exclude=se os.rename(newfilename, self.filename) os.system("/sbin/service mcstrans reload > /dev/null") -@@ -281,15 +282,20 @@ +@@ -281,15 +282,20 @@ class semanageRecords: global handle if handle != None: @@ -497,7 +412,7 @@ diff --exclude-from=exclude --exclude=se def begin(self): if self.transaction: return -@@ -303,6 +309,55 @@ +@@ -303,6 +309,55 @@ class semanageRecords: if rc < 0: raise ValueError(_("Could not commit semanage transaction")) @@ -553,7 +468,7 @@ diff --exclude-from=exclude --exclude=se class permissiveRecords(semanageRecords): def __init__(self, store): semanageRecords.__init__(self, store) -@@ -320,7 +375,7 @@ +@@ -320,7 +375,7 @@ class permissiveRecords(semanageRecords) l.append(name.split("permissive_")[1]) return l @@ -562,7 +477,7 @@ diff --exclude-from=exclude --exclude=se if heading: print "\n%-25s\n" % (_("Permissive Types")) for t in self.get_all(): -@@ -328,6 +383,7 @@ +@@ -328,6 +383,7 @@ class permissiveRecords(semanageRecords) def add(self, type): @@ -570,7 +485,7 @@ diff --exclude-from=exclude --exclude=se name = "permissive_%s" % type dirname = "/var/lib/selinux" os.chdir(dirname) -@@ -341,7 +397,7 @@ +@@ -341,7 +397,7 @@ require { permissive %s; """ % (name, type, type) @@ -579,7 +494,7 @@ diff --exclude-from=exclude --exclude=se fd.write(modtxt) fd.close() mc = module.ModuleCompiler() -@@ -351,16 +407,19 @@ +@@ -351,16 +407,19 @@ permissive %s; fd.close() rc = semanage_module_install(self.sh, data, len(data)); @@ -604,7 +519,7 @@ diff --exclude-from=exclude --exclude=se def delete(self, name): for n in name.split(): -@@ -390,11 +449,11 @@ +@@ -390,11 +449,11 @@ class loginRecords(semanageRecords): if sename == "": sename = "user_u" @@ -618,7 +533,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if login mapping for %s is defined") % name) if exists: -@@ -410,7 +469,7 @@ +@@ -410,7 +469,7 @@ class loginRecords(semanageRecords): except: raise ValueError(_("Linux User %s does not exist") % name) @@ -627,7 +542,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create login mapping for %s") % name) -@@ -450,17 +509,17 @@ +@@ -450,17 +509,17 @@ class loginRecords(semanageRecords): if sename == "" and serange == "": raise ValueError(_("Requires seuser or serange")) @@ -648,7 +563,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query seuser for %s") % name) -@@ -483,7 +542,7 @@ +@@ -483,7 +542,7 @@ class loginRecords(semanageRecords): semanage_seuser_key_free(k) semanage_seuser_free(u) @@ -657,7 +572,7 @@ diff --exclude-from=exclude --exclude=se def modify(self, name, sename = "", serange = ""): try: -@@ -492,21 +551,21 @@ +@@ -492,21 +551,21 @@ class loginRecords(semanageRecords): self.commit() except ValueError, error: @@ -683,7 +598,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if login mapping for %s is defined") % name) if not exists: -@@ -525,10 +584,10 @@ +@@ -525,10 +584,10 @@ class loginRecords(semanageRecords): self.commit() except ValueError, error: @@ -696,7 +611,7 @@ diff --exclude-from=exclude --exclude=se def get_all(self, locallist = 0): ddict = {} -@@ -578,17 +637,17 @@ +@@ -578,17 +637,17 @@ class seluserRecords(semanageRecords): if len(roles) < 1: raise ValueError(_("You must add at least one role for %s") % name) @@ -717,7 +632,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create SELinux user for %s") % name) -@@ -612,7 +671,7 @@ +@@ -612,7 +671,7 @@ class seluserRecords(semanageRecords): rc = semanage_user_set_prefix(self.sh, u, prefix) if rc < 0: raise ValueError(_("Could not add prefix %s for %s") % (r, prefix)) @@ -726,7 +641,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not extract key for %s") % name) -@@ -645,17 +704,17 @@ +@@ -645,17 +704,17 @@ class seluserRecords(semanageRecords): else: raise ValueError(_("Requires prefix or roles")) @@ -747,7 +662,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query user for %s") % name) -@@ -703,17 +762,17 @@ +@@ -703,17 +762,17 @@ class seluserRecords(semanageRecords): raise error def __delete(self, name): @@ -768,7 +683,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if SELinux user %s is defined") % name) if not exists: -@@ -795,7 +854,7 @@ +@@ -795,7 +854,7 @@ class portRecords(semanageRecords): low = int(ports[0]) high = int(ports[1]) @@ -777,7 +692,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create a key for %s/%s") % (proto, port)) return ( k, proto_d, low, high ) -@@ -812,13 +871,13 @@ +@@ -812,13 +871,13 @@ class portRecords(semanageRecords): ( k, proto_d, low, high ) = self.__genkey(port, proto) @@ -793,7 +708,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create port for %s/%s") % (proto, port)) -@@ -871,13 +930,13 @@ +@@ -871,13 +930,13 @@ class portRecords(semanageRecords): ( k, proto_d, low, high ) = self.__genkey(port, proto) @@ -809,7 +724,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query port %s/%s") % (proto, port)) -@@ -926,13 +985,13 @@ +@@ -926,13 +985,13 @@ class portRecords(semanageRecords): def __delete(self, port, proto): ( k, proto_d, low, high ) = self.__genkey(port, proto) @@ -825,7 +740,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port)) if not exists: -@@ -1038,17 +1097,17 @@ +@@ -1038,17 +1097,17 @@ class nodeRecords(semanageRecords): if ctype == "": raise ValueError(_("SELinux Type is required")) @@ -846,7 +761,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create addr for %s") % addr) -@@ -1113,17 +1172,17 @@ +@@ -1113,17 +1172,17 @@ class nodeRecords(semanageRecords): if serange == "" and setype == "": raise ValueError(_("Requires setype or serange")) @@ -867,7 +782,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query addr %s") % addr) -@@ -1160,17 +1219,17 @@ +@@ -1160,17 +1219,17 @@ class nodeRecords(semanageRecords): else: raise ValueError(_("Unknown or missing protocol")) @@ -888,7 +803,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if addr %s is defined") % addr) if not exists: -@@ -1240,17 +1299,17 @@ +@@ -1240,17 +1299,17 @@ class interfaceRecords(semanageRecords): if ctype == "": raise ValueError(_("SELinux Type is required")) @@ -909,7 +824,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create interface for %s") % interface) -@@ -1301,17 +1360,17 @@ +@@ -1301,17 +1360,17 @@ class interfaceRecords(semanageRecords): if serange == "" and setype == "": raise ValueError(_("Requires setype or serange")) @@ -930,7 +845,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query interface %s") % interface) -@@ -1335,17 +1394,17 @@ +@@ -1335,17 +1394,17 @@ class interfaceRecords(semanageRecords): self.commit() def __delete(self, interface): @@ -951,7 +866,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if interface %s is defined") % interface) if not exists: -@@ -1393,6 +1452,45 @@ +@@ -1393,6 +1452,45 @@ class interfaceRecords(semanageRecords): class fcontextRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self, store) @@ -997,7 +912,7 @@ diff --exclude-from=exclude --exclude=se def createcon(self, target, seuser = "system_u"): (rc, con) = semanage_context_create(self.sh) -@@ -1429,23 +1527,23 @@ +@@ -1429,23 +1527,23 @@ class fcontextRecords(semanageRecords): if type == "": raise ValueError(_("SELinux Type is required")) @@ -1025,7 +940,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create file context for %s") % target) -@@ -1486,21 +1584,21 @@ +@@ -1486,21 +1584,21 @@ class fcontextRecords(semanageRecords): raise ValueError(_("Requires setype, serange or seuser")) self.validate(target) @@ -1052,7 +967,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query file context for %s") % target) -@@ -1550,7 +1648,7 @@ +@@ -1550,7 +1648,7 @@ class fcontextRecords(semanageRecords): target = semanage_fcontext_get_expr(fcontext) ftype = semanage_fcontext_get_type(fcontext) ftype_str = semanage_fcontext_get_type_str(ftype) @@ -1061,7 +976,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create a key for %s") % target) -@@ -1558,19 +1656,26 @@ +@@ -1558,19 +1656,26 @@ class fcontextRecords(semanageRecords): if rc < 0: raise ValueError(_("Could not delete the file context %s") % target) semanage_fcontext_key_free(k) @@ -1092,7 +1007,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if file context for %s is defined") % target) if exists: -@@ -1617,11 +1722,11 @@ +@@ -1617,11 +1722,11 @@ class fcontextRecords(semanageRecords): return ddict def list(self, heading = 1, locallist = 0 ): @@ -1106,7 +1021,7 @@ diff --exclude-from=exclude --exclude=se for k in keys: if fcon_dict[k]: if is_mls_enabled: -@@ -1630,11 +1735,17 @@ +@@ -1630,11 +1735,17 @@ class fcontextRecords(semanageRecords): print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2]) else: print "%-50s %-18s <>" % (k[0], k[1]) @@ -1125,7 +1040,7 @@ diff --exclude-from=exclude --exclude=se self.dict["TRUE"] = 1 self.dict["FALSE"] = 0 self.dict["ON"] = 1 -@@ -1643,16 +1754,16 @@ +@@ -1643,16 +1754,16 @@ class booleanRecords(semanageRecords): self.dict["0"] = 0 def __mod(self, name, value): @@ -1145,7 +1060,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query file context %s") % name) -@@ -1670,7 +1781,7 @@ +@@ -1670,7 +1781,7 @@ class booleanRecords(semanageRecords): semanage_bool_key_free(k) semanage_bool_free(b) @@ -1154,7 +1069,7 @@ diff --exclude-from=exclude --exclude=se self.begin() -@@ -1694,16 +1805,16 @@ +@@ -1694,16 +1805,16 @@ class booleanRecords(semanageRecords): def __delete(self, name): @@ -1174,7 +1089,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if boolean %s is defined") % name) if not exists: -@@ -1762,7 +1873,7 @@ +@@ -1762,7 +1873,7 @@ class booleanRecords(semanageRecords): return _("unknown") def list(self, heading = True, locallist = False, use_file = False): @@ -1183,11 +1098,9 @@ diff --exclude-from=exclude --exclude=se if use_file: ddict = self.get_all(locallist) keys = ddict.keys() -Binary files nsapolicycoreutils/setfiles/restorecon and policycoreutils-2.0.62/setfiles/restorecon differ -Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-2.0.62/setfiles/setfiles differ -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.62/setfiles/setfiles.c ---- nsapolicycoreutils/setfiles/setfiles.c 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.62/setfiles/setfiles.c 2009-04-14 09:38:55.000000000 -0400 +diff -up policycoreutils-2.0.62/setfiles/setfiles.c.rhat policycoreutils-2.0.62/setfiles/setfiles.c +--- policycoreutils-2.0.62/setfiles/setfiles.c.rhat 2009-02-18 16:45:01.000000000 -0500 ++++ policycoreutils-2.0.62/setfiles/setfiles.c 2009-05-05 10:49:02.000000000 -0400 @@ -29,6 +29,8 @@ static int mass_relabel; static int mass_relabel_errs; @@ -1197,7 +1110,7 @@ diff --exclude-from=exclude --exclude=se static FILE *outfile = NULL; static int force = 0; #define STAT_BLOCK_SIZE 1 -@@ -444,11 +446,11 @@ +@@ -444,11 +446,11 @@ static int restore(const char *file) if (progress) { count++; @@ -1211,7 +1124,7 @@ diff --exclude-from=exclude --exclude=se fprintf(stdout, "*"); fflush(stdout); } -@@ -1017,7 +1019,7 @@ +@@ -1017,7 +1019,7 @@ int main(int argc, char **argv) free(excludeArray[i].directory); } @@ -1220,4 +1133,3 @@ diff --exclude-from=exclude --exclude=se printf("\n"); exit(errors); } -Binary files nsapolicycoreutils/setfiles/setfiles.o and policycoreutils-2.0.62/setfiles/setfiles.o differ Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v retrieving revision 1.605 retrieving revision 1.606 diff -u -p -r1.605 -r1.606 --- policycoreutils.spec 24 Apr 2009 17:57:47 -0000 1.605 +++ policycoreutils.spec 5 May 2009 14:53:43 -0000 1.606 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.62 -Release: 12.1%{?dist} +Release: 12.2%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -221,6 +221,9 @@ else fi %changelog +* Tue May 5 2009 Dan Walsh 2.0.62-12.2 +- Fix fixfiles to handle btrfs + * Fri Apr 24 2009 Dan Walsh 2.0.62-12.1 - Fix audit2allow -a to read /var/log/messages From kkofler at fedoraproject.org Tue May 5 14:59:46 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 5 May 2009 14:59:46 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20090505145946.6C6E470108@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16037/devel Modified Files: kde-plasma-networkmanagement.spec sources Log Message: * Tue May 05 2009 Kevin Kofler 0.1-0.11.20090504svn - New snapshot (revision 963263 committed 2009-05-04 10:57 UTC) - Clarify %description Index: kde-plasma-networkmanagement.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- kde-plasma-networkmanagement.spec 26 Apr 2009 18:24:38 -0000 1.5 +++ kde-plasma-networkmanagement.spec 5 May 2009 14:59:15 -0000 1.6 @@ -1,6 +1,6 @@ Name: kde-plasma-networkmanagement Version: 0.1 -Release: 0.10.20090424svn%{?dist} +Release: 0.11.20090504svn%{?dist} Summary: NetworkManager KDE 4 integration Group: User Interface/Desktops @@ -8,7 +8,7 @@ License: (GPLv2 or GPLv3) and GPL URL: http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export -r 958775 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 +# svn export -r 963263 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 # tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +27,7 @@ Provides: knetworkmanager = 1:%{ve %description A Plasma applet to control your wired and wireless network(s) in KDE 4 using the default NetworkManager service. This is alpha software with known issues. -It is not a replacement for nm-applet yet. +We still recommend nm-applet from NetworkManager-gnome for production use. %package devel Summary: Files needed to develop programs which use the Network Manager plasmoid @@ -151,9 +151,13 @@ xdg-icon-resource forceupdate --theme ox %changelog +* Tue May 05 2009 Kevin Kofler 0.1-0.11.20090504svn +- New snapshot (revision 963263 committed 2009-05-04 10:57 UTC) +- Clarify %%description + * Fri Apr 24 2009 Ben Boeckel 0.1-0.10.20090424svn - Respin snapshot -- Add disclaimer to %description +- Add disclaimer to %%description * Wed Apr 8 2009 Ben Boeckel 0.1-0.9.20090403svn - Respin snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 9 Apr 2009 03:17:27 -0000 1.4 +++ sources 5 May 2009 14:59:16 -0000 1.5 @@ -1 +1 @@ -c03783c451344227f9a38eca15991561 kde-plasma-networkmanagement-0.1.tar.bz2 +3937fae70250557148b88a078492d58d kde-plasma-networkmanagement-0.1.tar.bz2 From caolanm at fedoraproject.org Tue May 5 15:02:18 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 5 May 2009 15:02:18 +0000 (UTC) Subject: rpms/hunspell-sr/devel .cvsignore, 1.2, 1.3 hunspell-sr.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090505150218.15E0670108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-sr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16627 Modified Files: .cvsignore hunspell-sr.spec sources Log Message: latest versions Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sr/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 23 Jul 2008 17:37:44 -0000 1.2 +++ .cvsignore 5 May 2009 15:01:47 -0000 1.3 @@ -1 +1 @@ -MySpell-sr_YU-and-sh_YU.tar.gz +dict-sr.oxt Index: hunspell-sr.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sr/devel/hunspell-sr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- hunspell-sr.spec 25 Feb 2009 05:31:39 -0000 1.2 +++ hunspell-sr.spec 5 May 2009 15:01:47 -0000 1.3 @@ -1,52 +1,87 @@ Name: hunspell-sr Summary: Serbian hunspell dictionaries -%define upstreamid 20080711 +%define upstreamid 20090213 Version: 0.%{upstreamid} -Release: 2%{?dist} -Source: http://srpski.org/aspell/MySpell-sr_YU-and-sh_YU.tar.gz +Release: 1%{?dist} +Source: http://extensions.services.openoffice.org/files/1572/2/dict-sr.oxt Group: Applications/Text -URL: http://srpski.org/aspell/ +URL: http://extensions.services.openoffice.org/project/dict-sr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ BuildArch: noarch - Requires: hunspell +Provides: hunspell-bs = %{version}-%{release} %description Serbian hunspell dictionaries. +%package -n hyphen-sr +Requires: hyphen +Summary: Serbian hyphenation rules +Group: Applications/Text +Provides: hyphen-bs = %{version}-%{release} + +%description -n hyphen-sr +Serbian hyphenation rules. + %prep -%setup -q -n myspell-sr +%setup -q -c %build +cp -p README_sh.txt README_hyph.txt %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 +cp -p sr.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/sr_YU.dic +cp -p sr.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/sr_YU.aff +cp -p sh.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/sh_YU.dic +cp -p sh.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/sh_YU.aff + +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen +cp -p hyph_sr.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen/hyph_sr_YU.dic +cp -p hyph_sh.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen/hyph_sh_YU.dic -pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ sr_YU_aliases="sr_ME sr_RS" +sh_YU_aliases="sh_ME sh_RS bs_BA" + +pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ 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 +pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/ +for lang in $sr_YU_aliases; do + ln -s hyph_sr_YU.dic "hyph_"$lang".dic" +done +for lang in $sh_YU_aliases; do + ln -s hyph_sh_YU.dic "hyph_"$lang".dic" +done +popd + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README COPYING +%doc README_sh.txt README_sr.txt registration/license*.txt %{_datadir}/myspell/* +%files -n hyphen-sr +%doc README_hyph.txt +%defattr(-,root,root,-) +%{_datadir}/hyphen/* + %changelog +* Tue May 05 2009 Caolan McNamara - 0.20090213-1 +- latest version + * Tue Feb 24 2009 Fedora Release Engineering - 0.20080711-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sr/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 23 Jul 2008 17:37:44 -0000 1.2 +++ sources 5 May 2009 15:01:47 -0000 1.3 @@ -1 +1 @@ -11faca5e15bb64b60ffa1910f6ced975 MySpell-sr_YU-and-sh_YU.tar.gz +1e0fd29cc2c51c390da391fda806ac45 dict-sr.oxt From corsepiu at fedoraproject.org Tue May 5 15:11:50 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Tue, 5 May 2009 15:11:50 +0000 (UTC) Subject: rpms/perl-Test-MinimumVersion/F-11 .cvsignore, 1.3, 1.4 perl-Test-MinimumVersion.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <20090505151150.4C62170108@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Test-MinimumVersion/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17870 Modified Files: .cvsignore perl-Test-MinimumVersion.spec sources Log Message: * Tue May 05 2009 Ralf Cors??pius - 0.009-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 26 May 2008 03:46:17 -0000 1.3 +++ .cvsignore 5 May 2009 15:11:18 -0000 1.4 @@ -1 +1 @@ -Test-MinimumVersion-0.008.tar.gz +Test-MinimumVersion-0.009.tar.gz Index: perl-Test-MinimumVersion.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/F-11/perl-Test-MinimumVersion.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- perl-Test-MinimumVersion.spec 27 Feb 2009 02:37:01 -0000 1.7 +++ perl-Test-MinimumVersion.spec 5 May 2009 15:11:19 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Test-MinimumVersion -Version: 0.008 -Release: 2%{?dist} +Version: 0.009 +Release: 1%{?dist} Summary: Check whether your code requires a newer perl License: GPL+ or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`% BuildArch: noarch BuildRequires: perl(File::Find::Rule::Perl) -BuildRequires: perl(Perl::MinimumVersion) >= 0.14 +BuildRequires: perl(Perl::MinimumVersion) >= 1.20 # For improved tests BuildRequires: perl(Test::Pod) >= 1.00 @@ -49,6 +49,9 @@ make test %{_mandir}/man3/* %changelog +* Tue May 05 2009 Ralf Cors??pius - 0.009-1 +- Upstream update. + * Thu Feb 26 2009 Fedora Release Engineering - 0.008-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 26 May 2008 03:46:17 -0000 1.3 +++ sources 5 May 2009 15:11:19 -0000 1.4 @@ -1 +1 @@ -72d97499be7c40e5a8481998f774899d Test-MinimumVersion-0.008.tar.gz +aafd481f0498f84da52c0fd6c625e430 Test-MinimumVersion-0.009.tar.gz From ajax at fedoraproject.org Tue May 5 15:18:58 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Tue, 5 May 2009 15:18:58 +0000 (UTC) Subject: rpms/NetworkManager/F-11 NetworkManager.spec,1.272,1.273 Message-ID: <20090505151858.8D9B770108@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/NetworkManager/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18858 Modified Files: NetworkManager.spec Log Message: * Tue May 05 2009 Adam Jackson 1:0.7.1-4.git20090414 - nm-save-the-leases.patch: Use per-connection lease files, and don't delete them on interface deactivate. Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -p -r1.272 -r1.273 --- NetworkManager.spec 16 Apr 2009 14:49:25 -0000 1.272 +++ NetworkManager.spec 5 May 2009 15:18:27 -0000 1.273 @@ -18,7 +18,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.1 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -29,6 +29,7 @@ Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch Patch3: ifcfg-rh-inotify-update-fix.patch +Patch4: nm-save-the-leases.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -148,6 +149,7 @@ tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 %patch3 -p1 -b .ifcfg-rh-inotify-fix +%patch4 -p1 -b .per-connection-leases %build @@ -328,6 +330,10 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Tue May 05 2009 Adam Jackson 1:0.7.1-4.git20090414 +- nm-save-the-leases.patch: Use per-connection lease files, and don't delete + them on interface deactivate. + * Thu Apr 16 2009 Dan Williams - 1:0.7.1-3.git20090414 - ifcfg-rh: fix problems noticing changes via inotify (rh #495884) From corsepiu at fedoraproject.org Tue May 5 15:20:50 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Tue, 5 May 2009 15:20:50 +0000 (UTC) Subject: rpms/perl-Test-MinimumVersion/F-10 .cvsignore, 1.3, 1.4 perl-Test-MinimumVersion.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <20090505152050.477EC70108@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Test-MinimumVersion/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19285 Modified Files: .cvsignore perl-Test-MinimumVersion.spec sources Log Message: * Tue May 05 2009 Ralf Cors??pius - 0.009-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 26 May 2008 03:46:17 -0000 1.3 +++ .cvsignore 5 May 2009 15:20:19 -0000 1.4 @@ -1 +1 @@ -Test-MinimumVersion-0.008.tar.gz +Test-MinimumVersion-0.009.tar.gz Index: perl-Test-MinimumVersion.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/F-10/perl-Test-MinimumVersion.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- perl-Test-MinimumVersion.spec 26 May 2008 03:46:17 -0000 1.6 +++ perl-Test-MinimumVersion.spec 5 May 2009 15:20:19 -0000 1.7 @@ -1,5 +1,5 @@ Name: perl-Test-MinimumVersion -Version: 0.008 +Version: 0.009 Release: 1%{?dist} Summary: Check whether your code requires a newer perl License: GPL+ or Artistic @@ -12,7 +12,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`% BuildArch: noarch BuildRequires: perl(File::Find::Rule::Perl) -BuildRequires: perl(Perl::MinimumVersion) >= 0.14 +BuildRequires: perl(Perl::MinimumVersion) >= 1.20 # For improved tests BuildRequires: perl(Test::Pod) >= 1.00 @@ -49,6 +49,9 @@ make test %{_mandir}/man3/* %changelog +* Tue May 05 2009 Ralf Cors??pius - 0.009-1 +- Upstream update. + * Mon May 26 2008 Ralf Cors??pius - 0.008-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 26 May 2008 03:46:17 -0000 1.3 +++ sources 5 May 2009 15:20:19 -0000 1.4 @@ -1 +1 @@ -72d97499be7c40e5a8481998f774899d Test-MinimumVersion-0.008.tar.gz +aafd481f0498f84da52c0fd6c625e430 Test-MinimumVersion-0.009.tar.gz From kkofler at fedoraproject.org Tue May 5 15:22:00 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 5 May 2009 15:22:00 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/F-10 kde-plasma-networkmanagement.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090505152200.E5CC870108@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19588/F-10 Modified Files: kde-plasma-networkmanagement.spec sources Log Message: Sync from devel: * Tue May 05 2009 Kevin Kofler 0.1-0.11.20090504svn - New snapshot (revision 963263 committed 2009-05-04 10:57 UTC) - Clarify %%description * Fri Apr 24 2009 Ben Boeckel 0.1-0.10.20090424svn - Respin snapshot - Add disclaimer to %%description * Wed Apr 8 2009 Ben Boeckel 0.1-0.9.20090403svn - Respin snapshot Index: kde-plasma-networkmanagement.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10/kde-plasma-networkmanagement.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- kde-plasma-networkmanagement.spec 14 Mar 2009 21:35:14 -0000 1.1 +++ kde-plasma-networkmanagement.spec 5 May 2009 15:21:30 -0000 1.2 @@ -1,6 +1,6 @@ Name: kde-plasma-networkmanagement Version: 0.1 -Release: 0.8.20090302svn%{?dist} +Release: 0.11.20090504svn%{?dist} Summary: NetworkManager KDE 4 integration Group: User Interface/Desktops @@ -8,7 +8,7 @@ License: (GPLv2 or GPLv3) and GPL URL: http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export -r 934706 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 +# svn export -r 963263 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 # tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +26,8 @@ Provides: knetworkmanager = 1:%{ve %description A Plasma applet to control your wired and wireless network(s) in KDE 4 using -the default NetworkManager service. +the default NetworkManager service. This is alpha software with known issues. +We still recommend nm-applet from NetworkManager-gnome for production use. %package devel Summary: Files needed to develop programs which use the Network Manager plasmoid @@ -150,6 +151,17 @@ xdg-icon-resource forceupdate --theme ox %changelog +* Tue May 05 2009 Kevin Kofler 0.1-0.11.20090504svn +- New snapshot (revision 963263 committed 2009-05-04 10:57 UTC) +- Clarify %%description + +* Fri Apr 24 2009 Ben Boeckel 0.1-0.10.20090424svn +- Respin snapshot +- Add disclaimer to %%description + +* Wed Apr 8 2009 Ben Boeckel 0.1-0.9.20090403svn +- Respin snapshot + * Tue Mar 3 2009 Ben Boeckel 0.1-0.8.20090302svn - Respin snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 14 Mar 2009 21:35:14 -0000 1.2 +++ sources 5 May 2009 15:21:30 -0000 1.3 @@ -1 +1 @@ -d4c2dd492777239c45bb42026f0fa48e kde-plasma-networkmanagement-0.1.tar.bz2 +3937fae70250557148b88a078492d58d kde-plasma-networkmanagement-0.1.tar.bz2 From kkofler at fedoraproject.org Tue May 5 15:22:01 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 5 May 2009 15:22:01 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/F-11 kde-plasma-networkmanagement.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <20090505152201.636ED70108@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19588/F-11 Modified Files: kde-plasma-networkmanagement.spec sources Log Message: Sync from devel: * Tue May 05 2009 Kevin Kofler 0.1-0.11.20090504svn - New snapshot (revision 963263 committed 2009-05-04 10:57 UTC) - Clarify %%description * Fri Apr 24 2009 Ben Boeckel 0.1-0.10.20090424svn - Respin snapshot - Add disclaimer to %%description * Wed Apr 8 2009 Ben Boeckel 0.1-0.9.20090403svn - Respin snapshot Index: kde-plasma-networkmanagement.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- kde-plasma-networkmanagement.spec 9 Apr 2009 03:17:27 -0000 1.4 +++ kde-plasma-networkmanagement.spec 5 May 2009 15:21:30 -0000 1.5 @@ -1,6 +1,6 @@ Name: kde-plasma-networkmanagement Version: 0.1 -Release: 0.9.20090403svn%{?dist} +Release: 0.11.20090504svn%{?dist} Summary: NetworkManager KDE 4 integration Group: User Interface/Desktops @@ -8,7 +8,7 @@ License: (GPLv2 or GPLv3) and GPL URL: http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export -r 951288 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 +# svn export -r 963263 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 # tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +26,8 @@ Provides: knetworkmanager = 1:%{ve %description A Plasma applet to control your wired and wireless network(s) in KDE 4 using -the default NetworkManager service. +the default NetworkManager service. This is alpha software with known issues. +We still recommend nm-applet from NetworkManager-gnome for production use. %package devel Summary: Files needed to develop programs which use the Network Manager plasmoid @@ -150,6 +151,14 @@ xdg-icon-resource forceupdate --theme ox %changelog +* Tue May 05 2009 Kevin Kofler 0.1-0.11.20090504svn +- New snapshot (revision 963263 committed 2009-05-04 10:57 UTC) +- Clarify %%description + +* Fri Apr 24 2009 Ben Boeckel 0.1-0.10.20090424svn +- Respin snapshot +- Add disclaimer to %%description + * Wed Apr 8 2009 Ben Boeckel 0.1-0.9.20090403svn - Respin snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 9 Apr 2009 03:17:27 -0000 1.4 +++ sources 5 May 2009 15:21:31 -0000 1.5 @@ -1 +1 @@ -c03783c451344227f9a38eca15991561 kde-plasma-networkmanagement-0.1.tar.bz2 +3937fae70250557148b88a078492d58d kde-plasma-networkmanagement-0.1.tar.bz2 From kkofler at fedoraproject.org Tue May 5 15:22:01 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 5 May 2009 15:22:01 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/F-9 kde-plasma-networkmanagement.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090505152201.C4BAF70108@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19588/F-9 Modified Files: kde-plasma-networkmanagement.spec sources Log Message: Sync from devel: * Tue May 05 2009 Kevin Kofler 0.1-0.11.20090504svn - New snapshot (revision 963263 committed 2009-05-04 10:57 UTC) - Clarify %%description * Fri Apr 24 2009 Ben Boeckel 0.1-0.10.20090424svn - Respin snapshot - Add disclaimer to %%description * Wed Apr 8 2009 Ben Boeckel 0.1-0.9.20090403svn - Respin snapshot Index: kde-plasma-networkmanagement.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-9/kde-plasma-networkmanagement.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- kde-plasma-networkmanagement.spec 14 Mar 2009 21:35:14 -0000 1.1 +++ kde-plasma-networkmanagement.spec 5 May 2009 15:21:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: kde-plasma-networkmanagement Version: 0.1 -Release: 0.8.20090302svn%{?dist} +Release: 0.11.20090504svn%{?dist} Summary: NetworkManager KDE 4 integration Group: User Interface/Desktops @@ -8,7 +8,7 @@ License: (GPLv2 or GPLv3) and GPL URL: http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export -r 934706 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 +# svn export -r 963263 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 # tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +26,8 @@ Provides: knetworkmanager = 1:%{ve %description A Plasma applet to control your wired and wireless network(s) in KDE 4 using -the default NetworkManager service. +the default NetworkManager service. This is alpha software with known issues. +We still recommend nm-applet from NetworkManager-gnome for production use. %package devel Summary: Files needed to develop programs which use the Network Manager plasmoid @@ -150,6 +151,17 @@ xdg-icon-resource forceupdate --theme ox %changelog +* Tue May 05 2009 Kevin Kofler 0.1-0.11.20090504svn +- New snapshot (revision 963263 committed 2009-05-04 10:57 UTC) +- Clarify %%description + +* Fri Apr 24 2009 Ben Boeckel 0.1-0.10.20090424svn +- Respin snapshot +- Add disclaimer to %%description + +* Wed Apr 8 2009 Ben Boeckel 0.1-0.9.20090403svn +- Respin snapshot + * Tue Mar 3 2009 Ben Boeckel 0.1-0.8.20090302svn - Respin snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 14 Mar 2009 21:35:14 -0000 1.2 +++ sources 5 May 2009 15:21:31 -0000 1.3 @@ -1 +1 @@ -d4c2dd492777239c45bb42026f0fa48e kde-plasma-networkmanagement-0.1.tar.bz2 +3937fae70250557148b88a078492d58d kde-plasma-networkmanagement-0.1.tar.bz2 From ajax at fedoraproject.org Tue May 5 15:25:22 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Tue, 5 May 2009 15:25:22 +0000 (UTC) Subject: rpms/NetworkManager/F-11 nm-save-the-leases.patch,NONE,1.1 Message-ID: <20090505152522.B4BF570108@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/NetworkManager/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20628 Added Files: nm-save-the-leases.patch Log Message: * Tue May 05 2009 Adam Jackson 1:0.7.1-4.git20090414 - nm-save-the-leases.patch: Use per-connection lease files, and don't delete them on interface deactivate. nm-save-the-leases.patch: --- NEW FILE nm-save-the-leases.patch --- 756bc704029050af94ef678bb4c0bdc02da14034 from upstream, corrected for whitespace changes. diff -up NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-dhclient.c.jx NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-dhclient.c --- NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-dhclient.c.jx 2009-04-14 18:48:02.000000000 -0400 +++ NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-dhclient.c 2009-05-05 11:09:21.000000000 -0400 @@ -61,11 +61,12 @@ get_pidfile_for_iface (const char * ifac static char * -get_leasefile_for_iface (const char * iface) +get_leasefile_for_iface (const char * iface, const char *uuid) { - return g_strdup_printf ("%s/%s-%s.%s", + return g_strdup_printf ("%s/%s-%s-%s.%s", NM_DHCP_MANAGER_LEASE_DIR, NM_DHCP_MANAGER_LEASE_FILENAME, + uuid, iface, NM_DHCP_MANAGER_LEASE_FILE_EXT); } @@ -216,7 +217,9 @@ dhclient_child_setup (gpointer user_data GPid -nm_dhcp_client_start (NMDHCPDevice *device, NMSettingIP4Config *s_ip4) +nm_dhcp_client_start (NMDHCPDevice *device, + const char *uuid, + NMSettingIP4Config *s_ip4) { GPtrArray *dhclient_argv = NULL; GPid pid = 0; @@ -234,7 +237,7 @@ nm_dhcp_client_start (NMDHCPDevice *devi goto out; } - device->lease_file = get_leasefile_for_iface (device->iface); + device->lease_file = get_leasefile_for_iface (device->iface, uuid); if (!device->lease_file) { nm_warning ("%s: not enough memory for dhclient options.", device->iface); goto out; diff -up NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-dhcpcd.c.jx NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-dhcpcd.c --- NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-dhcpcd.c.jx 2009-03-03 11:55:47.000000000 -0500 +++ NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-dhcpcd.c 2009-05-05 11:09:21.000000000 -0400 @@ -60,7 +60,9 @@ dhcpcd_child_setup (gpointer user_data G GPid -nm_dhcp_client_start (NMDHCPDevice *device, NMSettingIP4Config *s_ip4) +nm_dhcp_client_start (NMDHCPDevice *device, + const char *uuid, + NMSettingIP4Config *s_ip4) { GPtrArray *argv = NULL; GPid pid = 0; diff -up NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-manager.c.jx NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-manager.c --- NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-manager.c.jx 2009-04-14 18:48:02.000000000 -0400 +++ NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-manager.c 2009-05-05 11:10:46.000000000 -0400 @@ -577,6 +577,7 @@ static void dhcp_watch_cb (GPid pid, gin gboolean nm_dhcp_manager_begin_transaction (NMDHCPManager *manager, const char *iface, + const char *uuid, NMSettingIP4Config *s_ip4, guint32 timeout) { @@ -599,7 +600,7 @@ nm_dhcp_manager_begin_transaction (NMDHC nm_info ("Activation (%s) Beginning DHCP transaction.", iface); - device->pid = nm_dhcp_client_start (device, s_ip4); + device->pid = nm_dhcp_client_start (device, uuid, s_ip4); if (device->pid == 0) return FALSE; @@ -681,9 +682,8 @@ nm_dhcp_manager_cancel_transaction_real device->pid_file = NULL; } - /* Clean up the leasefile if it got left around */ + /* Free leasefile (but don't delete) */ if (device->lease_file) { - remove (device->lease_file); g_free (device->lease_file); device->lease_file = NULL; } diff -up NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-manager.h.jx NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-manager.h --- NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-manager.h.jx 2009-04-14 18:48:02.000000000 -0400 +++ NetworkManager-0.7.1/src/dhcp-manager/nm-dhcp-manager.h 2009-05-05 11:11:07.000000000 -0400 @@ -89,6 +89,7 @@ GType nm_dhcp_manager_get_type (void); NMDHCPManager *nm_dhcp_manager_get (void); gboolean nm_dhcp_manager_begin_transaction (NMDHCPManager *manager, const char *iface, + const char *uuid, NMSettingIP4Config *s_ip4, guint32 timeout); void nm_dhcp_manager_cancel_transaction (NMDHCPManager *manager, @@ -102,7 +103,9 @@ gboolean nm_dhcp_manager_foreach_d gpointer user_data); /* The following are implemented by the DHCP client backends */ -GPid nm_dhcp_client_start (NMDHCPDevice *device, NMSettingIP4Config *s_ip4); +GPid nm_dhcp_client_start (NMDHCPDevice *device, + const char *uuid, + NMSettingIP4Config *s_ip4); void nm_dhcp_client_stop (NMDHCPDevice *device, pid_t pid); gboolean nm_dhcp_client_process_classless_routes (GHashTable *options, diff -up NetworkManager-0.7.1/src/nm-device.c.jx NetworkManager-0.7.1/src/nm-device.c --- NetworkManager-0.7.1/src/nm-device.c.jx 2009-04-14 06:50:18.000000000 -0400 +++ NetworkManager-0.7.1/src/nm-device.c 2009-05-05 11:09:21.000000000 -0400 @@ -862,10 +862,12 @@ aipd_exec (NMDevice *self, GError **erro static NMActStageReturn real_act_stage3_ip_config_start (NMDevice *self, NMDeviceStateReason *reason) { + NMConnection *connection; + NMSettingConnection *s_con; NMSettingIP4Config *s_ip4; NMActRequest *req; NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS; - const char *ip_iface, *method = NULL; + const char *ip_iface, *method = NULL, *uuid; g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); @@ -873,8 +875,12 @@ real_act_stage3_ip_config_start (NMDevic ip_iface = nm_device_get_ip_iface (self); req = nm_device_get_act_request (self); - s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (nm_act_request_get_connection (req), - NM_TYPE_SETTING_IP4_CONFIG); + connection = nm_act_request_get_connection (req); + s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); + g_assert (s_con); + uuid = nm_setting_connection_get_uuid (s_con); + + s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); /* If we did not receive IP4 configuration information, default to DHCP */ if (s_ip4) @@ -890,7 +896,7 @@ real_act_stage3_ip_config_start (NMDevic /* DHCP manager will cancel any transaction already in progress and we do not want to cancel this activation if we get "down" state from that. */ g_signal_handler_block (priv->dhcp_manager, priv->dhcp_state_sigid); - success = nm_dhcp_manager_begin_transaction (priv->dhcp_manager, ip_iface, s_ip4, 45); + success = nm_dhcp_manager_begin_transaction (priv->dhcp_manager, ip_iface, uuid, s_ip4, 45); g_signal_handler_unblock (priv->dhcp_manager, priv->dhcp_state_sigid); if (success) { From epienbro at fedoraproject.org Tue May 5 15:27:46 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Tue, 5 May 2009 15:27:46 +0000 (UTC) Subject: rpms/nntpgrab/EL-5 .cvsignore, 1.19, 1.20 nntpgrab.spec, 1.35, 1.36 sources, 1.22, 1.23 Message-ID: <20090505152746.E5F8B70108@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20953/EL-5 Modified Files: .cvsignore nntpgrab.spec sources Log Message: - Update to 0.4.91 - Drop upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- .cvsignore 15 Mar 2009 21:04:45 -0000 1.19 +++ .cvsignore 5 May 2009 15:27:16 -0000 1.20 @@ -1 +1 @@ -nntpgrab-0.4.90.tar.bz2 +nntpgrab-0.4.91.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/nntpgrab.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- nntpgrab.spec 13 Apr 2009 10:57:26 -0000 1.35 +++ nntpgrab.spec 5 May 2009 15:27:16 -0000 1.36 @@ -1,15 +1,12 @@ Summary: Download files from the usenet Name: nntpgrab -Version: 0.4.90 -Release: 3%{?dist} +Version: 0.4.91 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 Source1: nntpgrab_php.ini Source2: nntpgrab_apache.conf -Patch0: nntpgrab_0_4_90_load_correct_library.patch -Patch1: nntpgrab_0_4_90_fix_removing_collections.patch -Patch2: nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -133,15 +130,6 @@ Web interface to control NNTPGrab %prep %setup -q -# Patch is already applied in upstream SVN rev #1259 -%patch0 -p0 - -# Patch is already applied in upstream SVN rev #1260 -%patch1 -p1 - -# Patch is already applied in upstream SVN rev #1264 -%patch2 -p1 - %build %configure make %{?_smp_mflags} @@ -287,6 +275,10 @@ rm -rf %{buildroot} %{_datadir}/nntpgrab/web %changelog +* Tue May 5 2009 Erik van Pienbroek - 0.4.91-1 +- Update to 0.4.91 +- Drop upstreamed patches + * Mon Apr 13 2009 Erik van Pienbroek - 0.4.90-3 - Added a patch to prevent a possible deadlock (upstream SVN rev #1264) - Added a patch to fix the removal of collections (upstream SVN rev #1260) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 15 Mar 2009 21:38:09 -0000 1.22 +++ sources 5 May 2009 15:27:16 -0000 1.23 @@ -1 +1 @@ -fc48d47b3492ddfa7a975386a59a2fef nntpgrab-0.4.90.tar.bz2 +2e6df8004f0cc5e735297f74bb94b695 nntpgrab-0.4.91.tar.bz2 From epienbro at fedoraproject.org Tue May 5 15:27:47 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Tue, 5 May 2009 15:27:47 +0000 (UTC) Subject: rpms/nntpgrab/F-10 .cvsignore, 1.19, 1.20 nntpgrab.spec, 1.31, 1.32 sources, 1.21, 1.22 Message-ID: <20090505152747.7CABE70108@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20953/F-10 Modified Files: .cvsignore nntpgrab.spec sources Log Message: - Update to 0.4.91 - Drop upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-10/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- .cvsignore 15 Mar 2009 22:03:29 -0000 1.19 +++ .cvsignore 5 May 2009 15:27:16 -0000 1.20 @@ -1 +1 @@ -nntpgrab-0.4.90.tar.bz2 +nntpgrab-0.4.91.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-10/nntpgrab.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- nntpgrab.spec 13 Apr 2009 10:57:25 -0000 1.31 +++ nntpgrab.spec 5 May 2009 15:27:17 -0000 1.32 @@ -1,15 +1,12 @@ Summary: Download files from the usenet Name: nntpgrab -Version: 0.4.90 -Release: 3%{?dist} +Version: 0.4.91 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 Source1: nntpgrab_php.ini Source2: nntpgrab_apache.conf -Patch0: nntpgrab_0_4_90_load_correct_library.patch -Patch1: nntpgrab_0_4_90_fix_removing_collections.patch -Patch2: nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -133,15 +130,6 @@ Web interface to control NNTPGrab %prep %setup -q -# Patch is already applied in upstream SVN rev #1259 -%patch0 -p0 - -# Patch is already applied in upstream SVN rev #1260 -%patch1 -p1 - -# Patch is already applied in upstream SVN rev #1264 -%patch2 -p1 - %build %configure make %{?_smp_mflags} @@ -287,6 +275,10 @@ rm -rf %{buildroot} %{_datadir}/nntpgrab/web %changelog +* Tue May 5 2009 Erik van Pienbroek - 0.4.91-1 +- Update to 0.4.91 +- Drop upstreamed patches + * Mon Apr 13 2009 Erik van Pienbroek - 0.4.90-3 - Added a patch to prevent a possible deadlock (upstream SVN rev #1264) - Added a patch to fix the removal of collections (upstream SVN rev #1260) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-10/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 15 Mar 2009 22:03:29 -0000 1.21 +++ sources 5 May 2009 15:27:17 -0000 1.22 @@ -1 +1 @@ -fc48d47b3492ddfa7a975386a59a2fef nntpgrab-0.4.90.tar.bz2 +2e6df8004f0cc5e735297f74bb94b695 nntpgrab-0.4.91.tar.bz2 From epienbro at fedoraproject.org Tue May 5 15:27:48 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Tue, 5 May 2009 15:27:48 +0000 (UTC) Subject: rpms/nntpgrab/F-11 .cvsignore, 1.19, 1.20 nntpgrab.spec, 1.35, 1.36 sources, 1.22, 1.23 Message-ID: <20090505152748.43F8470108@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20953/F-11 Modified Files: .cvsignore nntpgrab.spec sources Log Message: - Update to 0.4.91 - Drop upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- .cvsignore 15 Mar 2009 21:04:45 -0000 1.19 +++ .cvsignore 5 May 2009 15:27:17 -0000 1.20 @@ -1 +1 @@ -nntpgrab-0.4.90.tar.bz2 +nntpgrab-0.4.91.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/nntpgrab.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- nntpgrab.spec 13 Apr 2009 10:57:26 -0000 1.35 +++ nntpgrab.spec 5 May 2009 15:27:17 -0000 1.36 @@ -1,15 +1,12 @@ Summary: Download files from the usenet Name: nntpgrab -Version: 0.4.90 -Release: 3%{?dist} +Version: 0.4.91 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 Source1: nntpgrab_php.ini Source2: nntpgrab_apache.conf -Patch0: nntpgrab_0_4_90_load_correct_library.patch -Patch1: nntpgrab_0_4_90_fix_removing_collections.patch -Patch2: nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -133,15 +130,6 @@ Web interface to control NNTPGrab %prep %setup -q -# Patch is already applied in upstream SVN rev #1259 -%patch0 -p0 - -# Patch is already applied in upstream SVN rev #1260 -%patch1 -p1 - -# Patch is already applied in upstream SVN rev #1264 -%patch2 -p1 - %build %configure make %{?_smp_mflags} @@ -287,6 +275,10 @@ rm -rf %{buildroot} %{_datadir}/nntpgrab/web %changelog +* Tue May 5 2009 Erik van Pienbroek - 0.4.91-1 +- Update to 0.4.91 +- Drop upstreamed patches + * Mon Apr 13 2009 Erik van Pienbroek - 0.4.90-3 - Added a patch to prevent a possible deadlock (upstream SVN rev #1264) - Added a patch to fix the removal of collections (upstream SVN rev #1260) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 15 Mar 2009 21:38:09 -0000 1.22 +++ sources 5 May 2009 15:27:17 -0000 1.23 @@ -1 +1 @@ -fc48d47b3492ddfa7a975386a59a2fef nntpgrab-0.4.90.tar.bz2 +2e6df8004f0cc5e735297f74bb94b695 nntpgrab-0.4.91.tar.bz2 From epienbro at fedoraproject.org Tue May 5 15:27:49 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Tue, 5 May 2009 15:27:49 +0000 (UTC) Subject: rpms/nntpgrab/devel .cvsignore, 1.19, 1.20 nntpgrab.spec, 1.35, 1.36 sources, 1.22, 1.23 Message-ID: <20090505152749.5573F70108@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20953/devel Modified Files: .cvsignore nntpgrab.spec sources Log Message: - Update to 0.4.91 - Drop upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- .cvsignore 15 Mar 2009 21:04:45 -0000 1.19 +++ .cvsignore 5 May 2009 15:27:18 -0000 1.20 @@ -1 +1 @@ -nntpgrab-0.4.90.tar.bz2 +nntpgrab-0.4.91.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- nntpgrab.spec 13 Apr 2009 10:57:26 -0000 1.35 +++ nntpgrab.spec 5 May 2009 15:27:18 -0000 1.36 @@ -1,15 +1,12 @@ Summary: Download files from the usenet Name: nntpgrab -Version: 0.4.90 -Release: 3%{?dist} +Version: 0.4.91 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 Source1: nntpgrab_php.ini Source2: nntpgrab_apache.conf -Patch0: nntpgrab_0_4_90_load_correct_library.patch -Patch1: nntpgrab_0_4_90_fix_removing_collections.patch -Patch2: nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -133,15 +130,6 @@ Web interface to control NNTPGrab %prep %setup -q -# Patch is already applied in upstream SVN rev #1259 -%patch0 -p0 - -# Patch is already applied in upstream SVN rev #1260 -%patch1 -p1 - -# Patch is already applied in upstream SVN rev #1264 -%patch2 -p1 - %build %configure make %{?_smp_mflags} @@ -287,6 +275,10 @@ rm -rf %{buildroot} %{_datadir}/nntpgrab/web %changelog +* Tue May 5 2009 Erik van Pienbroek - 0.4.91-1 +- Update to 0.4.91 +- Drop upstreamed patches + * Mon Apr 13 2009 Erik van Pienbroek - 0.4.90-3 - Added a patch to prevent a possible deadlock (upstream SVN rev #1264) - Added a patch to fix the removal of collections (upstream SVN rev #1260) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 15 Mar 2009 21:38:09 -0000 1.22 +++ sources 5 May 2009 15:27:19 -0000 1.23 @@ -1 +1 @@ -fc48d47b3492ddfa7a975386a59a2fef nntpgrab-0.4.90.tar.bz2 +2e6df8004f0cc5e735297f74bb94b695 nntpgrab-0.4.91.tar.bz2 From epienbro at fedoraproject.org Tue May 5 15:27:48 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Tue, 5 May 2009 15:27:48 +0000 (UTC) Subject: rpms/nntpgrab/F-9 .cvsignore, 1.18, 1.19 nntpgrab.spec, 1.31, 1.32 sources, 1.22, 1.23 Message-ID: <20090505152748.D3BB570108@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20953/F-9 Modified Files: .cvsignore nntpgrab.spec sources Log Message: - Update to 0.4.91 - Drop upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- .cvsignore 15 Mar 2009 22:03:30 -0000 1.18 +++ .cvsignore 5 May 2009 15:27:18 -0000 1.19 @@ -1 +1 @@ -nntpgrab-0.4.90.tar.bz2 +nntpgrab-0.4.91.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/nntpgrab.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- nntpgrab.spec 13 Apr 2009 10:57:25 -0000 1.31 +++ nntpgrab.spec 5 May 2009 15:27:18 -0000 1.32 @@ -1,15 +1,12 @@ Summary: Download files from the usenet Name: nntpgrab -Version: 0.4.90 -Release: 3%{?dist} +Version: 0.4.91 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 Source1: nntpgrab_php.ini Source2: nntpgrab_apache.conf -Patch0: nntpgrab_0_4_90_load_correct_library.patch -Patch1: nntpgrab_0_4_90_fix_removing_collections.patch -Patch2: nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -133,15 +130,6 @@ Web interface to control NNTPGrab %prep %setup -q -# Patch is already applied in upstream SVN rev #1259 -%patch0 -p0 - -# Patch is already applied in upstream SVN rev #1260 -%patch1 -p1 - -# Patch is already applied in upstream SVN rev #1264 -%patch2 -p1 - %build %configure make %{?_smp_mflags} @@ -287,6 +275,10 @@ rm -rf %{buildroot} %{_datadir}/nntpgrab/web %changelog +* Tue May 5 2009 Erik van Pienbroek - 0.4.91-1 +- Update to 0.4.91 +- Drop upstreamed patches + * Mon Apr 13 2009 Erik van Pienbroek - 0.4.90-3 - Added a patch to prevent a possible deadlock (upstream SVN rev #1264) - Added a patch to fix the removal of collections (upstream SVN rev #1260) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 15 Mar 2009 22:03:30 -0000 1.22 +++ sources 5 May 2009 15:27:18 -0000 1.23 @@ -1 +1 @@ -fc48d47b3492ddfa7a975386a59a2fef nntpgrab-0.4.90.tar.bz2 +2e6df8004f0cc5e735297f74bb94b695 nntpgrab-0.4.91.tar.bz2 From rhughes at fedoraproject.org Tue May 5 15:29:52 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Tue, 5 May 2009 15:29:52 +0000 (UTC) Subject: rpms/PackageKit/devel .cvsignore, 1.44, 1.45 PackageKit.spec, 1.101, 1.102 sources, 1.45, 1.46 PackageKit-0.4.6-check-package-ids-length.patch, 1.1, NONE PackageKit-0.4.6-command-not-found-length.patch, 1.1, NONE PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch, 1.1, NONE PackageKit-0.4.6-correct-sync-logic.patch, 1.1, NONE PackageKit-0.4.6-dont-use-obsolete-interfaces.patch, 1.1, NONE PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch, 1.1, NONE Message-ID: <20090505152952.D03EC70131@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21625 Modified Files: .cvsignore PackageKit.spec sources Removed Files: PackageKit-0.4.6-check-package-ids-length.patch PackageKit-0.4.6-command-not-found-length.patch PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch PackageKit-0.4.6-correct-sync-logic.patch PackageKit-0.4.6-dont-use-obsolete-interfaces.patch PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch Log Message: * Tue May 05 2009 Richard Hughes - 0.4.7-1 - New upstream version, many bugfixes and performance fixes - Remove upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- .cvsignore 30 Mar 2009 16:18:49 -0000 1.44 +++ .cvsignore 5 May 2009 15:29:21 -0000 1.45 @@ -1 +1 @@ -PackageKit-0.4.6.tar.gz +PackageKit-0.4.7.tar.gz Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -p -r1.101 -r1.102 --- PackageKit.spec 14 Apr 2009 16:19:06 -0000 1.101 +++ PackageKit.spec 5 May 2009 15:29:22 -0000 1.102 @@ -8,9 +8,9 @@ Summary: Package management service Name: PackageKit -Version: 0.4.6 +Version: 0.4.7 #Release: 0.3.%{?alphatag}git%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.packagekit.org @@ -24,24 +24,6 @@ Patch0: PackageKit-0.3.8-Fedora-Vendo # Fedora specific: the yum backend doesn't do time estimation correctly Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch -# Already upstream: 4dfcd53103ac572e27e67e85088b6dee48b2e171 -Patch2: PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch - -# Already upstream: 826973135802ee453e014dc601168690b49af25d -Patch3: PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch - -# Already upstream: 79ace3ef67c14b435b2c0d8330aaa7a8774b482c -Patch4: PackageKit-0.4.6-check-package-ids-length.patch - -# Already upstream: b55842c2243c41850b839f900fe333ff3dbef2ab -Patch5: PackageKit-0.4.6-command-not-found-length.patch - -# Already upstream: 28151ea72bcdd826a2d3a3f9109a073e90962169 -Patch6: PackageKit-0.4.6-correct-sync-logic.patch - -# Already upstream: 31b85c79d516d0b97b87c2b205e9fea00c9190ed..426e6a8ba3be3408347af1d8f200956818e230cf -Patch7: PackageKit-0.4.6-dont-use-obsolete-interfaces.patch - Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: PackageKit-glib = %{version}-%{release} @@ -143,9 +125,6 @@ GLib libraries for accessing PackageKit. Summary: QT libraries for accessing PackageKit Group: Development/Libraries Requires: %{name} = %{version}-%{release} -# 2 short-lived rawhide pkgs -Obsoletes: packagekit-qt < 0.3.1 -Obsoletes: qpackagekit < 0.3.1-2 %description qt QT libraries for accessing PackageKit. @@ -178,9 +157,6 @@ Summary: QT Libraries and headers for Pa Group: Development/Libraries Requires: %{name}-qt = %{version}-%{release} Requires: pkgconfig -# 2 short-lived rawhide pkgs -Obsoletes: packagekit-qt-devel < 0.3.1 -Obsoletes: qpackagekit-devel < 0.3.1-2 %description qt-devel QT headers and libraries for PackageKit. @@ -242,12 +218,6 @@ using PackageKit. %setup -q %patch0 -p1 -b .fedora %patch1 -p1 -b .no-time -%patch2 -p1 -b .fake-repo-unicode -%patch3 -p1 -b .correct-allow-cancel -%patch4 -p1 -b .check-lengths -%patch5 -p1 -b .cmd-not-found-lengths -%patch6 -p1 -b .sync-logic -%patch7 -p1 -b .dont-use-obsolete %build %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck @@ -267,7 +237,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la -chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py touch $RPM_BUILD_ROOT%{_localstatedir}/cache/PackageKit/groups.sqlite # create a link that GStreamer will recognise @@ -291,12 +260,6 @@ rm -rf $RPM_BUILD_ROOT %post update-mime-database %{_datadir}/mime &> /dev/null || : -# the job count used to live in /var/run, but it's now in /var/lib with the -# other persistent bits -if [ -e %{_localstatedir}/run/PackageKit/job_count.dat ]; then - mv %{_localstatedir}/run/PackageKit/job_count.dat %{_localstatedir}/lib/PackageKit/job_count.dat -fi - %postun update-mime-database %{_datadir}/mime &> /dev/null || : @@ -339,10 +302,8 @@ update-mime-database %{_datadir}/mime &> %{_libdir}/packagekit-backend/libpk_backend_dummy.so %{_libdir}/packagekit-backend/libpk_backend_test_*.so %ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db -%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/job_count.dat %{_datadir}/dbus-1/system-services/*.service %{_libdir}/pm-utils/sleep.d/95packagekit -%{_libexecdir}/*py* %files docs %defattr(-,root,root,-) @@ -442,6 +403,10 @@ update-mime-database %{_datadir}/mime &> %{_includedir}/PackageKit/backend/*.h %changelog +* Tue May 05 2009 Richard Hughes - 0.4.7-1 +- New upstream version, many bugfixes and performance fixes +- Remove upstreamed patches + * Tue Apr 14 2009 Richard Hughes - 0.4.6-3 - Backport 4 important patches from upstream. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- sources 30 Mar 2009 16:18:50 -0000 1.45 +++ sources 5 May 2009 15:29:22 -0000 1.46 @@ -1 +1 @@ -66ef4281047ad51f499ec05420028f11 PackageKit-0.4.6.tar.gz +a209c31dd6d910216e8765f76f2d9085 PackageKit-0.4.7.tar.gz --- PackageKit-0.4.6-check-package-ids-length.patch DELETED --- --- PackageKit-0.4.6-command-not-found-length.patch DELETED --- --- PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch DELETED --- --- PackageKit-0.4.6-correct-sync-logic.patch DELETED --- --- PackageKit-0.4.6-dont-use-obsolete-interfaces.patch DELETED --- --- PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch DELETED --- From nsantos at fedoraproject.org Tue May 5 15:30:53 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Tue, 5 May 2009 15:30:53 +0000 (UTC) Subject: rpms/qpidc/F-11 qpidc.patch,NONE,1.1 qpidc.spec,1.77,1.78 Message-ID: <20090505153053.495B170131@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22250 Modified Files: qpidc.spec Added Files: qpidc.patch Log Message: patch for SASL credentials refresh qpidc.patch: --- NEW FILE qpidc.patch --- diff -up src/qpid/client/Connector.cpp.orig src/qpid/client/Connector.cpp --- src/qpid/client/Connector.cpp.orig 2009-05-04 16:06:17.000000000 -0400 +++ src/qpid/client/Connector.cpp 2009-05-04 16:07:06.000000000 -0400 @@ -391,11 +391,13 @@ void TCPConnector::run() { aio->start(poller); d.run(); - socket.close(); } catch (const std::exception& e) { QPID_LOG(error, QPID_MSG("FAIL " << identifier << ": " << e.what())); handleClosed(); } + try { + socket.close(); + } catch (const std::exception& e) {} } void TCPConnector::activateSecurityLayer(std::auto_ptr sl) Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 --- qpidc.spec 1 Apr 2009 13:15:51 -0000 1.77 +++ qpidc.spec 5 May 2009 15:30:23 -0000 1.78 @@ -7,13 +7,14 @@ Name: qpidc Version: 0.5.752600 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: ASL 2.0 URL: http://qpid.apache.org Source0: %{name}-%{version}.tar.gz Source1: qpidd.pp +Patch: qpidc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel @@ -196,6 +197,7 @@ exit 0 %prep %setup -q +%patch %define perftests "perftest topic_listener topic_publisher \ latencytest client_test txtest" @@ -409,6 +411,9 @@ fi %postun -n qmf -p /sbin/ldconfig %changelog +* Mon May 4 2009 Nuno Santos - 0.5.752600-6 +- patch for SASL credentials refresh + * Wed Apr 1 2009 Michael Schwendt - 0.5.752600-5 - Fix unowned examples directory in -devel pkg. From nsantos at fedoraproject.org Tue May 5 15:34:33 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Tue, 5 May 2009 15:34:33 +0000 (UTC) Subject: rpms/ruby-qpid/F-10 ruby.patch,NONE,1.1 ruby-qpid.spec,1.14,1.15 Message-ID: <20090505153433.BDDB870108@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/ruby-qpid/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23184 Modified Files: ruby-qpid.spec Added Files: ruby.patch Log Message: patch for SASL credentials refresh ruby.patch: --- NEW FILE ruby.patch --- diff -up lib/qpid/framer.rb.orig lib/qpid/framer.rb --- lib/qpid/framer.rb.orig 2009-05-04 16:27:09.000000000 -0400 +++ lib/qpid/framer.rb 2009-05-04 16:28:11.000000000 -0400 @@ -137,6 +137,8 @@ module Qpid @tx_buf = "" frm.debug("FLUSHED") if frm end + rescue + @sock.close unless @sock.closed? end def _write(buf) diff -up lib/qpid/qmf.rb.orig lib/qpid/qmf.rb --- lib/qpid/qmf.rb.orig 2009-01-20 16:26:28.000000000 -0500 +++ lib/qpid/qmf.rb 2009-05-04 16:28:11.000000000 -0400 @@ -247,7 +247,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key => "console.obj.*.*.#{package_name}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -259,7 +259,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key=> "console.obj.*.*.#{package_name}.#{class_name}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -272,7 +272,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key => "console.obj.*.*.#{pname}.#{cname}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -329,19 +329,21 @@ module Qpid::Qmf unless broker_list.include?(agent.broker) raise ArgumentError, "Supplied agent is not accessible through the supplied broker" end - agent_list << agent + agent_list << agent if agent.broker.connected? else if kwargs.include?(:object_id) oid = kwargs[:object_id] broker_list.each { |broker| broker.agents.each { |agent| if oid.broker_bank == agent.broker_bank && oid.agent_bank == agent.agent_bank - agent_list << agent + agent_list << agent if agent.broker.connected? end } } else - broker_list.each { |broker| agent_list += broker.agents } + broker_list.each { |broker| + agent_list += broker.agents if broker.connected? + } end end @@ -600,8 +602,8 @@ module Qpid::Qmf def handle_broker_disconnect(broker); end def handle_error(error) - @error = error synchronize do + @error = error if @sync_sequence_list.length > 0 @sync_sequence_list = [] @cv.signal end @@ -1179,7 +1181,7 @@ module Qpid::Qmf end end - rescue Qpid::Session::Closed, Qpid::Session::Detached, SystemCallError + rescue delay *= DELAY_FACTOR if delay < DELAY_MAX end @@ -1214,6 +1216,7 @@ module Qpid::Qmf class Broker SYNC_TIME = 60 + @@next_seq = 1 include MonitorMixin @@ -1237,17 +1240,13 @@ module Qpid::Qmf @auth_mechanism = kwargs[:mechanism] @auth_service = kwargs[:service] @broker_bank = 1 - @agents = {} - @agents["1.0"] = Agent.new(self, 0, "BrokerAgent") @topic_bound = false @cv = new_cond - @sync_in_flight = false - @sync_request = 0 - @sync_result = nil - @reqs_outstanding = 1 - @error = nil - @broker_id = nil + @error = nil + @broker_id = nil @is_connected = false + @amqp_session_id = "%s.%d.%d" % [Socket.gethostname, Process::pid, @@next_seq] + @@next_seq += 1 @conn = nil if @session.managedConnections? @thread = ManagedConnection.new(self) @@ -1292,6 +1291,7 @@ module Qpid::Qmf def wait_for_stable synchronize do + return unless connected? return if @reqs_outstanding == 0 @sync_in_flight = true unless @cv.wait_for(SYNC_TIME) { @reqs_outstanding == 0 } @@ -1387,8 +1387,14 @@ module Qpid::Qmf end def try_to_connect - #begin - @amqp_session_id = "%s.%d" % [Socket.gethostname, Process::pid] + @agents = {} + @agents["1.0"] = Agent.new(self, 0, "BrokerAgent") + @topic_bound = false + @sync_in_flight = false + @sync_request = 0 + @sync_result = nil + @reqs_outstanding = 1 + # FIXME: Need sth for Qpid::Util::connect @conn = Qpid::Connection.new(TCPSocket.new(@host, @port), diff -up lib/qpid/session.rb.orig lib/qpid/session.rb --- lib/qpid/session.rb.orig 2009-05-04 16:26:59.000000000 -0400 +++ lib/qpid/session.rb 2009-05-04 16:28:11.000000000 -0400 @@ -114,7 +114,7 @@ module Qpid end end if error? - raise Qpid::Session::Exception, exceptions + raise Qpid::Session::Exception, @exceptions end end Index: ruby-qpid.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-qpid/F-10/ruby-qpid.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- ruby-qpid.spec 19 Mar 2009 19:13:20 -0000 1.14 +++ ruby-qpid.spec 5 May 2009 15:34:03 -0000 1.15 @@ -1,6 +1,6 @@ Name: ruby-qpid Version: 0.5.752600 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby language client for AMQP Group: Development/Ruby @@ -10,6 +10,7 @@ Source0: %{name}-%{version}.tar.g # svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/ruby \ # ruby-qpid # tar czf ruby-qpid.tar.gz ruby-qpid +Patch: ruby.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} @@ -37,6 +38,7 @@ The Apache Qpid project's Ruby language %prep %setup -q -n %{name}-%{version} +%patch %build rake build @@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.txt NOTICE.txt RELEASE_NOTES %changelog +* Mon May 4 2009 Nuno Santos - 0.5.752600-2 +- patch for SASL credentials refresh + * Thu Mar 19 2009 Nuno Santos - 0.5.752600-1 - Rebased to svn rev 752600 From epienbro at fedoraproject.org Tue May 5 15:42:39 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Tue, 5 May 2009 15:42:39 +0000 (UTC) Subject: rpms/nntpgrab/EL-5 nntpgrab.spec,1.36,1.37 Message-ID: <20090505154239.7E47670108@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25349 Modified Files: nntpgrab.spec Log Message: EL-5 build fix Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/nntpgrab.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- nntpgrab.spec 5 May 2009 15:27:16 -0000 1.36 +++ nntpgrab.spec 5 May 2009 15:42:08 -0000 1.37 @@ -34,7 +34,7 @@ BuildRequires: par2cmdline BuildRequires: nss-devel BuildRequires: nss_compat_ossl-devel BuildRequires: PolicyKit-gnome-devel -%if 0%{fedora} == 9 +%if 0%{?fedora} == 9 BuildRequires: gail-devel %endif From cweyl at fedoraproject.org Tue May 5 15:42:55 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Tue, 5 May 2009 15:42:55 +0000 (UTC) Subject: rpms/perl-Data-Visitor/devel .cvsignore, 1.5, 1.6 perl-Data-Visitor.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <20090505154255.23B4F70108@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Data-Visitor/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25500 Modified Files: .cvsignore perl-Data-Visitor.spec sources Log Message: * Tue May 05 2009 Chris Weyl 0.24-1 - update to 0.24 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Visitor/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 11 Feb 2009 03:02:49 -0000 1.5 +++ .cvsignore 5 May 2009 15:42:24 -0000 1.6 @@ -1 +1 @@ -Data-Visitor-0.22.tar.gz +Data-Visitor-0.24.tar.gz Index: perl-Data-Visitor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Visitor/devel/perl-Data-Visitor.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- perl-Data-Visitor.spec 26 Feb 2009 14:37:56 -0000 1.7 +++ perl-Data-Visitor.spec 5 May 2009 15:42:24 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Data-Visitor -Version: 0.22 -Release: 2%{?dist} +Version: 0.24 +Release: 1%{?dist} Summary: Visitor style traversal of Perl data structures License: GPL+ or Artistic Group: Development/Libraries @@ -15,7 +15,7 @@ BuildRequires: perl(Class::Accessor) BuildRequires: perl(ExtUtils::MakeMaker) # new for 0.19 BuildRequires: perl(Data::Alias) -BuildRequires: perl(Mouse) +BuildRequires: perl(Any::Moose) BuildRequires: perl(namespace::clean) BuildRequires: perl(Task::Weaken) BuildRequires: perl(Tie::ToObject) @@ -60,6 +60,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Tue May 05 2009 Chris Weyl 0.24-1 +- update to 0.24 + * Thu Feb 26 2009 Fedora Release Engineering - 0.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Visitor/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 11 Feb 2009 03:02:49 -0000 1.5 +++ sources 5 May 2009 15:42:24 -0000 1.6 @@ -1 +1 @@ -f3bca28efc96aef200dd6bba74510c12 Data-Visitor-0.22.tar.gz +b69891174e4380cfe20fcb69a79a4093 Data-Visitor-0.24.tar.gz From ltinkl at fedoraproject.org Tue May 5 15:51:33 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 5 May 2009 15:51:33 +0000 (UTC) Subject: rpms/kde-l10n/F-10 kde-l10n.spec,1.58,1.59 sources,1.21,1.22 Message-ID: <20090505155133.9D73F70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kde-l10n/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26445/F-10 Modified Files: kde-l10n.spec sources Log Message: KDE 4.2.3 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- kde-l10n.spec 3 Apr 2009 12:55:17 -0000 1.58 +++ kde-l10n.spec 5 May 2009 15:51:02 -0000 1.59 @@ -1,7 +1,7 @@ %define buildall 0 Name: kde-l10n -Version: 4.2.2 +Version: 4.2.3 Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE @@ -1382,6 +1382,9 @@ rm -rf %{buildroot} %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Mar 31 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-10/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 3 Apr 2009 12:55:18 -0000 1.21 +++ sources 5 May 2009 15:51:03 -0000 1.22 @@ -1,56 +1,55 @@ -90f064a42e5c197631fdec8ae1e1c2df kde-l10n-ar-4.2.2.tar.bz2 -d6f9cc4fce05427c23e05ad7a6e501f8 kde-l10n-bg-4.2.2.tar.bz2 -0ca74656701506ff0e2eb404d42af4e5 kde-l10n-bn_IN-4.2.2.tar.bz2 -f860f8c0eb81764bf48d27fa253d1abd kde-l10n-ca-4.2.2.tar.bz2 -c8aa7eab14d89466bf3738e70e255d87 kde-l10n-cs-4.2.2.tar.bz2 -70145686a60f2db1ab66d0fe3a395e59 kde-l10n-csb-4.2.2.tar.bz2 -2db197e069695fe6ddaa709e2e646878 kde-l10n-da-4.2.2.tar.bz2 -4a669b86c523cb78a45bbf3e1d03507d kde-l10n-de-4.2.2.tar.bz2 -1dd033fc59ce3874d6cd30244a715253 kde-l10n-el-4.2.2.tar.bz2 -bec69c9899683a35b40fea7dc65cc920 kde-l10n-en_GB-4.2.2.tar.bz2 -37c561521e1d89389a0f1d5df39cc1b3 kde-l10n-es-4.2.2.tar.bz2 -c536c5f67a5cff82dc097c01f081e16d kde-l10n-et-4.2.2.tar.bz2 -00f1513bcfee2d6c5bfe413ecba67723 kde-l10n-eu-4.2.2.tar.bz2 -4c11d695a375f5fe830d92e80a19a8bf kde-l10n-fi-4.2.2.tar.bz2 -d0fbc486e241dd0a1ad650c044c82656 kde-l10n-fr-4.2.2.tar.bz2 -d9f5a315259812b48ca86cc3818d5825 kde-l10n-ga-4.2.2.tar.bz2 -b268bdfa5b8f603cdbe0a557aaedb1bc kde-l10n-gl-4.2.2.tar.bz2 -a73aabc124459d51eb3207042665f472 kde-l10n-gu-4.2.2.tar.bz2 -570cfa032ec3cb46bceb0eb1c0c9e6d4 kde-l10n-he-4.2.2.tar.bz2 -f43d0563b66a16a73bb3f2f5f95362bf kde-l10n-hi-4.2.2.tar.bz2 -4f58a17ed248c57ea55dbceeacf359e2 kde-l10n-hu-4.2.2.tar.bz2 -10faf2af63662f6842562b24a0c295a3 kde-l10n-is-4.2.2.tar.bz2 -c54364f89abb34d2469bc4cf4da6f840 kde-l10n-it-4.2.2.tar.bz2 -a8022ab1be8c8e143167828cdbcf0e1e kde-l10n-ja-4.2.2.tar.bz2 -d441ed4bed5e3dca6e8498f762f042c2 kde-l10n-kk-4.2.2.tar.bz2 -1443dad476a3df65222030000262001a kde-l10n-km-4.2.2.tar.bz2 -3bf7d7fb9004865d8da5588a25d352e6 kde-l10n-kn-4.2.2.tar.bz2 -2680181faf79a7c893a1a1240a2adf4d kde-l10n-ko-4.2.2.tar.bz2 -58e0a1ed8627c5b841b44994665ae5dc kde-l10n-ku-4.2.2.tar.bz2 -c7b90195d2cd4be2a723e8c0e9089166 kde-l10n-lt-4.2.2.tar.bz2 -028be5e0d058ab8759792e3da7d0daa9 kde-l10n-lv-4.2.2.tar.bz2 -4ea512bd91efa95a1af42c3156329815 kde-l10n-mai-4.2.2.tar.bz2 -7cdd7d4e33bb782a541f1d004f444e24 kde-l10n-mk-4.2.2.tar.bz2 -0f6ea12f6db2cace8491a7a2c4879b3b kde-l10n-ml-4.2.2.tar.bz2 -2bf97467d21b48d16a6a5c9e7db4a0ad kde-l10n-mr-4.2.2.tar.bz2 -7d8fec243c5b76a29807413d372e0356 kde-l10n-nb-4.2.2.tar.bz2 -346172f49029f9aa621bd8fa4e401083 kde-l10n-nds-4.2.2.tar.bz2 -bb7f95e030ee6b0b13ab12489ce5f963 kde-l10n-nl-4.2.2.tar.bz2 -5ada2c1895846e9c9985a8ea4f34f0e5 kde-l10n-nn-4.2.2.tar.bz2 -b019a54c931b1dcae659976f56d236c5 kde-l10n-pa-4.2.2.tar.bz2 -118f22de9b47b1ac326d849175ddd6f5 kde-l10n-pl-4.2.2.tar.bz2 -394964f96e21d087dfdf52989a2ec2fe kde-l10n-pt-4.2.2.tar.bz2 -b3ab2486a8079791682b17c3caa89ed1 kde-l10n-pt_BR-4.2.2.tar.bz2 -003ac0ebada9173c9eee8ded8b293454 kde-l10n-ro-4.2.2.tar.bz2 -45b2679ac7c1554ec02816a2c509dea0 kde-l10n-ru-4.2.2.tar.bz2 -3d8b43de7bd364364f01648a3bc9cf95 kde-l10n-sl-4.2.2.tar.bz2 -166976c4a4129fa361f7643e57bcebce kde-l10n-sr-4.2.2.tar.bz2 -d993387a13813af942154cc1d10a3ce5 kde-l10n-sv-4.2.2.tar.bz2 -6ec453392f7f7ebaa2bdce79c10a9884 kde-l10n-tg-4.2.2.tar.bz2 -bf04317460335654aa0482ad0000b58f kde-l10n-th-4.2.2.tar.bz2 -04c3780701be20682bd772159ec78f1f kde-l10n-tr-4.2.2.tar.bz2 -3863787f2e4721b1568db2a9736454e7 kde-l10n-uk-4.2.2.tar.bz2 -c2a082a4049fe340d108d1145d53451c kde-l10n-wa-4.2.2.tar.bz2 -34de085cac6f862b359d1ce3e9ccfeed kde-l10n-zh_CN-4.2.2.tar.bz2 -f0c15cd1f14783f7d895355fe5754f61 kde-l10n-zh_TW-4.2.2.tar.bz2 -855181e00df828278d4ae83e6c8aba7b kde-l10n-sk-4.2.2.tar.bz2 +95809a4c9667f3f25cbef8b53db6cf9a kde-l10n-ar-4.2.3.tar.bz2 +08ac7ea15ac0fe1aeae018b51218127e kde-l10n-bg-4.2.3.tar.bz2 +ced95c116f8156ee71add92c8a644c21 kde-l10n-bn_IN-4.2.3.tar.bz2 +47a9e27b2f2012f912ff5f5029d8ccfa kde-l10n-ca-4.2.3.tar.bz2 +272e849626d7f73fece2eb41df5f8564 kde-l10n-cs-4.2.3.tar.bz2 +2584d7952b48ee703441d47280231b6d kde-l10n-csb-4.2.3.tar.bz2 +2177ef96abba7651c40246d1b769fc21 kde-l10n-da-4.2.3.tar.bz2 +880e3653b093e9218cccc6475c831d24 kde-l10n-de-4.2.3.tar.bz2 +0a914f96a3c7674616b4721e5767772d kde-l10n-el-4.2.3.tar.bz2 +55fe19285930ccaac4d5c4a4b050597a kde-l10n-en_GB-4.2.3.tar.bz2 +9c5a529d44f76cc7e7359d38ca95f3c8 kde-l10n-es-4.2.3.tar.bz2 +415cb082a2cb3d27757f34d2d9f1be26 kde-l10n-et-4.2.3.tar.bz2 +aa1165755a8758326d6191c03268e91a kde-l10n-eu-4.2.3.tar.bz2 +d3d7050c380cdb693e92a32696d6424a kde-l10n-fi-4.2.3.tar.bz2 +170850e43ac8b613797a9803e35b76d7 kde-l10n-fr-4.2.3.tar.bz2 +46f90cff4dc01c9834c0a8629ad3c44f kde-l10n-ga-4.2.3.tar.bz2 +804dc1ba927ac609ac86af1d1eb07bb2 kde-l10n-gl-4.2.3.tar.bz2 +80bd46b64357e86d959a94ca0bdc8dd7 kde-l10n-gu-4.2.3.tar.bz2 +bbf3a3eac19a3d42db9992645d80363c kde-l10n-he-4.2.3.tar.bz2 +e14339721f8db47a81da3aad825e8be2 kde-l10n-hi-4.2.3.tar.bz2 +5c2d14ceca042f422260043f33988d0b kde-l10n-hu-4.2.3.tar.bz2 +248e06b8bbf2f86ab01a38604c17f067 kde-l10n-is-4.2.3.tar.bz2 +124afb0a334ded46259de1ca827ce9e3 kde-l10n-it-4.2.3.tar.bz2 +2019bb97f4ef60e8eb98a9b62afb1ea3 kde-l10n-ja-4.2.3.tar.bz2 +7be7bd63604b797d3799429ada43330b kde-l10n-kk-4.2.3.tar.bz2 +a64adffd0e69caf74bef668d5f41f7bf kde-l10n-km-4.2.3.tar.bz2 +f7280d96bfe4b3655873905bb6a348ea kde-l10n-ko-4.2.3.tar.bz2 +dac8760279c062a2b618ef2407d20eed kde-l10n-ku-4.2.3.tar.bz2 +a14e292256c56c0aac3cceb025169d2f kde-l10n-lt-4.2.3.tar.bz2 +0e58c3d1237ed139cf4481cc7aefca27 kde-l10n-lv-4.2.3.tar.bz2 +4624efc27c176e2798cee2a989fb5003 kde-l10n-mai-4.2.3.tar.bz2 +5243adb4503a8480888695b7b33f4e6a kde-l10n-mk-4.2.3.tar.bz2 +ee123b87203fb3af83419dc7f81a3f30 kde-l10n-ml-4.2.3.tar.bz2 +f729127f4fa9aa2ab607e579468bff98 kde-l10n-mr-4.2.3.tar.bz2 +cbdd2cf71d48739d76319b0cd64f83ed kde-l10n-nb-4.2.3.tar.bz2 +dd6ec56d0b6dabf4b3398f7aedf91d22 kde-l10n-nds-4.2.3.tar.bz2 +6d1d498d712e5531a6dc25650ba0568d kde-l10n-nl-4.2.3.tar.bz2 +015b7a90b06f628882b108e507de1b08 kde-l10n-nn-4.2.3.tar.bz2 +975b2e078ff917c58426c0c9e15dc7f5 kde-l10n-pa-4.2.3.tar.bz2 +588fa168569034994b097bcf84cc017f kde-l10n-pl-4.2.3.tar.bz2 +95ff08b154d2ea493619548cc7b7e4cd kde-l10n-pt-4.2.3.tar.bz2 +c0a148cedc216d68d8f00ca3e67f0e32 kde-l10n-pt_BR-4.2.3.tar.bz2 +165d7be11d8715d10a2f308af63b622a kde-l10n-ro-4.2.3.tar.bz2 +6eb77d7060d66cb1bb197c56c0bfa037 kde-l10n-ru-4.2.3.tar.bz2 +1dafc2ff1a3cd03560821f6543a52c72 kde-l10n-sk-4.2.3.tar.bz2 +d4e9cabebf23dcfbb3396a455eb5d313 kde-l10n-sl-4.2.3.tar.bz2 +c344832cc27e7ea334c8c6403e103a3d kde-l10n-sr-4.2.3.tar.bz2 +a2e41b974fa502abac3e3e1844f2b2c4 kde-l10n-sv-4.2.3.tar.bz2 +6d78d6c7d163dfc05c26eec22037fe33 kde-l10n-tg-4.2.3.tar.bz2 +f3df1d0c698f6e7a0f39a2ecd6ba8c86 kde-l10n-th-4.2.3.tar.bz2 +8858f2a10c00300c70d58e76823cbc84 kde-l10n-tr-4.2.3.tar.bz2 +e2b5a450f9993d89283fbd49692e77bd kde-l10n-uk-4.2.3.tar.bz2 +73078462bb9308568830ad80d4ab73c1 kde-l10n-wa-4.2.3.tar.bz2 +c682c6b9d2acb18f3262ccf2b099f1fe kde-l10n-zh_CN-4.2.3.tar.bz2 +f439a4e95bd100e0ec090fb0401d1f4e kde-l10n-zh_TW-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Tue May 5 15:51:34 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 5 May 2009 15:51:34 +0000 (UTC) Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.45,1.46 sources,1.20,1.21 Message-ID: <20090505155134.0A8CA70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kde-l10n/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26445/F-9 Modified Files: kde-l10n.spec sources Log Message: KDE 4.2.3 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- kde-l10n.spec 3 Apr 2009 13:05:28 -0000 1.45 +++ kde-l10n.spec 5 May 2009 15:51:03 -0000 1.46 @@ -1,7 +1,7 @@ %define buildall 0 Name: kde-l10n -Version: 4.2.2 +Version: 4.2.3 Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE @@ -1382,6 +1382,9 @@ rm -rf %{buildroot} %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Mar 31 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sources 3 Apr 2009 13:05:28 -0000 1.20 +++ sources 5 May 2009 15:51:03 -0000 1.21 @@ -1,56 +1,55 @@ -90f064a42e5c197631fdec8ae1e1c2df kde-l10n-ar-4.2.2.tar.bz2 -d6f9cc4fce05427c23e05ad7a6e501f8 kde-l10n-bg-4.2.2.tar.bz2 -0ca74656701506ff0e2eb404d42af4e5 kde-l10n-bn_IN-4.2.2.tar.bz2 -f860f8c0eb81764bf48d27fa253d1abd kde-l10n-ca-4.2.2.tar.bz2 -c8aa7eab14d89466bf3738e70e255d87 kde-l10n-cs-4.2.2.tar.bz2 -70145686a60f2db1ab66d0fe3a395e59 kde-l10n-csb-4.2.2.tar.bz2 -2db197e069695fe6ddaa709e2e646878 kde-l10n-da-4.2.2.tar.bz2 -4a669b86c523cb78a45bbf3e1d03507d kde-l10n-de-4.2.2.tar.bz2 -1dd033fc59ce3874d6cd30244a715253 kde-l10n-el-4.2.2.tar.bz2 -bec69c9899683a35b40fea7dc65cc920 kde-l10n-en_GB-4.2.2.tar.bz2 -37c561521e1d89389a0f1d5df39cc1b3 kde-l10n-es-4.2.2.tar.bz2 -c536c5f67a5cff82dc097c01f081e16d kde-l10n-et-4.2.2.tar.bz2 -00f1513bcfee2d6c5bfe413ecba67723 kde-l10n-eu-4.2.2.tar.bz2 -4c11d695a375f5fe830d92e80a19a8bf kde-l10n-fi-4.2.2.tar.bz2 -d0fbc486e241dd0a1ad650c044c82656 kde-l10n-fr-4.2.2.tar.bz2 -d9f5a315259812b48ca86cc3818d5825 kde-l10n-ga-4.2.2.tar.bz2 -b268bdfa5b8f603cdbe0a557aaedb1bc kde-l10n-gl-4.2.2.tar.bz2 -a73aabc124459d51eb3207042665f472 kde-l10n-gu-4.2.2.tar.bz2 -570cfa032ec3cb46bceb0eb1c0c9e6d4 kde-l10n-he-4.2.2.tar.bz2 -f43d0563b66a16a73bb3f2f5f95362bf kde-l10n-hi-4.2.2.tar.bz2 -4f58a17ed248c57ea55dbceeacf359e2 kde-l10n-hu-4.2.2.tar.bz2 -10faf2af63662f6842562b24a0c295a3 kde-l10n-is-4.2.2.tar.bz2 -c54364f89abb34d2469bc4cf4da6f840 kde-l10n-it-4.2.2.tar.bz2 -a8022ab1be8c8e143167828cdbcf0e1e kde-l10n-ja-4.2.2.tar.bz2 -d441ed4bed5e3dca6e8498f762f042c2 kde-l10n-kk-4.2.2.tar.bz2 -1443dad476a3df65222030000262001a kde-l10n-km-4.2.2.tar.bz2 -3bf7d7fb9004865d8da5588a25d352e6 kde-l10n-kn-4.2.2.tar.bz2 -2680181faf79a7c893a1a1240a2adf4d kde-l10n-ko-4.2.2.tar.bz2 -58e0a1ed8627c5b841b44994665ae5dc kde-l10n-ku-4.2.2.tar.bz2 -c7b90195d2cd4be2a723e8c0e9089166 kde-l10n-lt-4.2.2.tar.bz2 -028be5e0d058ab8759792e3da7d0daa9 kde-l10n-lv-4.2.2.tar.bz2 -4ea512bd91efa95a1af42c3156329815 kde-l10n-mai-4.2.2.tar.bz2 -7cdd7d4e33bb782a541f1d004f444e24 kde-l10n-mk-4.2.2.tar.bz2 -0f6ea12f6db2cace8491a7a2c4879b3b kde-l10n-ml-4.2.2.tar.bz2 -2bf97467d21b48d16a6a5c9e7db4a0ad kde-l10n-mr-4.2.2.tar.bz2 -7d8fec243c5b76a29807413d372e0356 kde-l10n-nb-4.2.2.tar.bz2 -346172f49029f9aa621bd8fa4e401083 kde-l10n-nds-4.2.2.tar.bz2 -bb7f95e030ee6b0b13ab12489ce5f963 kde-l10n-nl-4.2.2.tar.bz2 -5ada2c1895846e9c9985a8ea4f34f0e5 kde-l10n-nn-4.2.2.tar.bz2 -b019a54c931b1dcae659976f56d236c5 kde-l10n-pa-4.2.2.tar.bz2 -118f22de9b47b1ac326d849175ddd6f5 kde-l10n-pl-4.2.2.tar.bz2 -394964f96e21d087dfdf52989a2ec2fe kde-l10n-pt-4.2.2.tar.bz2 -b3ab2486a8079791682b17c3caa89ed1 kde-l10n-pt_BR-4.2.2.tar.bz2 -003ac0ebada9173c9eee8ded8b293454 kde-l10n-ro-4.2.2.tar.bz2 -45b2679ac7c1554ec02816a2c509dea0 kde-l10n-ru-4.2.2.tar.bz2 -3d8b43de7bd364364f01648a3bc9cf95 kde-l10n-sl-4.2.2.tar.bz2 -166976c4a4129fa361f7643e57bcebce kde-l10n-sr-4.2.2.tar.bz2 -d993387a13813af942154cc1d10a3ce5 kde-l10n-sv-4.2.2.tar.bz2 -6ec453392f7f7ebaa2bdce79c10a9884 kde-l10n-tg-4.2.2.tar.bz2 -bf04317460335654aa0482ad0000b58f kde-l10n-th-4.2.2.tar.bz2 -04c3780701be20682bd772159ec78f1f kde-l10n-tr-4.2.2.tar.bz2 -3863787f2e4721b1568db2a9736454e7 kde-l10n-uk-4.2.2.tar.bz2 -c2a082a4049fe340d108d1145d53451c kde-l10n-wa-4.2.2.tar.bz2 -34de085cac6f862b359d1ce3e9ccfeed kde-l10n-zh_CN-4.2.2.tar.bz2 -f0c15cd1f14783f7d895355fe5754f61 kde-l10n-zh_TW-4.2.2.tar.bz2 -855181e00df828278d4ae83e6c8aba7b kde-l10n-sk-4.2.2.tar.bz2 +95809a4c9667f3f25cbef8b53db6cf9a kde-l10n-ar-4.2.3.tar.bz2 +08ac7ea15ac0fe1aeae018b51218127e kde-l10n-bg-4.2.3.tar.bz2 +ced95c116f8156ee71add92c8a644c21 kde-l10n-bn_IN-4.2.3.tar.bz2 +47a9e27b2f2012f912ff5f5029d8ccfa kde-l10n-ca-4.2.3.tar.bz2 +272e849626d7f73fece2eb41df5f8564 kde-l10n-cs-4.2.3.tar.bz2 +2584d7952b48ee703441d47280231b6d kde-l10n-csb-4.2.3.tar.bz2 +2177ef96abba7651c40246d1b769fc21 kde-l10n-da-4.2.3.tar.bz2 +880e3653b093e9218cccc6475c831d24 kde-l10n-de-4.2.3.tar.bz2 +0a914f96a3c7674616b4721e5767772d kde-l10n-el-4.2.3.tar.bz2 +55fe19285930ccaac4d5c4a4b050597a kde-l10n-en_GB-4.2.3.tar.bz2 +9c5a529d44f76cc7e7359d38ca95f3c8 kde-l10n-es-4.2.3.tar.bz2 +415cb082a2cb3d27757f34d2d9f1be26 kde-l10n-et-4.2.3.tar.bz2 +aa1165755a8758326d6191c03268e91a kde-l10n-eu-4.2.3.tar.bz2 +d3d7050c380cdb693e92a32696d6424a kde-l10n-fi-4.2.3.tar.bz2 +170850e43ac8b613797a9803e35b76d7 kde-l10n-fr-4.2.3.tar.bz2 +46f90cff4dc01c9834c0a8629ad3c44f kde-l10n-ga-4.2.3.tar.bz2 +804dc1ba927ac609ac86af1d1eb07bb2 kde-l10n-gl-4.2.3.tar.bz2 +80bd46b64357e86d959a94ca0bdc8dd7 kde-l10n-gu-4.2.3.tar.bz2 +bbf3a3eac19a3d42db9992645d80363c kde-l10n-he-4.2.3.tar.bz2 +e14339721f8db47a81da3aad825e8be2 kde-l10n-hi-4.2.3.tar.bz2 +5c2d14ceca042f422260043f33988d0b kde-l10n-hu-4.2.3.tar.bz2 +248e06b8bbf2f86ab01a38604c17f067 kde-l10n-is-4.2.3.tar.bz2 +124afb0a334ded46259de1ca827ce9e3 kde-l10n-it-4.2.3.tar.bz2 +2019bb97f4ef60e8eb98a9b62afb1ea3 kde-l10n-ja-4.2.3.tar.bz2 +7be7bd63604b797d3799429ada43330b kde-l10n-kk-4.2.3.tar.bz2 +a64adffd0e69caf74bef668d5f41f7bf kde-l10n-km-4.2.3.tar.bz2 +f7280d96bfe4b3655873905bb6a348ea kde-l10n-ko-4.2.3.tar.bz2 +dac8760279c062a2b618ef2407d20eed kde-l10n-ku-4.2.3.tar.bz2 +a14e292256c56c0aac3cceb025169d2f kde-l10n-lt-4.2.3.tar.bz2 +0e58c3d1237ed139cf4481cc7aefca27 kde-l10n-lv-4.2.3.tar.bz2 +4624efc27c176e2798cee2a989fb5003 kde-l10n-mai-4.2.3.tar.bz2 +5243adb4503a8480888695b7b33f4e6a kde-l10n-mk-4.2.3.tar.bz2 +ee123b87203fb3af83419dc7f81a3f30 kde-l10n-ml-4.2.3.tar.bz2 +f729127f4fa9aa2ab607e579468bff98 kde-l10n-mr-4.2.3.tar.bz2 +cbdd2cf71d48739d76319b0cd64f83ed kde-l10n-nb-4.2.3.tar.bz2 +dd6ec56d0b6dabf4b3398f7aedf91d22 kde-l10n-nds-4.2.3.tar.bz2 +6d1d498d712e5531a6dc25650ba0568d kde-l10n-nl-4.2.3.tar.bz2 +015b7a90b06f628882b108e507de1b08 kde-l10n-nn-4.2.3.tar.bz2 +975b2e078ff917c58426c0c9e15dc7f5 kde-l10n-pa-4.2.3.tar.bz2 +588fa168569034994b097bcf84cc017f kde-l10n-pl-4.2.3.tar.bz2 +95ff08b154d2ea493619548cc7b7e4cd kde-l10n-pt-4.2.3.tar.bz2 +c0a148cedc216d68d8f00ca3e67f0e32 kde-l10n-pt_BR-4.2.3.tar.bz2 +165d7be11d8715d10a2f308af63b622a kde-l10n-ro-4.2.3.tar.bz2 +6eb77d7060d66cb1bb197c56c0bfa037 kde-l10n-ru-4.2.3.tar.bz2 +1dafc2ff1a3cd03560821f6543a52c72 kde-l10n-sk-4.2.3.tar.bz2 +d4e9cabebf23dcfbb3396a455eb5d313 kde-l10n-sl-4.2.3.tar.bz2 +c344832cc27e7ea334c8c6403e103a3d kde-l10n-sr-4.2.3.tar.bz2 +a2e41b974fa502abac3e3e1844f2b2c4 kde-l10n-sv-4.2.3.tar.bz2 +6d78d6c7d163dfc05c26eec22037fe33 kde-l10n-tg-4.2.3.tar.bz2 +f3df1d0c698f6e7a0f39a2ecd6ba8c86 kde-l10n-th-4.2.3.tar.bz2 +8858f2a10c00300c70d58e76823cbc84 kde-l10n-tr-4.2.3.tar.bz2 +e2b5a450f9993d89283fbd49692e77bd kde-l10n-uk-4.2.3.tar.bz2 +73078462bb9308568830ad80d4ab73c1 kde-l10n-wa-4.2.3.tar.bz2 +c682c6b9d2acb18f3262ccf2b099f1fe kde-l10n-zh_CN-4.2.3.tar.bz2 +f439a4e95bd100e0ec090fb0401d1f4e kde-l10n-zh_TW-4.2.3.tar.bz2 From pkgdb at fedoraproject.org Tue May 5 15:54:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:54:16 +0000 Subject: [pkgdb] kdeaccessibility: ltinkl has requested watchbugzilla Message-ID: <20090505155417.3994810F893@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdeaccessibility (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility From pkgdb at fedoraproject.org Tue May 5 15:54:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:54:19 +0000 Subject: [pkgdb] kdeaccessibility: ltinkl has requested watchcommits Message-ID: <20090505155419.5CF4410F89E@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdeaccessibility (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility From pkgdb at fedoraproject.org Tue May 5 15:54:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:54:21 +0000 Subject: [pkgdb] kdeaccessibility: ltinkl has requested commit Message-ID: <20090505155421.729AE10F8A2@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdeaccessibility (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility From pkgdb at fedoraproject.org Tue May 5 15:55:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:55:41 +0000 Subject: [pkgdb] kdeadmin: ltinkl has requested watchbugzilla Message-ID: <20090505155541.6384C10F893@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdeadmin (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin From pkgdb at fedoraproject.org Tue May 5 15:55:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:55:43 +0000 Subject: [pkgdb] kdeadmin: ltinkl has requested watchcommits Message-ID: <20090505155543.CBA0210F89E@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdeadmin (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin From pkgdb at fedoraproject.org Tue May 5 15:55:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:55:45 +0000 Subject: [pkgdb] kdeadmin: ltinkl has requested commit Message-ID: <20090505155545.951ED10F8A2@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdeadmin (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin From pkgdb at fedoraproject.org Tue May 5 15:57:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:57:32 +0000 Subject: [pkgdb] kdeaccessibility had acl change status Message-ID: <20090505155732.4E8D110F8A1@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdeaccessibility (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility From pkgdb at fedoraproject.org Tue May 5 15:57:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:57:32 +0000 Subject: [pkgdb] kdeaccessibility had acl change status Message-ID: <20090505155732.4E38E10F89F@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdeaccessibility (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility From pkgdb at fedoraproject.org Tue May 5 15:57:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:57:34 +0000 Subject: [pkgdb] kdeaccessibility had acl change status Message-ID: <20090505155734.8F88E10F8A3@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdeaccessibility (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility From caolanm at fedoraproject.org Tue May 5 15:57:37 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 5 May 2009 15:57:37 +0000 (UTC) Subject: rpms/openoffice.org/F-11 workspace.calc50.patch, NONE, 1.1 openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch, 1.2, NONE Message-ID: <20090505155737.10E7370108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27264/F-11 Added Files: workspace.calc50.patch Removed Files: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch Log Message: track as upstream workspace workspace.calc50.patch: --- NEW FILE workspace.calc50.patch --- diff -ru OOO310_m1/formula/source/ui/dlg/formula.cxx OOO310_m1/formula/source/ui/dlg/formula.cxx --- OOO310_m1.orig/formula/source/ui/dlg/formula.cxx 2009-02-17 09:00:06.000000000 +0000 +++ OOO310_m1/formula/source/ui/dlg/formula.cxx 2009-02-17 09:06:18.000000000 +0000 @@ -131,7 +131,7 @@ void UpdateFunctionDesc(); void ResizeArgArr( const IFunctionDescription* pNewFunc ); void FillListboxes(); - void FillControls(); + void FillControls(BOOL &rbNext, BOOL &rbPrev); FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); void SetMeText(const String& _sText); @@ -756,9 +756,15 @@ void FormulaDlg_Impl::FillDialog(BOOL nFlag) { - if ( nFlag ) - FillControls(); + BOOL bNext=TRUE, bPrev=TRUE; + if(nFlag) + FillControls(bNext, bPrev); FillListboxes(); + if(nFlag) + { + aBtnBackward.Enable(bPrev); + aBtnForward.Enable(bNext); + } String aStrResult; @@ -806,7 +812,7 @@ m_pParent->SetUniqueId( nOldUnique ); } // ----------------------------------------------------------------------------- -void FormulaDlg_Impl::FillControls() +void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) { // Umschalten zwischen den "Seiten" FormEditData* pData = m_pHelper->getFormEditData(); @@ -902,12 +908,10 @@ // Test, ob vorne/hinten noch mehr Funktionen sind xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); - BOOL bNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart ); + rbNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart ); nTempStart=(xub_StrLen)pMEdit->GetSelection().Min(); pData->SetFStart(nTempStart); - BOOL bPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart ); - aBtnBackward.Enable(bPrev); - aBtnForward.Enable(bNext); + rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart ); } // ----------------------------------------------------------------------------- --- openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch DELETED --- From caolanm at fedoraproject.org Tue May 5 15:58:07 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 5 May 2009 15:58:07 +0000 (UTC) Subject: rpms/openoffice.org/devel workspace.calc50.patch, NONE, 1.1 openoffice.org.spec, 1.1908, 1.1909 openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch, 1.2, NONE Message-ID: <20090505155807.91C3D70108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27264/devel Modified Files: openoffice.org.spec Added Files: workspace.calc50.patch Removed Files: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch Log Message: track as upstream workspace workspace.calc50.patch: --- NEW FILE workspace.calc50.patch --- diff -ru OOO310_m1/formula/source/ui/dlg/formula.cxx OOO310_m1/formula/source/ui/dlg/formula.cxx --- OOO310_m1.orig/formula/source/ui/dlg/formula.cxx 2009-02-17 09:00:06.000000000 +0000 +++ OOO310_m1/formula/source/ui/dlg/formula.cxx 2009-02-17 09:06:18.000000000 +0000 @@ -131,7 +131,7 @@ void UpdateFunctionDesc(); void ResizeArgArr( const IFunctionDescription* pNewFunc ); void FillListboxes(); - void FillControls(); + void FillControls(BOOL &rbNext, BOOL &rbPrev); FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); void SetMeText(const String& _sText); @@ -756,9 +756,15 @@ void FormulaDlg_Impl::FillDialog(BOOL nFlag) { - if ( nFlag ) - FillControls(); + BOOL bNext=TRUE, bPrev=TRUE; + if(nFlag) + FillControls(bNext, bPrev); FillListboxes(); + if(nFlag) + { + aBtnBackward.Enable(bPrev); + aBtnForward.Enable(bNext); + } String aStrResult; @@ -806,7 +812,7 @@ m_pParent->SetUniqueId( nOldUnique ); } // ----------------------------------------------------------------------------- -void FormulaDlg_Impl::FillControls() +void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) { // Umschalten zwischen den "Seiten" FormEditData* pData = m_pHelper->getFormEditData(); @@ -902,12 +908,10 @@ // Test, ob vorne/hinten noch mehr Funktionen sind xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); - BOOL bNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart ); + rbNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart ); nTempStart=(xub_StrLen)pMEdit->GetSelection().Min(); pData->SetFStart(nTempStart); - BOOL bPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart ); - aBtnBackward.Enable(bPrev); - aBtnForward.Enable(bNext); + rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart ); } // ----------------------------------------------------------------------------- Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1908 retrieving revision 1.1909 diff -u -p -r1.1908 -r1.1909 --- openoffice.org.spec 5 May 2009 13:36:12 -0000 1.1908 +++ openoffice.org.spec 5 May 2009 15:57:37 -0000 1.1909 @@ -102,7 +102,7 @@ Patch26: openoffice.org-3.0.0.ooo91924.s Patch27: workspace.mhu17.patch Patch28: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch Patch29: workspace.gtkmenuimages.patch -Patch30: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch +Patch30: workspace.calc50.patch Patch31: workspace.mav46.patch Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch Patch33: workspace.transogl03redux.patch @@ -1601,7 +1601,7 @@ cat %{PATCH11} >> svtools/source/dialogs %patch27 -p1 -b .workspace.mhu17.patch %patch28 -p1 -b .ooo95018.sal.fdwarnings.patch %patch29 -p0 -b .workspace.gtkmenuimages.patch -%patch30 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch +%patch30 -p1 -b .workspace.calc50.patch %patch31 -p1 -b .workspace.mav46.patch %patch32 -p1 %patch33 -p0 -b .workspace.transogl03redux.patch --- openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch DELETED --- From pkgdb at fedoraproject.org Tue May 5 15:58:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:58:12 +0000 Subject: [pkgdb] kdeadmin had acl change status Message-ID: <20090505155813.146C810F89D@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdeadmin (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin From pkgdb at fedoraproject.org Tue May 5 15:58:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:58:14 +0000 Subject: [pkgdb] kdeadmin had acl change status Message-ID: <20090505155814.B4CE110F8A3@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdeadmin (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin From pkgdb at fedoraproject.org Tue May 5 15:58:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 15:58:15 +0000 Subject: [pkgdb] kdeadmin had acl change status Message-ID: <20090505155815.5495710F8A7@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdeadmin (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin From pkgdb at fedoraproject.org Tue May 5 16:01:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:01:21 +0000 Subject: [pkgdb] kdeartwork: ltinkl has requested watchbugzilla Message-ID: <20090505160121.AC4AD10F89F@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdeartwork (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork From pkgdb at fedoraproject.org Tue May 5 16:01:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:01:24 +0000 Subject: [pkgdb] kdeartwork: ltinkl has requested watchcommits Message-ID: <20090505160124.6599C10F8A3@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdeartwork (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork From pkgdb at fedoraproject.org Tue May 5 16:01:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:01:26 +0000 Subject: [pkgdb] kdeartwork: ltinkl has requested commit Message-ID: <20090505160126.64B3C10F8A5@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdeartwork (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork From pkgdb at fedoraproject.org Tue May 5 16:04:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:04:05 +0000 Subject: [pkgdb] kdeartwork had acl change status Message-ID: <20090505160405.6A02E10F893@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdeartwork (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork From pkgdb at fedoraproject.org Tue May 5 16:04:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:04:05 +0000 Subject: [pkgdb] kdeartwork had acl change status Message-ID: <20090505160405.A176F10F89E@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdeartwork (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork From pkgdb at fedoraproject.org Tue May 5 16:04:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:04:07 +0000 Subject: [pkgdb] kdeartwork had acl change status Message-ID: <20090505160407.534FC10F8A2@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdeartwork (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork From pkgdb at fedoraproject.org Tue May 5 16:05:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:05:49 +0000 Subject: [pkgdb] kdebase-runtime: ltinkl has requested watchbugzilla Message-ID: <20090505160549.880C210F89D@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdebase-runtime (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime From pkgdb at fedoraproject.org Tue May 5 16:05:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:05:51 +0000 Subject: [pkgdb] kdebase-runtime: ltinkl has requested watchcommits Message-ID: <20090505160551.1CD1F10F8A2@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdebase-runtime (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime From pkgdb at fedoraproject.org Tue May 5 16:05:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:05:52 +0000 Subject: [pkgdb] kdebase-runtime: ltinkl has requested commit Message-ID: <20090505160552.D109E10F8A6@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdebase-runtime (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime From pkgdb at fedoraproject.org Tue May 5 16:08:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:08:12 +0000 Subject: [pkgdb] kdebase-runtime had acl change status Message-ID: <20090505160812.BE00810F89E@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdebase-runtime (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime From pkgdb at fedoraproject.org Tue May 5 16:08:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:08:13 +0000 Subject: [pkgdb] kdebase-runtime had acl change status Message-ID: <20090505160813.4418810F8A3@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdebase-runtime (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime From pkgdb at fedoraproject.org Tue May 5 16:08:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:08:14 +0000 Subject: [pkgdb] kdebase-runtime had acl change status Message-ID: <20090505160814.9B6F110F8A7@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdebase-runtime (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime From devrim at fedoraproject.org Tue May 5 16:18:24 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Tue, 5 May 2009 16:18:24 +0000 (UTC) Subject: rpms/tomcat5/devel tomcat5.spec,1.127,1.128 Message-ID: <20090505161824.D98E470108@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/tomcat5/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30197 Modified Files: tomcat5.spec Log Message: - Fix build problems with --with apisonly. Patch from Karsten Hopp. Index: tomcat5.spec =================================================================== RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -p -r1.127 -r1.128 --- tomcat5.spec 20 Apr 2009 13:45:23 -0000 1.127 +++ tomcat5.spec 5 May 2009 16:17:54 -0000 1.128 @@ -71,7 +71,7 @@ Name: tomcat5 Epoch: 0 Version: %{majversion}.%{minversion} -Release: 6.3%{dist} +Release: 6.4%{dist} Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Group: Networking/Daemons @@ -108,6 +108,7 @@ Patch18: %{name}-%{majversion}-skip-jsp- # Seems to be only needed when building with ECJ for java 1.5 since # the default source type for ecj is still 1.4 Patch19: %{name}-%{majversion}-connectors-util-build.patch +Patch20: %{name}-%{majversion}-apisonlybuildfix.patch BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root %if ! %{gcj_support} @@ -374,6 +375,7 @@ Provides: jasper5-javadoc Javadoc for generated documentation %{name}-%{jname} %endif +%if %{without_apisonly} %if %{with_ecj} %package jasper-eclipse Group: Text Editors/Integrated Development Environments (IDE) @@ -383,6 +385,7 @@ Summary: Jasper OSGi Eclipse plugin Jasper OSGi Eclipse plugin that contains class files from jasper-compiler, jasper-runtime and ECJ. %endif +%endif %prep %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version} @@ -457,7 +460,9 @@ commons-collections.jar=$(build-classpat commons-logging.jar=$(build-classpath commons-logging) commons-daemon.jar=$(build-classpath commons-daemon) junit.jar=$(build-classpath junit) +%if %{without_apisonly} jasper-compiler-jdt.jar=$(build-classpath ecj) +%endif EOBP ant -Djava.home="%{java_home}" -Dbuild.compiler="modern" javadoc popd @@ -491,7 +496,9 @@ jmxri.jar=$(build-classpath mx4j/mx4j-jm junit.jar=$(build-classpath junit) regexp.jar=$(build-classpath regexp) servlet-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar +%if %{without_apisonly} jsp-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar +%endif servlet.doc=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/docs/api xercesImpl.jar=$(build-classpath jaxp_parser_impl) xml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis) @@ -549,6 +556,7 @@ EOBP popd %endif +%if %{without_apisonly} # create jasper-eclipse jar %if %{with_ecj} mkdir -p org.apache.jasper @@ -562,6 +570,7 @@ rm -f plugin.properties plugin.xml about zip -qq -r ../org.apache.jasper_5.5.17.v200706111724.jar . popd %endif +%endif # inject OSGi manifests mkdir -p META-INF @@ -570,7 +579,9 @@ touch META-INF/MANIFEST.MF zip -u %{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE9} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF +%if %{without_apisonly} zip -u %{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar META-INF/MANIFEST.MF +%endif %install %{__rm} -rf $RPM_BUILD_ROOT @@ -871,8 +882,11 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version servletapi5.jar popd # depmap frag for standard alternative - %add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP servlet_2_4_api - %add_to_maven_depmap tomcat servlet-api %{version} JPP %{name}-servlet-%{servletspec}-api + %if %{without_apisonly} + %add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP servlet_2_4_api + %add_to_maven_depmap tomcat servlet-api %{version} JPP %{name}-servlet-%{servletspec}-api + %endif + %{__mkdir} -p $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/ ||: %{__install} -m 644 \ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/servlet-api-%{version}.pom \ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-servlet-%{servletspec}-api.pom @@ -894,8 +908,10 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version %{__ln_s} -f %{name}-jsp-%{jspspec}-api-%{version}.jar \ jspapi.jar popd - %add_to_maven_depmap javax.servlet jsp-api %{jspspec} JPP jsp_2_0_api - %add_to_maven_depmap tomcat jsp-api %{version} JPP %{name}-jsp-%{jspspec}-api + %if %{without_apisonly} + %add_to_maven_depmap javax.servlet jsp-api %{jspspec} JPP jsp_2_0_api + %add_to_maven_depmap tomcat jsp-api %{version} JPP %{name}-jsp-%{jspspec}-api + %endif %{__install} -m 644 \ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/jsp-api-%{version}.pom \ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-jsp-%{jspspec}-api.pom @@ -927,10 +943,12 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version popd %endif +%if %{without_apisonly} %if %{with_ecj} %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins %{__cp} -p org.apache.jasper_5.5.17.v200706111724.jar ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins %endif +%endif %if %{gcj_support} # Remove non-standard jars from the list for aot compilation @@ -1352,6 +1370,7 @@ fi %{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version} %{_javadocdir}/%{name}-jsp-%{jspspec}-api +%if %{without_apisonly} %if %{with_ecj} %files jasper-eclipse %defattr(0644,root,root,0755) @@ -1359,8 +1378,12 @@ fi %dir %{_datadir}/eclipse/plugins %{_datadir}/eclipse/plugins/org.apache.jasper_* %endif +%endif %changelog +* Tue May 5 2009 Devrim GUNDUZ 0:5.5.27-6.4 +- Fix build problems with --with apisonly. Patch from Karsten Hopp. + * Mon Apr 20 2009 Alexander Kurtakov 0:5.5.27-6.3 - Update jasper-OSGi-MANIFEST.MF for eclipse 3.5. From pkgdb at fedoraproject.org Tue May 5 16:18:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:18:58 +0000 Subject: [pkgdb] kdebindings: ltinkl has requested watchbugzilla Message-ID: <20090505161859.05AB110F89C@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdebindings (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings From pkgdb at fedoraproject.org Tue May 5 16:19:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:19:00 +0000 Subject: [pkgdb] kdebindings: ltinkl has requested watchcommits Message-ID: <20090505161900.973D310F8A1@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdebindings (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings From pkgdb at fedoraproject.org Tue May 5 16:19:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:19:02 +0000 Subject: [pkgdb] kdebindings: ltinkl has requested commit Message-ID: <20090505161902.93A3610F8A5@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdebindings (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings From devrim at fedoraproject.org Tue May 5 16:21:11 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Tue, 5 May 2009 16:21:11 +0000 (UTC) Subject: rpms/tomcat5/devel tomcat5.spec,1.128,1.129 Message-ID: <20090505162111.599CA70108@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/tomcat5/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30600 Modified Files: tomcat5.spec Log Message: OOps,fix spec. Index: tomcat5.spec =================================================================== RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -p -r1.128 -r1.129 --- tomcat5.spec 5 May 2009 16:17:54 -0000 1.128 +++ tomcat5.spec 5 May 2009 16:20:40 -0000 1.129 @@ -108,7 +108,6 @@ Patch18: %{name}-%{majversion}-skip-jsp- # Seems to be only needed when building with ECJ for java 1.5 since # the default source type for ecj is still 1.4 Patch19: %{name}-%{majversion}-connectors-util-build.patch -Patch20: %{name}-%{majversion}-apisonlybuildfix.patch BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root %if ! %{gcj_support} From pkgdb at fedoraproject.org Tue May 5 16:28:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:28:33 +0000 Subject: [pkgdb] kdebindings had acl change status Message-ID: <20090505162833.4CBD810F89F@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdebindings (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings From pkgdb at fedoraproject.org Tue May 5 16:28:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:28:32 +0000 Subject: [pkgdb] kdebindings had acl change status Message-ID: <20090505162832.BFA2210F89C@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdebindings (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings From pkgdb at fedoraproject.org Tue May 5 16:28:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:28:34 +0000 Subject: [pkgdb] kdebindings had acl change status Message-ID: <20090505162834.1E76E10F8A3@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdebindings (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings From jkeating at fedoraproject.org Tue May 5 16:40:52 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 5 May 2009 16:40:52 +0000 (UTC) Subject: comps comps-f11.xml.in,1.212,1.213 Message-ID: <20090505164052.932D070108@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1174 Modified Files: comps-f11.xml.in Log Message: Demote a2ps to optional, keep it off the DVD. Drags in texlive. Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.212 retrieving revision 1.213 diff -u -p -r1.212 -r1.213 --- comps-f11.xml.in 4 May 2009 22:39:22 -0000 1.212 +++ comps-f11.xml.in 5 May 2009 16:40:22 -0000 1.213 @@ -4413,7 +4413,6 @@ cups ghostscript - a2ps bluez-cups enscript gutenprint @@ -4425,6 +4424,7 @@ samba-client system-config-printer cups-pk-helper + a2ps From nsantos at fedoraproject.org Tue May 5 16:48:14 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Tue, 5 May 2009 16:48:14 +0000 (UTC) Subject: rpms/ruby-qpid/F-11 ruby.patch,NONE,1.1 ruby-qpid.spec,1.11,1.12 Message-ID: <20090505164814.AE72C70108@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/ruby-qpid/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1914 Modified Files: ruby-qpid.spec Added Files: ruby.patch Log Message: patch for SASL credentials refresh ruby.patch: --- NEW FILE ruby.patch --- diff -up lib/qpid/framer.rb.orig lib/qpid/framer.rb --- lib/qpid/framer.rb.orig 2009-05-04 16:27:09.000000000 -0400 +++ lib/qpid/framer.rb 2009-05-04 16:28:11.000000000 -0400 @@ -137,6 +137,8 @@ module Qpid @tx_buf = "" frm.debug("FLUSHED") if frm end + rescue + @sock.close unless @sock.closed? end def _write(buf) diff -up lib/qpid/qmf.rb.orig lib/qpid/qmf.rb --- lib/qpid/qmf.rb.orig 2009-01-20 16:26:28.000000000 -0500 +++ lib/qpid/qmf.rb 2009-05-04 16:28:11.000000000 -0400 @@ -247,7 +247,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key => "console.obj.*.*.#{package_name}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -259,7 +259,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key=> "console.obj.*.*.#{package_name}.#{class_name}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -272,7 +272,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key => "console.obj.*.*.#{pname}.#{cname}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -329,19 +329,21 @@ module Qpid::Qmf unless broker_list.include?(agent.broker) raise ArgumentError, "Supplied agent is not accessible through the supplied broker" end - agent_list << agent + agent_list << agent if agent.broker.connected? else if kwargs.include?(:object_id) oid = kwargs[:object_id] broker_list.each { |broker| broker.agents.each { |agent| if oid.broker_bank == agent.broker_bank && oid.agent_bank == agent.agent_bank - agent_list << agent + agent_list << agent if agent.broker.connected? end } } else - broker_list.each { |broker| agent_list += broker.agents } + broker_list.each { |broker| + agent_list += broker.agents if broker.connected? + } end end @@ -600,8 +602,8 @@ module Qpid::Qmf def handle_broker_disconnect(broker); end def handle_error(error) - @error = error synchronize do + @error = error if @sync_sequence_list.length > 0 @sync_sequence_list = [] @cv.signal end @@ -1179,7 +1181,7 @@ module Qpid::Qmf end end - rescue Qpid::Session::Closed, Qpid::Session::Detached, SystemCallError + rescue delay *= DELAY_FACTOR if delay < DELAY_MAX end @@ -1214,6 +1216,7 @@ module Qpid::Qmf class Broker SYNC_TIME = 60 + @@next_seq = 1 include MonitorMixin @@ -1237,17 +1240,13 @@ module Qpid::Qmf @auth_mechanism = kwargs[:mechanism] @auth_service = kwargs[:service] @broker_bank = 1 - @agents = {} - @agents["1.0"] = Agent.new(self, 0, "BrokerAgent") @topic_bound = false @cv = new_cond - @sync_in_flight = false - @sync_request = 0 - @sync_result = nil - @reqs_outstanding = 1 - @error = nil - @broker_id = nil + @error = nil + @broker_id = nil @is_connected = false + @amqp_session_id = "%s.%d.%d" % [Socket.gethostname, Process::pid, @@next_seq] + @@next_seq += 1 @conn = nil if @session.managedConnections? @thread = ManagedConnection.new(self) @@ -1292,6 +1291,7 @@ module Qpid::Qmf def wait_for_stable synchronize do + return unless connected? return if @reqs_outstanding == 0 @sync_in_flight = true unless @cv.wait_for(SYNC_TIME) { @reqs_outstanding == 0 } @@ -1387,8 +1387,14 @@ module Qpid::Qmf end def try_to_connect - #begin - @amqp_session_id = "%s.%d" % [Socket.gethostname, Process::pid] + @agents = {} + @agents["1.0"] = Agent.new(self, 0, "BrokerAgent") + @topic_bound = false + @sync_in_flight = false + @sync_request = 0 + @sync_result = nil + @reqs_outstanding = 1 + # FIXME: Need sth for Qpid::Util::connect @conn = Qpid::Connection.new(TCPSocket.new(@host, @port), diff -up lib/qpid/session.rb.orig lib/qpid/session.rb --- lib/qpid/session.rb.orig 2009-05-04 16:26:59.000000000 -0400 +++ lib/qpid/session.rb 2009-05-04 16:28:11.000000000 -0400 @@ -114,7 +114,7 @@ module Qpid end end if error? - raise Qpid::Session::Exception, exceptions + raise Qpid::Session::Exception, @exceptions end end Index: ruby-qpid.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-qpid/F-11/ruby-qpid.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- ruby-qpid.spec 19 Mar 2009 18:54:42 -0000 1.11 +++ ruby-qpid.spec 5 May 2009 16:47:44 -0000 1.12 @@ -1,6 +1,6 @@ Name: ruby-qpid Version: 0.5.752600 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby language client for AMQP Group: Development/Ruby @@ -10,6 +10,7 @@ Source0: %{name}-%{version}.tar.g # svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/ruby \ # ruby-qpid # tar czf ruby-qpid.tar.gz ruby-qpid +Patch: ruby.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} @@ -37,6 +38,7 @@ The Apache Qpid project's Ruby language %prep %setup -q -n %{name}-%{version} +%patch %build rake build @@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.txt NOTICE.txt RELEASE_NOTES %changelog +* Mon May 4 2009 Nuno Santos - 0.5.752600-2 +- patch for SASL credentials refresh + * Thu Mar 19 2009 Nuno Santos - 0.5.752600-1 - Rebased to svn rev 752600 From terjeros at fedoraproject.org Tue May 5 16:50:10 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Tue, 5 May 2009 16:50:10 +0000 (UTC) Subject: rpms/simdock/devel simdock.spec,1.4,1.5 Message-ID: <20090505165010.64E5770108@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/simdock/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2228 Modified Files: simdock.spec Log Message: * Tue May 5 2009 Terje Rosten - 1.2.6 - Convert spec to utf8 Index: simdock.spec =================================================================== RCS file: /cvs/extras/rpms/simdock/devel/simdock.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- simdock.spec 1 May 2009 16:38:48 -0000 1.4 +++ simdock.spec 5 May 2009 16:49:40 -0000 1.5 @@ -1,7 +1,7 @@ Name: simdock Summary: Fast and customizable dockbar Version: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: User Interface/Desktops URL: http://simdock.sourceforge.net/ @@ -56,7 +56,10 @@ desktop-file-install --dir %{buildroot}% %{_datadir}/applications/%{name}.desktop %changelog -* Thu Apr 30 2009 Ville Skytt? - 1.2-5 +* Tue May 5 2009 Terje Rosten - 1.2.6 +- Convert spec to utf8 + +* Thu Apr 30 2009 Ville Skytt?? - 1.2-5 - Patch to honor $RPM_OPT_FLAGS during build. - Disable autotools dependency tracking during build for cleaner build logs and possible slight build speedup. From nsantos at fedoraproject.org Tue May 5 16:55:45 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Tue, 5 May 2009 16:55:45 +0000 (UTC) Subject: rpms/ruby-qpid/devel ruby.patch,NONE,1.1 ruby-qpid.spec,1.11,1.12 Message-ID: <20090505165545.2B7C070108@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/ruby-qpid/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2907 Modified Files: ruby-qpid.spec Added Files: ruby.patch Log Message: patch for SASL credentials refresh ruby.patch: --- NEW FILE ruby.patch --- diff -up lib/qpid/framer.rb.orig lib/qpid/framer.rb --- lib/qpid/framer.rb.orig 2009-05-04 16:27:09.000000000 -0400 +++ lib/qpid/framer.rb 2009-05-04 16:28:11.000000000 -0400 @@ -137,6 +137,8 @@ module Qpid @tx_buf = "" frm.debug("FLUSHED") if frm end + rescue + @sock.close unless @sock.closed? end def _write(buf) diff -up lib/qpid/qmf.rb.orig lib/qpid/qmf.rb --- lib/qpid/qmf.rb.orig 2009-01-20 16:26:28.000000000 -0500 +++ lib/qpid/qmf.rb 2009-05-04 16:28:11.000000000 -0400 @@ -247,7 +247,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key => "console.obj.*.*.#{package_name}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -259,7 +259,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key=> "console.obj.*.*.#{package_name}.#{class_name}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -272,7 +272,7 @@ module Qpid::Qmf args = { :exchange => "qpid.management", :queue => broker.topic_name, :binding_key => "console.obj.*.*.#{pname}.#{cname}.#" } - broker.amqpSession.exchange_bind(args) + broker.amqp_session.exchange_bind(args) end end @@ -329,19 +329,21 @@ module Qpid::Qmf unless broker_list.include?(agent.broker) raise ArgumentError, "Supplied agent is not accessible through the supplied broker" end - agent_list << agent + agent_list << agent if agent.broker.connected? else if kwargs.include?(:object_id) oid = kwargs[:object_id] broker_list.each { |broker| broker.agents.each { |agent| if oid.broker_bank == agent.broker_bank && oid.agent_bank == agent.agent_bank - agent_list << agent + agent_list << agent if agent.broker.connected? end } } else - broker_list.each { |broker| agent_list += broker.agents } + broker_list.each { |broker| + agent_list += broker.agents if broker.connected? + } end end @@ -600,8 +602,8 @@ module Qpid::Qmf def handle_broker_disconnect(broker); end def handle_error(error) - @error = error synchronize do + @error = error if @sync_sequence_list.length > 0 @sync_sequence_list = [] @cv.signal end @@ -1179,7 +1181,7 @@ module Qpid::Qmf end end - rescue Qpid::Session::Closed, Qpid::Session::Detached, SystemCallError + rescue delay *= DELAY_FACTOR if delay < DELAY_MAX end @@ -1214,6 +1216,7 @@ module Qpid::Qmf class Broker SYNC_TIME = 60 + @@next_seq = 1 include MonitorMixin @@ -1237,17 +1240,13 @@ module Qpid::Qmf @auth_mechanism = kwargs[:mechanism] @auth_service = kwargs[:service] @broker_bank = 1 - @agents = {} - @agents["1.0"] = Agent.new(self, 0, "BrokerAgent") @topic_bound = false @cv = new_cond - @sync_in_flight = false - @sync_request = 0 - @sync_result = nil - @reqs_outstanding = 1 - @error = nil - @broker_id = nil + @error = nil + @broker_id = nil @is_connected = false + @amqp_session_id = "%s.%d.%d" % [Socket.gethostname, Process::pid, @@next_seq] + @@next_seq += 1 @conn = nil if @session.managedConnections? @thread = ManagedConnection.new(self) @@ -1292,6 +1291,7 @@ module Qpid::Qmf def wait_for_stable synchronize do + return unless connected? return if @reqs_outstanding == 0 @sync_in_flight = true unless @cv.wait_for(SYNC_TIME) { @reqs_outstanding == 0 } @@ -1387,8 +1387,14 @@ module Qpid::Qmf end def try_to_connect - #begin - @amqp_session_id = "%s.%d" % [Socket.gethostname, Process::pid] + @agents = {} + @agents["1.0"] = Agent.new(self, 0, "BrokerAgent") + @topic_bound = false + @sync_in_flight = false + @sync_request = 0 + @sync_result = nil + @reqs_outstanding = 1 + # FIXME: Need sth for Qpid::Util::connect @conn = Qpid::Connection.new(TCPSocket.new(@host, @port), diff -up lib/qpid/session.rb.orig lib/qpid/session.rb --- lib/qpid/session.rb.orig 2009-05-04 16:26:59.000000000 -0400 +++ lib/qpid/session.rb 2009-05-04 16:28:11.000000000 -0400 @@ -114,7 +114,7 @@ module Qpid end end if error? - raise Qpid::Session::Exception, exceptions + raise Qpid::Session::Exception, @exceptions end end Index: ruby-qpid.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-qpid/devel/ruby-qpid.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- ruby-qpid.spec 19 Mar 2009 18:54:42 -0000 1.11 +++ ruby-qpid.spec 5 May 2009 16:55:14 -0000 1.12 @@ -1,6 +1,6 @@ Name: ruby-qpid Version: 0.5.752600 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby language client for AMQP Group: Development/Ruby @@ -10,6 +10,7 @@ Source0: %{name}-%{version}.tar.g # svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/ruby \ # ruby-qpid # tar czf ruby-qpid.tar.gz ruby-qpid +Patch: ruby.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} @@ -37,6 +38,7 @@ The Apache Qpid project's Ruby language %prep %setup -q -n %{name}-%{version} +%patch %build rake build @@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE.txt NOTICE.txt RELEASE_NOTES %changelog +* Mon May 4 2009 Nuno Santos - 0.5.752600-2 +- patch for SASL credentials refresh + * Thu Mar 19 2009 Nuno Santos - 0.5.752600-1 - Rebased to svn rev 752600 From pkgdb at fedoraproject.org Tue May 5 16:56:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:56:11 +0000 Subject: [pkgdb] kdegraphics: ltinkl has requested watchbugzilla Message-ID: <20090505165611.401A210F893@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdegraphics (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics From pkgdb at fedoraproject.org Tue May 5 16:56:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:56:13 +0000 Subject: [pkgdb] kdegraphics: ltinkl has requested watchcommits Message-ID: <20090505165613.305E510F89E@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdegraphics (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics From pkgdb at fedoraproject.org Tue May 5 16:56:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 16:56:15 +0000 Subject: [pkgdb] kdegraphics: ltinkl has requested commit Message-ID: <20090505165615.2871110F8A2@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdegraphics (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics From pkgdb at fedoraproject.org Tue May 5 17:02:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:02:32 +0000 Subject: [pkgdb] kdenetwork: ltinkl has requested watchbugzilla Message-ID: <20090505170232.9CEAA10F89C@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdenetwork (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 17:02:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:02:34 +0000 Subject: [pkgdb] kdenetwork: ltinkl has requested watchcommits Message-ID: <20090505170234.5EF0A10F89F@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdenetwork (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 17:02:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:02:36 +0000 Subject: [pkgdb] kdenetwork: ltinkl has requested commit Message-ID: <20090505170236.C9A6F10F8A3@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdenetwork (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 17:03:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:03:13 +0000 Subject: [pkgdb] kdemultimedia: ltinkl has requested watchbugzilla Message-ID: <20090505170313.E490B10F89C@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdemultimedia (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From pkgdb at fedoraproject.org Tue May 5 17:03:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:03:15 +0000 Subject: [pkgdb] kdemultimedia: ltinkl has requested watchcommits Message-ID: <20090505170315.977B210F8A1@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdemultimedia (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From pkgdb at fedoraproject.org Tue May 5 17:03:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:03:17 +0000 Subject: [pkgdb] kdemultimedia: ltinkl has requested commit Message-ID: <20090505170317.6DF4E10F8A4@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdemultimedia (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From clumens at fedoraproject.org Tue May 5 17:14:00 2009 From: clumens at fedoraproject.org (Christopher Edward Lumens) Date: Tue, 5 May 2009 17:14:00 +0000 (UTC) Subject: rpms/firstboot/F-11 .cvsignore, 1.98, 1.99 firstboot.spec, 1.133, 1.134 sources, 1.128, 1.129 Message-ID: <20090505171400.E126770108@cvs1.fedora.phx.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/firstboot/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5531 Modified Files: .cvsignore firstboot.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firstboot/F-11/.cvsignore,v retrieving revision 1.98 retrieving revision 1.99 diff -u -p -r1.98 -r1.99 --- .cvsignore 16 Jan 2009 16:37:28 -0000 1.98 +++ .cvsignore 5 May 2009 17:13:30 -0000 1.99 @@ -70,3 +70,4 @@ firstboot-1.102.tar.bz2 firstboot-1.103.tar.bz2 firstboot-1.104.tar.bz2 firstboot-1.105.tar.bz2 +firstboot-1.106.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstboot/F-11/firstboot.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -p -r1.133 -r1.134 --- firstboot.spec 24 Feb 2009 17:18:29 -0000 1.133 +++ firstboot.spec 5 May 2009 17:13:30 -0000 1.134 @@ -3,8 +3,8 @@ Summary: Initial system configuration utility Name: firstboot URL: http://fedoraproject.org/wiki/FirstBoot -Version: 1.105 -Release: 2%{?dist} +Version: 1.106 +Release: 1%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. @@ -71,8 +71,9 @@ fi %{_datadir}/firstboot/themes/default/* %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 1.105-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue May 05 2009 Chris Lumens 1.106-1 +- Display an error message when the user doesn't supply a password (#480927). +- Lots of translation updates. * Fri Jan 16 2009 Chris Lumens 1.105-1 - Fix a typo in starting up X. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firstboot/F-11/sources,v retrieving revision 1.128 retrieving revision 1.129 diff -u -p -r1.128 -r1.129 --- sources 16 Jan 2009 16:37:28 -0000 1.128 +++ sources 5 May 2009 17:13:30 -0000 1.129 @@ -1 +1 @@ -43cd2046c00370f2d2cc792324e8ae64 firstboot-1.105.tar.bz2 +5dc2ab8c8c5fe846427fc5b52b2f1cd4 firstboot-1.106.tar.bz2 From remi at fedoraproject.org Tue May 5 17:33:22 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 5 May 2009 17:33:22 +0000 (UTC) Subject: rpms/php-pecl-memcached/F-11 php-pecl-memcached.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090505173322.549B970108@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-memcached/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7805 Modified Files: sources Added Files: php-pecl-memcached.spec Log Message: new package --- NEW FILE php-pecl-memcached.spec --- %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define pecl_name memcached Summary: Extension to work with the Memcached caching daemon Name: php-pecl-memcached Version: 0.1.5 Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel >= 5.2.0, php-pear BuildRequires: libmemcached-devel, zlib-devel Requires(post): %{__pecl} Requires(postun): %{__pecl} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} Provides: php-pecl(%{pecl_name}) = %{version}-%{release} %description This extension uses libmemcached library to provide API for communicating with memcached servers. memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. It also provides a session handler (memcached). %prep %setup -c -q %build cd %{pecl_name}-%{version} phpize %configure %{__make} %{?_smp_mflags} %install cd %{pecl_name}-%{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/%{pecl_name}.ini << 'EOF' ; Enable %{pecl_name} extension module extension=%{pecl_name}.so ; ----- Options to use the memcached session handler ; Use memcache as a session handler ;session.save_handler=memcached ; Defines a comma separated list of server urls to use for session storage ;session.save_path="localhost:11211" EOF # Install XML package description %{__mkdir_p} %{buildroot}%{pecl_xmldir} %{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %clean %{__rm} -rf %{buildroot} %post %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi %files %defattr(-, root, root, -) %doc %{pecl_name}-%{version}/{CREDITS,LICENSE,EXPERIMENTAL,README.markdown,ChangeLog} %config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini %{php_extdir}/%{pecl_name}.so %{pecl_xmldir}/%{name}.xml %changelog * Sun Apr 29 2009 Remi Collet - 0.1.5-1 - Initial RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pecl-memcached/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:44:37 -0000 1.1 +++ sources 5 May 2009 17:32:52 -0000 1.2 @@ -0,0 +1 @@ +646c3ffb622adc0379a3951155f7f4bb memcached-0.1.5.tgz From pkgdb at fedoraproject.org Tue May 5 17:45:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:45:36 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090505174536.9646810F890@bastion2.fedora.phx.redhat.com> pjones has set the watchbugzilla acl on anaconda (Fedora devel) to Obsolete for pjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Tue May 5 17:45:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:45:55 +0000 Subject: [pkgdb] anaconda: pjones has requested watchbugzilla Message-ID: <20090505174555.7EF3010F890@bastion2.fedora.phx.redhat.com> pjones has requested the watchbugzilla acl on anaconda (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Tue May 5 17:46:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:46:05 +0000 Subject: [pkgdb] anaconda: pjones has given up watchbugzilla Message-ID: <20090505174605.E41A010F89C@bastion2.fedora.phx.redhat.com> pjones has given up the watchbugzilla acl on anaconda (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Tue May 5 17:46:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 17:46:08 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090505174608.0F88710F8A7@bastion2.fedora.phx.redhat.com> pjones has set the watchbugzilla acl on anaconda (Fedora 11) to Obsolete for pjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From remi at fedoraproject.org Tue May 5 17:27:45 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 5 May 2009 17:27:45 +0000 (UTC) Subject: rpms/php-pecl-memcached/devel php-pecl-memcached.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090505172745.3BA1070108@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-memcached/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7172 Modified Files: .cvsignore sources Added Files: php-pecl-memcached.spec Log Message: new package --- NEW FILE php-pecl-memcached.spec --- %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define pecl_name memcached Summary: Extension to work with the Memcached caching daemon Name: php-pecl-memcached Version: 0.1.5 Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel >= 5.2.0, php-pear BuildRequires: libmemcached-devel, zlib-devel Requires(post): %{__pecl} Requires(postun): %{__pecl} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} Provides: php-pecl(%{pecl_name}) = %{version}-%{release} %description This extension uses libmemcached library to provide API for communicating with memcached servers. memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. It also provides a session handler (memcached). %prep %setup -c -q %build cd %{pecl_name}-%{version} phpize %configure %{__make} %{?_smp_mflags} %install cd %{pecl_name}-%{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/%{pecl_name}.ini << 'EOF' ; Enable %{pecl_name} extension module extension=%{pecl_name}.so ; ----- Options to use the memcached session handler ; Use memcache as a session handler ;session.save_handler=memcached ; Defines a comma separated list of server urls to use for session storage ;session.save_path="localhost:11211" EOF # Install XML package description %{__mkdir_p} %{buildroot}%{pecl_xmldir} %{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %clean %{__rm} -rf %{buildroot} %post %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi %files %defattr(-, root, root, -) %doc %{pecl_name}-%{version}/{CREDITS,LICENSE,EXPERIMENTAL,README.markdown,ChangeLog} %config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini %{php_extdir}/%{pecl_name}.so %{pecl_xmldir}/%{name}.xml %changelog * Sun Apr 29 2009 Remi Collet - 0.1.5-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pecl-memcached/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 4 May 2009 03:44:37 -0000 1.1 +++ .cvsignore 5 May 2009 17:27:14 -0000 1.2 @@ -0,0 +1 @@ +memcached-0.1.5.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pecl-memcached/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:44:37 -0000 1.1 +++ sources 5 May 2009 17:27:14 -0000 1.2 @@ -0,0 +1 @@ +646c3ffb622adc0379a3951155f7f4bb memcached-0.1.5.tgz From oget at fedoraproject.org Tue May 5 18:18:18 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Tue, 5 May 2009 18:18:18 +0000 (UTC) Subject: rpms/slv2/devel .cvsignore, 1.2, 1.3 slv2.spec, 1.2, 1.3 sources, 1.2, 1.3 slv2_plugininstance.h_r1948.diff, 1.1, NONE Message-ID: <20090505181818.B9EA070108@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/slv2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13872 Modified Files: .cvsignore slv2.spec sources Removed Files: slv2_plugininstance.h_r1948.diff Log Message: * Tue May 05 2009 Orcan Ogetbil - 0.6.4-1 - Version update: 0.6.4 - Drop plugininstance patch (upstreamed) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/slv2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Mar 2009 22:09:09 -0000 1.2 +++ .cvsignore 5 May 2009 18:17:48 -0000 1.3 @@ -1 +1 @@ -slv2-0.6.2.tar.bz2 +slv2-0.6.4.tar.bz2 Index: slv2.spec =================================================================== RCS file: /cvs/pkgs/rpms/slv2/devel/slv2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- slv2.spec 8 Apr 2009 20:23:54 -0000 1.2 +++ slv2.spec 5 May 2009 18:17:48 -0000 1.3 @@ -1,14 +1,10 @@ Name: slv2 Summary: LV2 host library -Version: 0.6.2 -Release: 3%{?dist} +Version: 0.6.4 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries Source0: http://download.drobilla.net/%{name}-%{version}.tar.bz2 -# Some plugins fail (NULL is undefined) to compile without this patch. -# Imported from the upstream trunk: -# http://dev.drobilla.net/changeset/1948/trunk/slv2/slv2/plugininstance.h -Patch0: slv2_plugininstance.h_r1948.diff URL: http://drobilla.net/software/slv2/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,7 +43,6 @@ This package contains the headers and de %prep %setup -q -%patch0 -p2 -b .add_stdlib.h # Fix possible multilib issues sed -i 's|/lib/|/%{_lib}/|g' src/world.c @@ -82,6 +77,7 @@ rm -rf %{buildroot} %doc AUTHORS ChangeLog COPYING README %{_bindir}/lv2* %{_libdir}/lib%{name}.so.* +%{_mandir}/man1/* %files devel %defattr(-,root,root,-) @@ -92,6 +88,10 @@ rm -rf %{buildroot} %{_mandir}/man3/%{name}* %changelog +* Tue May 05 2009 Orcan Ogetbil - 0.6.4-1 +- Version update: 0.6.4 +- Drop plugininstance patch (upstreamed) + * Wed Apr 08 2009 Orcan Ogetbil - 0.6.2-3 - Change CCFLAGS to CFLAGS Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slv2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Mar 2009 22:09:09 -0000 1.2 +++ sources 5 May 2009 18:17:48 -0000 1.3 @@ -1 +1 @@ -4e8bb5f5e96d0edea988018b6297cf99 slv2-0.6.2.tar.bz2 +2ccd51eb58b5c75128643f9b85507943 slv2-0.6.4.tar.bz2 --- slv2_plugininstance.h_r1948.diff DELETED --- From remi at fedoraproject.org Tue May 5 17:39:48 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 5 May 2009 17:39:48 +0000 (UTC) Subject: rpms/php-pecl-memcached/F-10 php-pecl-memcached.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090505173948.4BD7470108@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-memcached/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9140 Modified Files: sources Added Files: php-pecl-memcached.spec Log Message: new package --- NEW FILE php-pecl-memcached.spec --- %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define pecl_name memcached Summary: Extension to work with the Memcached caching daemon Name: php-pecl-memcached Version: 0.1.5 Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel >= 5.2.0, php-pear BuildRequires: libmemcached-devel, zlib-devel Requires(post): %{__pecl} Requires(postun): %{__pecl} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} Provides: php-pecl(%{pecl_name}) = %{version}-%{release} %description This extension uses libmemcached library to provide API for communicating with memcached servers. memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. It also provides a session handler (memcached). %prep %setup -c -q %build cd %{pecl_name}-%{version} phpize %configure %{__make} %{?_smp_mflags} %install cd %{pecl_name}-%{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/%{pecl_name}.ini << 'EOF' ; Enable %{pecl_name} extension module extension=%{pecl_name}.so ; ----- Options to use the memcached session handler ; Use memcache as a session handler ;session.save_handler=memcached ; Defines a comma separated list of server urls to use for session storage ;session.save_path="localhost:11211" EOF # Install XML package description %{__mkdir_p} %{buildroot}%{pecl_xmldir} %{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %clean %{__rm} -rf %{buildroot} %post %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi %files %defattr(-, root, root, -) %doc %{pecl_name}-%{version}/{CREDITS,LICENSE,EXPERIMENTAL,README.markdown,ChangeLog} %config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini %{php_extdir}/%{pecl_name}.so %{pecl_xmldir}/%{name}.xml %changelog * Sun Apr 29 2009 Remi Collet - 0.1.5-1 - Initial RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pecl-memcached/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 4 May 2009 03:44:37 -0000 1.1 +++ sources 5 May 2009 17:39:17 -0000 1.2 @@ -0,0 +1 @@ +646c3ffb622adc0379a3951155f7f4bb memcached-0.1.5.tgz From sandeen at fedoraproject.org Tue May 5 18:24:56 2009 From: sandeen at fedoraproject.org (Eric Sandeen) Date: Tue, 5 May 2009 18:24:56 +0000 (UTC) Subject: rpms/xfsprogs/devel .cvsignore, 1.19, 1.20 sources, 1.20, 1.21 xfsprogs.spec, 1.53, 1.54 Message-ID: <20090505182456.7735D70108@cvs1.fedora.phx.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/xfsprogs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14792 Modified Files: .cvsignore sources xfsprogs.spec Log Message: * Tue May 05 2009 Eric Sandeen 3.0.1-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfsprogs/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- .cvsignore 5 Feb 2009 01:26:30 -0000 1.19 +++ .cvsignore 5 May 2009 18:24:26 -0000 1.20 @@ -1 +1 @@ -xfsprogs-3.0.0.tar.gz +xfsprogs-3.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfsprogs/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sources 5 Feb 2009 01:26:30 -0000 1.20 +++ sources 5 May 2009 18:24:26 -0000 1.21 @@ -1 +1 @@ -ec734f935ec87ebb8be890d29380a3e6 xfsprogs-3.0.0.tar.gz +d7f879a21692d4f7abc16a20479b0829 xfsprogs-3.0.1.tar.gz Index: xfsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -p -r1.53 -r1.54 --- xfsprogs.spec 18 Apr 2009 20:19:03 -0000 1.53 +++ xfsprogs.spec 5 May 2009 18:24:26 -0000 1.54 @@ -1,7 +1,7 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs -Version: 3.0.0 -Release: 4%{?dist} +Version: 3.0.1 +Release: 1%{?dist} # Licensing based on generic "GNU GENERAL PUBLIC LICENSE" # in source, with no mention of version. # doc/COPYING file specifies what is GPL and what is LGPL @@ -63,7 +63,6 @@ in building or running the xfstests QA s %build export tagname=CC DEBUG=-DNDEBUG -autoconf # xfsprogs abuses libexecdir %configure \ --sbindir=/sbin \ @@ -186,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/xfs/xfs_types.h %changelog +* Tue May 05 2009 Eric Sandeen 3.0.1-1 +- New upstream release + * Sat Apr 18 2009 Eric Sandeen 3.0.0-4 - Fix build for non-multilib arches, oops. From wart at fedoraproject.org Tue May 5 18:32:05 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Tue, 5 May 2009 18:32:05 +0000 (UTC) Subject: rpms/freedroidrpg/devel .cvsignore, 1.10, 1.11 freedroidrpg.spec, 1.23, 1.24 sources, 1.10, 1.11 Message-ID: <20090505183205.D0AC370108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/freedroidrpg/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15826 Modified Files: .cvsignore freedroidrpg.spec sources Log Message: Update to 0.12.1; split game data into a noarch subpackage Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 17 Dec 2008 03:11:50 -0000 1.10 +++ .cvsignore 5 May 2009 18:31:35 -0000 1.11 @@ -1 +1 @@ -freedroidrpg-0.11.1.tar.bz2 +freedroidrpg-0.12.1.tar.bz2 Index: freedroidrpg.spec =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- freedroidrpg.spec 24 Feb 2009 18:17:56 -0000 1.23 +++ freedroidrpg.spec 5 May 2009 18:31:35 -0000 1.24 @@ -1,6 +1,6 @@ Name: freedroidrpg -Version: 0.11.1 -Release: 3%{?dist} +Version: 0.12.1 +Release: 1%{?dist} Summary: Role playing game with Freedroid theme and Tux as the hero Group: Amusements/Games @@ -29,10 +29,19 @@ Requires(postun): coreutils The Freedroid RPG is an extension/modification of the classical freedroid engine into a role playing game. +%package data +Summary: Data files for the freedroidrpg game +Group: Amusements/Games +BuildArch: noarch +%description data +Data files for the freedroidrpg game. %prep %setup -q +# Update the timestamp to avoid unnecessarily running configure +touch -r configure.ac aclocal.m4 + %build %configure --disable-dependency-tracking @@ -74,13 +83,20 @@ fi %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/* -%{_datadir}/%{name} %{_mandir}/man6/freedroidRPG.6* %{_datadir}/applications/*freedroidrpg.desktop %{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png +%files data +%defattr(-,root,root,-) +%{_datadir}/%{name} + %changelog +* Mon May 4 2009 Fedora Release Engineering - 0.12.1-1 +- Update to 0.12.1 +- Move data files to a noarch -data subpackage + * Tue Feb 24 2009 Fedora Release Engineering - 0.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 17 Dec 2008 03:11:50 -0000 1.10 +++ sources 5 May 2009 18:31:35 -0000 1.11 @@ -1 +1 @@ -f7bb462f5bf51638f6c71722dbdb041f freedroidrpg-0.11.1.tar.bz2 +77fc8fb5c6080c555d90105da91c671f freedroidrpg-0.12.1.tar.bz2 From wart at fedoraproject.org Tue May 5 18:34:28 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Tue, 5 May 2009 18:34:28 +0000 (UTC) Subject: rpms/freedroidrpg/devel freedroidrpg.spec,1.24,1.25 Message-ID: <20090505183428.72F5770108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/freedroidrpg/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16172 Modified Files: freedroidrpg.spec Log Message: Add Requires: so that game engine and game data are always installed together. Index: freedroidrpg.spec =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- freedroidrpg.spec 5 May 2009 18:31:35 -0000 1.24 +++ freedroidrpg.spec 5 May 2009 18:33:58 -0000 1.25 @@ -21,6 +21,7 @@ BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: libGLU-devel BuildRequires: gettext +Requires: freedroidrpg-data = %{version}-%{release} Requires(post): coreutils Requires(postun): coreutils @@ -33,6 +34,7 @@ freedroid engine into a role playing gam Summary: Data files for the freedroidrpg game Group: Amusements/Games BuildArch: noarch +Requires: freedroidrpg = %{version}-%{release} %description data Data files for the freedroidrpg game. From adamwill at fedoraproject.org Tue May 5 18:37:05 2009 From: adamwill at fedoraproject.org (Adam Williamson) Date: Tue, 5 May 2009 18:37:05 +0000 (UTC) Subject: comps comps-f11.xml.in,1.213,1.214 Message-ID: <20090505183705.8814270131@cvs1.fedora.phx.redhat.com> Author: adamwill Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16497 Modified Files: comps-f11.xml.in Log Message: add gst-mixer to gnome-desktop group by default for f11, per FESCo decision Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.213 retrieving revision 1.214 diff -u -p -r1.213 -r1.214 --- comps-f11.xml.in 5 May 2009 16:40:22 -0000 1.213 +++ comps-f11.xml.in 5 May 2009 18:36:34 -0000 1.214 @@ -2275,6 +2275,7 @@ gnome-user-share gnome-utils gok + gst-mixer gthumb gtk2-engines gucharmap From sandeen at fedoraproject.org Tue May 5 18:48:30 2009 From: sandeen at fedoraproject.org (Eric Sandeen) Date: Tue, 5 May 2009 18:48:30 +0000 (UTC) Subject: rpms/xfsprogs/devel xfsprogs.spec,1.54,1.55 Message-ID: <20090505184830.C1AA170108@cvs1.fedora.phx.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/xfsprogs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18530 Modified Files: xfsprogs.spec Log Message: * Tue May 05 2009 Eric Sandeen 3.0.1-2 - Conflict with xfsdump < 3.0.1 since files moved between them Index: xfsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- xfsprogs.spec 5 May 2009 18:24:26 -0000 1.54 +++ xfsprogs.spec 5 May 2009 18:48:00 -0000 1.55 @@ -1,7 +1,7 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} # Licensing based on generic "GNU GENERAL PUBLIC LICENSE" # in source, with no mention of version. # doc/COPYING file specifies what is GPL and what is LGPL @@ -16,7 +16,7 @@ BuildRequires: libtool, gettext BuildRequires: e2fsprogs-devel Provides: xfs-cmds Obsoletes: xfs-cmds <= %{version} -Conflicts: xfsdump < 2.0.0 +Conflicts: xfsdump < 3.0.1 %description A set of commands to use the XFS filesystem, including mkfs.xfs. @@ -185,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/xfs/xfs_types.h %changelog +* Tue May 05 2009 Eric Sandeen 3.0.1-2 +- Conflict with xfsdump < 3.0.1 since files moved between them + * Tue May 05 2009 Eric Sandeen 3.0.1-1 - New upstream release From dwalsh at fedoraproject.org Tue May 5 18:49:57 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 5 May 2009 18:49:57 +0000 (UTC) Subject: rpms/policycoreutils/F-11 policycoreutils-rhat.patch, 1.418, 1.419 policycoreutils.spec, 1.606, 1.607 Message-ID: <20090505184957.AB27470108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18834 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue May 5 2009 Dan Walsh 2.0.62-12.3 - Fix handling of .subs file policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-rhat.patch,v retrieving revision 1.418 retrieving revision 1.419 diff -u -p -r1.418 -r1.419 --- policycoreutils-rhat.patch 5 May 2009 14:53:42 -0000 1.418 +++ policycoreutils-rhat.patch 5 May 2009 18:49:56 -0000 1.419 @@ -9,6 +9,107 @@ diff -up policycoreutils-2.0.62/audit2al except OSError, e: sys.stderr.write('could not run ausearch - "%s"\n' % str(e)) sys.exit(1) +diff -up /dev/null policycoreutils-2.0.62/debugfiles.list +--- /dev/null 2009-05-04 15:46:32.150257971 -0400 ++++ policycoreutils-2.0.62/debugfiles.list 2009-05-05 10:49:02.000000000 -0400 +@@ -0,0 +1,64 @@ ++%dir /usr/lib/debug ++%dir /usr/lib/debug/sbin ++%dir /usr/lib/debug/.build-id ++%dir /usr/lib/debug/.build-id/3d ++%dir /usr/lib/debug/.build-id/ec ++%dir /usr/lib/debug/.build-id/9d ++%dir /usr/lib/debug/.build-id/cb ++%dir /usr/lib/debug/.build-id/bc ++%dir /usr/lib/debug/.build-id/0a ++%dir /usr/lib/debug/.build-id/81 ++%dir /usr/lib/debug/.build-id/ad ++%dir /usr/lib/debug/.build-id/7f ++%dir /usr/lib/debug/.build-id/f4 ++%dir /usr/lib/debug/.build-id/15 ++%dir /usr/lib/debug/.build-id/1d ++%dir /usr/lib/debug/.build-id/a8 ++%dir /usr/lib/debug/.build-id/d3 ++%dir /usr/lib/debug/usr ++%dir /usr/lib/debug/usr/sbin ++%dir /usr/lib/debug/usr/bin ++/usr/lib/debug/sbin/setfiles.debug ++/usr/lib/debug/sbin/restorecon.debug ++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug ++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 ++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab ++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug ++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug ++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 ++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce ++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug ++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 ++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug ++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug ++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 ++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug ++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 ++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug ++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be ++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug ++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a ++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug ++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 ++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug ++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 ++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug ++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f ++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b ++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug ++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 ++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug ++/usr/lib/debug/usr/sbin/load_policy.debug ++/usr/lib/debug/usr/sbin/restorecond.debug ++/usr/lib/debug/usr/sbin/semodule.debug ++/usr/lib/debug/usr/sbin/sestatus.debug ++/usr/lib/debug/usr/sbin/setsebool.debug ++/usr/lib/debug/usr/sbin/open_init_pty.debug ++/usr/lib/debug/usr/sbin/run_init.debug ++/usr/lib/debug/usr/bin/semodule_package.debug ++/usr/lib/debug/usr/bin/newrole.debug ++/usr/lib/debug/usr/bin/semodule_link.debug ++/usr/lib/debug/usr/bin/semodule_deps.debug ++/usr/lib/debug/usr/bin/semodule_expand.debug ++/usr/lib/debug/usr/bin/secon.debug ++/usr/src/debug/policycoreutils-2.0.62 +diff -up /dev/null policycoreutils-2.0.62/debuglinks.list +--- /dev/null 2009-05-04 15:46:32.150257971 -0400 ++++ policycoreutils-2.0.62/debuglinks.list 2009-05-05 10:49:02.000000000 -0400 +@@ -0,0 +1,29 @@ ++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 /sbin/setfiles ++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug /usr/lib/debug/sbin/setfiles.debug ++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 /usr/sbin/open_init_pty ++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug /usr/lib/debug/usr/sbin/open_init_pty.debug ++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 /usr/sbin/sestatus ++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug /usr/lib/debug/usr/sbin/sestatus.debug ++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 /usr/sbin/semodule ++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug /usr/lib/debug/usr/sbin/semodule.debug ++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 /usr/sbin/load_policy ++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug /usr/lib/debug/usr/sbin/load_policy.debug ++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b /usr/sbin/run_init ++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug /usr/lib/debug/usr/sbin/run_init.debug ++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a /usr/sbin/restorecond ++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug /usr/lib/debug/usr/sbin/restorecond.debug ++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab /usr/sbin/setsebool ++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug /usr/lib/debug/usr/sbin/setsebool.debug ++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 /usr/bin/secon ++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug /usr/lib/debug/usr/bin/secon.debug ++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f /usr/bin/newrole ++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug /usr/lib/debug/usr/bin/newrole.debug ++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 /usr/bin/semodule_link ++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug /usr/lib/debug/usr/bin/semodule_link.debug ++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be /usr/bin/semodule_expand ++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug /usr/lib/debug/usr/bin/semodule_expand.debug ++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce /usr/bin/semodule_package ++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug /usr/lib/debug/usr/bin/semodule_package.debug ++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 /usr/bin/semodule_deps ++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug /usr/lib/debug/usr/bin/semodule_deps.debug ++/usr/lib/debug/sbin/restorecon.debug /usr/lib/debug/sbin/setfiles.debug diff -up policycoreutils-2.0.62/Makefile.rhat policycoreutils-2.0.62/Makefile --- policycoreutils-2.0.62/Makefile.rhat 2009-02-18 16:45:00.000000000 -0500 +++ policycoreutils-2.0.62/Makefile 2009-05-05 10:49:02.000000000 -0400 @@ -292,7 +393,14 @@ diff -up policycoreutils-2.0.62/semanage diff -up policycoreutils-2.0.62/semanage/seobject.py.rhat policycoreutils-2.0.62/semanage/seobject.py --- policycoreutils-2.0.62/semanage/seobject.py.rhat 2009-02-18 16:45:01.000000000 -0500 -+++ policycoreutils-2.0.62/semanage/seobject.py 2009-05-05 10:49:02.000000000 -0400 ++++ policycoreutils-2.0.62/semanage/seobject.py 2009-05-05 14:46:35.000000000 -0400 +@@ -1,5 +1,5 @@ + #! /usr/bin/python -E +-# Copyright (C) 2005, 2006, 2007, 2008 Red Hat ++# Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat + # see file 'COPYING' for use and warranty information + # + # semanage is a tool for managing SELinux configuration files @@ -21,16 +21,16 @@ # # @@ -866,7 +974,7 @@ diff -up policycoreutils-2.0.62/semanage if rc < 0: raise ValueError(_("Could not check if interface %s is defined") % interface) if not exists: -@@ -1393,6 +1452,45 @@ class interfaceRecords(semanageRecords): +@@ -1393,6 +1452,48 @@ class interfaceRecords(semanageRecords): class fcontextRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self, store) @@ -889,7 +997,10 @@ diff -up policycoreutils-2.0.62/semanage + for src in self.equiv.keys(): + fd.write("%s %s\n" % (src, self.equiv[src])) + fd.close() -+ os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE]) ++ try: ++ os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE]) ++ except: ++ pass + os.rename(tmpfile,subs_file) + self.equil_ind = False + semanageRecords.commit(self) @@ -912,7 +1023,7 @@ diff -up policycoreutils-2.0.62/semanage def createcon(self, target, seuser = "system_u"): (rc, con) = semanage_context_create(self.sh) -@@ -1429,23 +1527,23 @@ class fcontextRecords(semanageRecords): +@@ -1429,23 +1530,23 @@ class fcontextRecords(semanageRecords): if type == "": raise ValueError(_("SELinux Type is required")) @@ -940,7 +1051,7 @@ diff -up policycoreutils-2.0.62/semanage if rc < 0: raise ValueError(_("Could not create file context for %s") % target) -@@ -1486,21 +1584,21 @@ class fcontextRecords(semanageRecords): +@@ -1486,21 +1587,21 @@ class fcontextRecords(semanageRecords): raise ValueError(_("Requires setype, serange or seuser")) self.validate(target) @@ -967,7 +1078,7 @@ diff -up policycoreutils-2.0.62/semanage if rc < 0: raise ValueError(_("Could not query file context for %s") % target) -@@ -1550,7 +1648,7 @@ class fcontextRecords(semanageRecords): +@@ -1550,7 +1651,7 @@ class fcontextRecords(semanageRecords): target = semanage_fcontext_get_expr(fcontext) ftype = semanage_fcontext_get_type(fcontext) ftype_str = semanage_fcontext_get_type_str(ftype) @@ -976,7 +1087,7 @@ diff -up policycoreutils-2.0.62/semanage if rc < 0: raise ValueError(_("Could not create a key for %s") % target) -@@ -1558,19 +1656,26 @@ class fcontextRecords(semanageRecords): +@@ -1558,19 +1659,26 @@ class fcontextRecords(semanageRecords): if rc < 0: raise ValueError(_("Could not delete the file context %s") % target) semanage_fcontext_key_free(k) @@ -1007,7 +1118,7 @@ diff -up policycoreutils-2.0.62/semanage if rc < 0: raise ValueError(_("Could not check if file context for %s is defined") % target) if exists: -@@ -1617,11 +1722,11 @@ class fcontextRecords(semanageRecords): +@@ -1617,11 +1725,11 @@ class fcontextRecords(semanageRecords): return ddict def list(self, heading = 1, locallist = 0 ): @@ -1021,7 +1132,7 @@ diff -up policycoreutils-2.0.62/semanage for k in keys: if fcon_dict[k]: if is_mls_enabled: -@@ -1630,11 +1735,17 @@ class fcontextRecords(semanageRecords): +@@ -1630,11 +1738,17 @@ class fcontextRecords(semanageRecords): print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2]) else: print "%-50s %-18s <>" % (k[0], k[1]) @@ -1040,7 +1151,7 @@ diff -up policycoreutils-2.0.62/semanage self.dict["TRUE"] = 1 self.dict["FALSE"] = 0 self.dict["ON"] = 1 -@@ -1643,16 +1754,16 @@ class booleanRecords(semanageRecords): +@@ -1643,16 +1757,16 @@ class booleanRecords(semanageRecords): self.dict["0"] = 0 def __mod(self, name, value): @@ -1060,7 +1171,7 @@ diff -up policycoreutils-2.0.62/semanage if rc < 0: raise ValueError(_("Could not query file context %s") % name) -@@ -1670,7 +1781,7 @@ class booleanRecords(semanageRecords): +@@ -1670,7 +1784,7 @@ class booleanRecords(semanageRecords): semanage_bool_key_free(k) semanage_bool_free(b) @@ -1069,7 +1180,7 @@ diff -up policycoreutils-2.0.62/semanage self.begin() -@@ -1694,16 +1805,16 @@ class booleanRecords(semanageRecords): +@@ -1694,16 +1808,16 @@ class booleanRecords(semanageRecords): def __delete(self, name): @@ -1089,7 +1200,7 @@ diff -up policycoreutils-2.0.62/semanage if rc < 0: raise ValueError(_("Could not check if boolean %s is defined") % name) if not exists: -@@ -1762,7 +1873,7 @@ class booleanRecords(semanageRecords): +@@ -1762,7 +1876,7 @@ class booleanRecords(semanageRecords): return _("unknown") def list(self, heading = True, locallist = False, use_file = False): Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v retrieving revision 1.606 retrieving revision 1.607 diff -u -p -r1.606 -r1.607 --- policycoreutils.spec 5 May 2009 14:53:43 -0000 1.606 +++ policycoreutils.spec 5 May 2009 18:49:57 -0000 1.607 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.62 -Release: 12.2%{?dist} +Release: 12.3%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -221,6 +221,9 @@ else fi %changelog +* Tue May 5 2009 Dan Walsh 2.0.62-12.3 +- Fix handling of .subs file + * Tue May 5 2009 Dan Walsh 2.0.62-12.2 - Fix fixfiles to handle btrfs From sandeen at fedoraproject.org Tue May 5 18:51:16 2009 From: sandeen at fedoraproject.org (Eric Sandeen) Date: Tue, 5 May 2009 18:51:16 +0000 (UTC) Subject: rpms/xfsdump/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xfsdump.spec, 1.10, 1.11 Message-ID: <20090505185116.823D570108@cvs1.fedora.phx.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/xfsdump/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19107 Modified Files: .cvsignore sources xfsdump.spec Log Message: * Tue May 05 2009 Eric Sandeen 3.0.1-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfsdump/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 5 Feb 2009 01:37:53 -0000 1.6 +++ .cvsignore 5 May 2009 18:50:46 -0000 1.7 @@ -1 +1 @@ -xfsdump-3.0.0.tar.gz +xfsdump-3.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfsdump/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 5 Feb 2009 01:37:53 -0000 1.6 +++ sources 5 May 2009 18:50:46 -0000 1.7 @@ -1 +1 @@ -63f05d3d131cedae2a1cdf78b47e448d xfsdump-3.0.0.tar.gz +48a65424ccc359f81426b74715c15802 xfsdump-3.0.1.tar.gz Index: xfsdump.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfsdump/devel/xfsdump.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- xfsdump.spec 26 Feb 2009 09:27:03 -0000 1.10 +++ xfsdump.spec 5 May 2009 18:50:46 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Administrative utilities for the XFS filesystem Name: xfsdump -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.1 +Release: 1%{?dist} # Licensing based on generic "GNU GENERAL PUBLIC LICENSE" # in source, with no mention of version. License: GPL+ @@ -9,7 +9,7 @@ Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ Source0: ftp://oss.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, libtool, gettext, gawk +BuildRequires: libtool, gettext, gawk BuildRequires: xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel Requires: xfsprogs >= 2.6.30, attr >= 2.0.0 @@ -34,7 +34,6 @@ subtrees may be restored from full or pa %setup -q %build -autoconf %configure --libdir=/%{_lib} --libexecdir=%{_libdir} \ --sbindir=/sbin --bindir=%{_sbindir} \ --enable-lib64=yes @@ -61,11 +60,14 @@ rm -rf $RPM_BUILD_ROOT /sbin/* %changelog +* Tue May 05 2009 Eric Sandeen 3.0.1-1 +- New upstream release + * Thu Feb 26 2009 Fedora Release Engineering - 3.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Feb 04 2009 Eric Sandeen 3.0.0-1 --New upstream release +- New upstream release * Wed Nov 12 2008 Eric Sandeen 2.2.48-2 - Enable parallel builds From dwalsh at fedoraproject.org Tue May 5 18:52:24 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 5 May 2009 18:52:24 +0000 (UTC) Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.416, 1.417 policycoreutils-sepolgen.patch, 1.22, 1.23 policycoreutils.spec, 1.603, 1.604 Message-ID: <20090505185224.75F7270108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19370 Modified Files: policycoreutils-rhat.patch policycoreutils-sepolgen.patch policycoreutils.spec Log Message: * Wed Apr 22 2009 Dan Walsh 2.0.62-14 - Fix audit2allow -a to retun /var/log/messages policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.416 retrieving revision 1.417 diff -u -p -r1.416 -r1.417 --- policycoreutils-rhat.patch 16 Apr 2009 18:53:29 -0000 1.416 +++ policycoreutils-rhat.patch 5 May 2009 18:51:52 -0000 1.417 @@ -1,128 +1,575 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-2.0.62/debugfiles.list ---- nsapolicycoreutils/debugfiles.list 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.62/debugfiles.list 2009-04-03 14:13:23.000000000 -0400 -@@ -0,0 +1,64 @@ -+%dir /usr/lib/debug -+%dir /usr/lib/debug/sbin -+%dir /usr/lib/debug/.build-id -+%dir /usr/lib/debug/.build-id/3d -+%dir /usr/lib/debug/.build-id/ec -+%dir /usr/lib/debug/.build-id/9d -+%dir /usr/lib/debug/.build-id/cb -+%dir /usr/lib/debug/.build-id/bc -+%dir /usr/lib/debug/.build-id/0a -+%dir /usr/lib/debug/.build-id/81 -+%dir /usr/lib/debug/.build-id/ad -+%dir /usr/lib/debug/.build-id/7f -+%dir /usr/lib/debug/.build-id/f4 -+%dir /usr/lib/debug/.build-id/15 -+%dir /usr/lib/debug/.build-id/1d -+%dir /usr/lib/debug/.build-id/a8 -+%dir /usr/lib/debug/.build-id/d3 -+%dir /usr/lib/debug/usr -+%dir /usr/lib/debug/usr/sbin -+%dir /usr/lib/debug/usr/bin -+/usr/lib/debug/sbin/setfiles.debug -+/usr/lib/debug/sbin/restorecon.debug -+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug -+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 -+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab -+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug -+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug -+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 -+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce -+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug -+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 -+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug -+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug -+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 -+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug -+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 -+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug -+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be -+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug -+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a -+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug -+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 -+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug -+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 -+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug -+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f -+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b -+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug -+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 -+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug -+/usr/lib/debug/usr/sbin/load_policy.debug -+/usr/lib/debug/usr/sbin/restorecond.debug -+/usr/lib/debug/usr/sbin/semodule.debug -+/usr/lib/debug/usr/sbin/sestatus.debug -+/usr/lib/debug/usr/sbin/setsebool.debug -+/usr/lib/debug/usr/sbin/open_init_pty.debug -+/usr/lib/debug/usr/sbin/run_init.debug -+/usr/lib/debug/usr/bin/semodule_package.debug -+/usr/lib/debug/usr/bin/newrole.debug -+/usr/lib/debug/usr/bin/semodule_link.debug -+/usr/lib/debug/usr/bin/semodule_deps.debug -+/usr/lib/debug/usr/bin/semodule_expand.debug -+/usr/lib/debug/usr/bin/secon.debug -+/usr/src/debug/policycoreutils-2.0.62 -diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debuglinks.list policycoreutils-2.0.62/debuglinks.list ---- nsapolicycoreutils/debuglinks.list 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.62/debuglinks.list 2009-04-03 14:13:23.000000000 -0400 -@@ -0,0 +1,29 @@ -+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 /sbin/setfiles -+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug /usr/lib/debug/sbin/setfiles.debug -+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 /usr/sbin/open_init_pty -+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug /usr/lib/debug/usr/sbin/open_init_pty.debug -+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 /usr/sbin/sestatus -+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug /usr/lib/debug/usr/sbin/sestatus.debug -+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 /usr/sbin/semodule -+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug /usr/lib/debug/usr/sbin/semodule.debug -+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 /usr/sbin/load_policy -+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug /usr/lib/debug/usr/sbin/load_policy.debug -+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b /usr/sbin/run_init -+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug /usr/lib/debug/usr/sbin/run_init.debug -+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a /usr/sbin/restorecond -+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug /usr/lib/debug/usr/sbin/restorecond.debug -+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab /usr/sbin/setsebool -+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug /usr/lib/debug/usr/sbin/setsebool.debug -+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 /usr/bin/secon -+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug /usr/lib/debug/usr/bin/secon.debug -+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f /usr/bin/newrole -+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug /usr/lib/debug/usr/bin/newrole.debug -+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 /usr/bin/semodule_link -+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug /usr/lib/debug/usr/bin/semodule_link.debug -+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be /usr/bin/semodule_expand -+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug /usr/lib/debug/usr/bin/semodule_expand.debug -+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce /usr/bin/semodule_package -+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug /usr/lib/debug/usr/bin/semodule_package.debug -+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 /usr/bin/semodule_deps -+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug /usr/lib/debug/usr/bin/semodule_deps.debug -+/usr/lib/debug/sbin/restorecon.debug /usr/lib/debug/sbin/setfiles.debug -Binary files nsapolicycoreutils/debugsources.list and policycoreutils-2.0.62/debugsources.list differ +diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.62/audit2allow/audit2allow +--- nsapolicycoreutils/audit2allow/audit2allow 2009-01-13 08:45:35.000000000 -0500 ++++ policycoreutils-2.0.62/audit2allow/audit2allow 2009-05-04 13:40:26.000000000 -0400 +@@ -126,6 +126,7 @@ + elif self.__options.audit: + try: + messages = audit.get_audit_msgs() ++ messages += audit.get_log_msgs() + except OSError, e: + sys.stderr.write('could not run ausearch - "%s"\n' % str(e)) + sys.exit(1) diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.62/Makefile --- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.62/Makefile 2009-04-03 14:12:56.000000000 -0400 ++++ policycoreutils-2.0.62/Makefile 2009-05-04 13:40:26.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.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.62/restorecond/Makefile +--- nsapolicycoreutils/restorecond/Makefile 2009-02-18 16:44:47.000000000 -0500 ++++ policycoreutils-2.0.62/restorecond/Makefile 2009-05-04 13:40:26.000000000 -0400 +@@ -2,16 +2,21 @@ + PREFIX ?= ${DESTDIR}/usr + SBINDIR ?= $(PREFIX)/sbin + MANDIR = $(PREFIX)/share/man ++AUTOSTARTDIR = $(DESTDIR)/etc/xdg/autostart ++DBUSSERVICEDIR = $(DESTDIR)/usr/share/dbus-1/services ++ ++autostart_DATA = sealertauto.desktop + INITDIR = $(DESTDIR)/etc/rc.d/init.d + SELINUXDIR = $(DESTDIR)/etc/selinux + + CFLAGS ?= -g -Werror -Wall -W +-override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 +-LDLIBS += -lselinux -L$(PREFIX)/lib ++override CFLAGS += -I$(PREFIX)/include -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -D_FILE_OFFSET_BITS=64 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include ++ ++LDLIBS += -lselinux -ldbus-glib-1 -lglib-2.0 -L$(PREFIX)/lib + + all: restorecond + +-restorecond: restorecond.o utmpwatcher.o stringslist.o ++restorecond: restorecond.o stringslist.o user.o + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) + + install: all +@@ -22,7 +27,12 @@ + -mkdir -p $(INITDIR) + install -m 755 restorecond.init $(INITDIR)/restorecond + -mkdir -p $(SELINUXDIR) +- install -m 600 restorecond.conf $(SELINUXDIR)/restorecond.conf ++ install -m 644 restorecond.conf $(SELINUXDIR)/restorecond.conf ++ install -m 644 restorecond_user.conf $(SELINUXDIR)/restorecond_user.conf ++ -mkdir -p $(AUTOSTARTDIR) ++ install -m 600 restorecond.desktop $(AUTOSTARTDIR)/restorecond.desktop ++ -mkdir -p $(DBUSSERVICEDIR) ++ install -m 600 org.selinux.Restorecond.service $(DBUSSERVICEDIR)/org.selinux.Restorecond.service + + relabel: install + /sbin/restorecon $(SBINDIR)/restorecond +diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.62/restorecond/org.selinux.Restorecond.service +--- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.62/restorecond/org.selinux.Restorecond.service 2009-05-04 13:40:26.000000000 -0400 +@@ -0,0 +1,3 @@ ++[D-BUS Service] ++Name=org.selinux.Restorecond ++Exec=/usr/sbin/restorecond -u +diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.62/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 2009-02-18 16:44:47.000000000 -0500 ++++ policycoreutils-2.0.62/restorecond/restorecond.c 2009-05-04 13:40:26.000000000 -0400 +@@ -54,25 +54,31 @@ + #include + #include + #include ++#include ++#include + + #include "restorecond.h" + #include "stringslist.h" +-#include "utmpwatcher.h" + ++extern int start(void); ++extern int server(int); + extern char *dirname(char *path); + static int master_fd = -1; + static int master_wd = -1; + static int terminate = 0; + ++static char *server_watch_file = "/etc/selinux/restorecond.conf"; ++static char *user_watch_file = "/etc/selinux/restorecond_user.conf"; ++static char *watch_file; ++ + #include +-#include + + /* size of the event structure, not counting name */ + #define EVENT_SIZE (sizeof (struct inotify_event)) + /* reasonable guess as to size of 1024 events */ + #define BUF_LEN (1024 * (EVENT_SIZE + 16)) + +-static int debug_mode = 0; ++int debug_mode = 0; + static int verbose_mode = 0; + + static void restore(const char *filename, int exact); +@@ -104,7 +110,7 @@ + see if it is one that we are watching. + */ + +-static int watch_list_find(int wd, const char *file) ++int watch_list_find(int wd, const char *file) + { + struct watchList *ptr = NULL; + ptr = firstDir; +@@ -135,7 +141,7 @@ + return -1; + } + +-static void watch_list_free(int fd) ++void watch_list_free(int fd) + { + struct watchList *ptr = NULL; + struct watchList *prev = NULL; +@@ -152,6 +158,12 @@ + firstDir = NULL; + } + ++static void done(void) { ++ watch_list_free(master_fd); ++ close(master_fd); ++ matchpathcon_fini(); ++} ++ + /* + Set the file context to the default file context for this system. + Same as restorecon. +@@ -241,6 +253,8 @@ + { + char *line_buf = NULL; + size_t len = 0; ++ uid_t uid = getuid(); ++ struct passwd *pwd = getpwuid(uid); + + while (getline(&line_buf, &len, cfg) > 0) { + char *buffer = line_buf; +@@ -252,8 +266,12 @@ + if (l <= 0) + continue; + buffer[l] = 0; +- if (buffer[0] == '~') +- utmpwatcher_add(fd, &buffer[1]); ++ if (buffer[0] == '~') { ++ char *ptr=NULL; ++ asprintf(&ptr, "%s%s", pwd->pw_dir, &buffer[1]); ++ watch_list_add(fd, ptr); ++ free(ptr); ++ } + else { + watch_list_add(fd, buffer); + } +@@ -267,9 +285,8 @@ + homedirs. + */ + +-static void read_config(int fd) ++static void read_config(int fd, const char *watch_file_path) + { +- char *watch_file_path = "/etc/selinux/restorecond.conf"; + + FILE *cfg = NULL; + if (debug_mode) +@@ -278,8 +295,10 @@ + watch_list_free(fd); + + cfg = fopen(watch_file_path, "r"); +- if (!cfg) +- exitApp("Error reading config file."); ++ if (!cfg){ ++ perror(watch_file_path); ++ exitApp("Error reading config file"); ++ } + process_config(fd, cfg); + fclose(cfg); + +@@ -316,21 +335,10 @@ + event->wd, event->mask, + event->cookie, event->len); + if (event->wd == master_wd) +- read_config(fd); ++ read_config(fd, watch_file); + else { +- switch (utmpwatcher_handle(fd, event->wd)) { +- case -1: /* Message was not for utmpwatcher */ +- if (event->len) +- watch_list_find(event->wd, event->name); +- break; +- +- case 1: /* utmp has changed need to reload */ +- read_config(fd); +- break; +- +- default: /* No users logged in or out */ +- break; +- } ++ if (event->len) ++ watch_list_find(event->wd, event->name); + } + + i += EVENT_SIZE + event->len; +@@ -374,7 +382,7 @@ + + static void usage(char *program) + { +- printf("%s [-d] [-v] \n", program); ++ printf("%s [-d] [-s] [-f restorecond_file ] [-v] \n", program); + exit(0); + } + +@@ -393,7 +401,9 @@ + void watch_list_add(int fd, const char *path) + { + struct watchList *ptr = NULL; ++ size_t i = 0; + struct watchList *prev = NULL; ++ glob_t globbuf; + char *x = strdup(path); + if (!x) + exitApp("Out of Memory"); +@@ -401,7 +411,15 @@ + char *file = basename(path); + ptr = firstDir; + +- restore(path, 1); ++ globbuf.gl_offs = 1; ++ if (glob(path, ++ GLOB_TILDE, ++ NULL, ++ &globbuf) >= 0) { ++ for (i=0; i < globbuf.gl_pathc; i++) ++ restore(globbuf.gl_pathv[i], 1); ++ globfree(&globbuf); ++ } + + while (ptr != NULL) { + if (strcmp(dir, ptr->dir) == 0) { +@@ -445,14 +463,8 @@ + { + int opt; + struct sigaction sa; ++ int run_as_user = 0; + +-#ifndef DEBUG +- /* Make sure we are root */ +- if (getuid() != 0) { +- fprintf(stderr, "You must be root to run this program.\n"); +- return 1; +- } +-#endif + /* Make sure we are root */ + if (is_selinux_enabled() != 1) { + fprintf(stderr, "Daemon requires SELinux be enabled to run.\n"); +@@ -471,11 +483,18 @@ + if (master_fd < 0) + exitApp("inotify_init"); + +- while ((opt = getopt(argc, argv, "dv")) > 0) { ++ atexit( done ); ++ while ((opt = getopt(argc, argv, "uf:dv")) > 0) { + switch (opt) { + case 'd': + debug_mode = 1; + break; ++ case 'f': ++ watch_file = optarg; ++ break; ++ case 'u': ++ run_as_user = 1; ++ break; + case 'v': + verbose_mode = 1; + break; +@@ -483,7 +502,18 @@ + usage(argv[0]); + } + } +- read_config(master_fd); ++ ++ if (getuid() != 0) { ++ watch_file = user_watch_file; ++ read_config(master_fd, watch_file); ++ if (run_as_user) ++ return server(master_fd); ++ else ++ return start(); ++ } ++ ++ watch_file = server_watch_file; ++ read_config(master_fd, watch_file); + + if (!debug_mode) + daemon(0, 0); +@@ -496,9 +526,10 @@ + watch_list_free(master_fd); + close(master_fd); + matchpathcon_fini(); +- utmpwatcher_free(); + if (pidfile) + unlink(pidfile); + + return 0; + } ++ ++ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.62/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2009-02-18 16:44:47.000000000 -0500 -+++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-04-03 14:12:56.000000000 -0400 -@@ -5,3 +5,7 @@ ++++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-05-04 13:40:26.000000000 -0400 +@@ -4,4 +4,5 @@ + /etc/mtab /var/run/utmp /var/log/wtmp - ~/* -+/root/.ssh +-~/* ++/root/* +/root/.ssh/* -+ -+ +diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.62/restorecond/restorecond.desktop +--- nsapolicycoreutils/restorecond/restorecond.desktop 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.62/restorecond/restorecond.desktop 2009-05-04 13:40:26.000000000 -0400 +@@ -0,0 +1,7 @@ ++[Desktop Entry] ++Name=File Context maintainer ++Exec=/usr/sbin/restorecond ++Comment=Fix file context in owned by the user ++Encoding=UTF-8 ++Type=Application ++StartupNotify=false +diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.62/restorecond/restorecond_user.conf +--- nsapolicycoreutils/restorecond/restorecond_user.conf 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.62/restorecond/restorecond_user.conf 2009-05-04 13:40:26.000000000 -0400 +@@ -0,0 +1,2 @@ ++~/* ++~/public_html/* +diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.62/restorecond/user.c +--- nsapolicycoreutils/restorecond/user.c 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.62/restorecond/user.c 2009-05-04 13:40:26.000000000 -0400 +@@ -0,0 +1,223 @@ ++/* ++ * restorecond ++ * ++ * Copyright (C) 2006-2009 Red Hat ++ * see file 'COPYING' for use and warranty information ++ * ++ * 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 ++ * ++ * Authors: ++ * Dan Walsh ++ * ++*/ ++ ++/* ++ * PURPOSE: ++ * This daemon program watches for the creation of files listed in a config file ++ * and makes sure that there security context matches the systems defaults ++ * ++ * USAGE: ++ * restorecond [-d] [-v] ++ * ++ * -d Run in debug mode ++ * -v Run in verbose mode (Report missing files) ++ * ++ * EXAMPLE USAGE: ++ * restorecond ++ * ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "restorecond.h" ++#include "stringslist.h" ++#include ++#include ++#include ++#include ++ ++extern int watch_list_find(int wd, const char *file); ++extern void watch_list_free(int fd); ++extern int debug_mode; ++ ++static DBusHandlerResult signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data); ++ ++static const char *PATH="/org/selinux/Restorecond"; ++//static const char *BUSNAME="org.selinux.Restorecond"; ++static const char *INTERFACE="org.selinux.RestorecondIface"; ++static const char *RULE="type='signal',interface='org.selinux.RestorecondIface'"; ++ ++#include ++ ++/* size of the event structure, not counting name */ ++#define EVENT_SIZE (sizeof (struct inotify_event)) ++/* reasonable guess as to size of 1024 events */ ++#define BUF_LEN (1024 * (EVENT_SIZE + 16)) ++ ++static gboolean ++io_channel_callback ++ (GIOChannel *source, ++ GIOCondition condition, ++ gpointer data __attribute__((__unused__))) ++{ ++ ++ char buffer[BUF_LEN+1]; ++ gsize bytes_read; ++ unsigned int i = 0; ++ ++ if (condition & G_IO_IN) { ++ /* Data is available. */ ++ g_io_channel_read ++ (source, buffer, ++ sizeof (buffer), ++ &bytes_read); ++ ++ while (i < bytes_read) { ++ struct inotify_event *event; ++ event = (struct inotify_event *)&buffer[i]; ++ if (debug_mode) ++ printf("wd=%d mask=%u cookie=%u len=%u\n", ++ event->wd, event->mask, ++ event->cookie, event->len); ++ if (event->len) ++ watch_list_find(event->wd, event->name); ++ ++ i += EVENT_SIZE + event->len; ++ } ++ } ++ ++ /* An error happened while reading ++ the file. */ ++ ++ if (condition & G_IO_NVAL) ++ return FALSE; ++ ++ /* We have reached the end of the ++ file. */ ++ ++ if (condition & G_IO_HUP) { ++ g_io_channel_close (source); ++ return FALSE; ++ } ++ ++ /* Returning TRUE will make sure ++ the callback remains associated ++ to the channel. */ ++ ++ return TRUE; ++} ++ ++static DBusHandlerResult ++signal_filter (DBusConnection *connection __attribute__ ((__unused__)), DBusMessage *message, void *user_data) ++{ ++ /* User data is the event loop we are running in */ ++ GMainLoop *loop = user_data; ++ ++ /* A signal from the bus saying we are about to be disconnected */ ++ if (dbus_message_is_signal ++ (message, INTERFACE, "Stop")) { ++ ++ /* Tell the main loop to quit */ ++ g_main_loop_quit (loop); ++ /* We have handled this message, don't pass it on */ ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ /* A Ping signal on the com.burtonini.dbus.Signal interface */ ++ else if (dbus_message_is_signal (message, INTERFACE, "Start")) { ++ DBusError error; ++ dbus_error_init (&error); ++ g_print("Start received\n"); ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++} ++ ++ ++int start() { ++ DBusConnection *bus; ++ DBusError error; ++ DBusMessage *message; ++ ++ /* Get a connection to the session bus */ ++ dbus_error_init (&error); ++ bus = dbus_bus_get (DBUS_BUS_SESSION, &error); ++ if (!bus) { ++ g_warning ("Failed to connect to the D-BUS daemon: %s", error.message); ++ dbus_error_free (&error); ++ return 1; ++ } ++ ++ ++ /* Create a new signal "Start" on the interface, ++ * from the object */ ++ message = dbus_message_new_signal (PATH, ++ INTERFACE, "Start"); ++ /* Send the signal */ ++ dbus_connection_send (bus, message, NULL); ++ /* Free the signal now we have finished with it */ ++ dbus_message_unref (message); ++ return 0; ++} ++ ++int server(int master_fd) { ++ GMainLoop *loop; ++ DBusConnection *bus; ++ DBusError error; ++ ++ loop = g_main_loop_new (NULL, FALSE); ++ ++ dbus_error_init (&error); ++ if(getuid() == 0) { ++ bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error); ++ } else { ++ bus = dbus_bus_get (DBUS_BUS_SESSION, &error); ++ } ++ if (!bus) { ++ g_warning ("Failed to connect to the D-BUS daemon: %s", error.message); ++ dbus_error_free (&error); ++ return 1; ++ } ++ dbus_connection_setup_with_g_main (bus, NULL); ++ ++ /* listening to messages from all objects as no path is specified */ ++ dbus_bus_add_match (bus, RULE, &error); // see signals from the given interfacey ++ dbus_connection_add_filter (bus, signal_filter, loop, NULL); ++ ++ set_matchpathcon_flags(MATCHPATHCON_NOTRANS); ++ ++ GIOChannel *c = g_io_channel_unix_new(master_fd); ++ ++ g_io_add_watch_full( c, ++ G_PRIORITY_HIGH, ++ G_IO_IN|G_IO_ERR|G_IO_HUP, ++ io_channel_callback, NULL, NULL); ++ ++ g_main_loop_run (loop); ++ return 0; ++} diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.62/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2009-01-13 08:45:35.000000000 -0500 -+++ policycoreutils-2.0.62/scripts/chcat 2009-04-09 12:28:34.000000000 -0400 ++++ policycoreutils-2.0.62/scripts/chcat 2009-05-04 13:40:26.000000000 -0400 @@ -281,14 +281,14 @@ def expandCats(cats): newcats = [] @@ -148,8 +595,17 @@ diff --exclude-from=exclude --exclude=se if len(newcats) > 25: diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.62/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2009-02-18 16:44:47.000000000 -0500 -+++ policycoreutils-2.0.62/scripts/fixfiles 2009-04-03 14:12:56.000000000 -0400 -@@ -122,7 +122,7 @@ ++++ policycoreutils-2.0.62/scripts/fixfiles 2009-05-05 10:47:08.000000000 -0400 +@@ -89,7 +89,7 @@ + fi; \ + done | \ + while read pattern ; do sh -c "find $pattern \ +- ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs \) -prune -o \ ++ ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o -fstype btrfs \) -prune -o \ + \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print0"; \ + done 2> /dev/null | \ + ${RESTORECON} $* -0 -f - +@@ -122,14 +122,14 @@ fi if [ ! -z "$RPMFILES" ]; then for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do @@ -158,9 +614,17 @@ diff --exclude-from=exclude --exclude=se done exit $? fi + if [ ! -z "$FILEPATH" ]; then + if [ -x /usr/bin/find ]; then + /usr/bin/find "$FILEPATH" \ +- ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs \) -prune -o -print0 | \ ++ ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o fstype btrfs \) -prune -o -print0 | \ + ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE + else + ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2009-02-18 16:44:47.000000000 -0500 -+++ policycoreutils-2.0.62/semanage/semanage 2009-04-16 14:46:41.000000000 -0400 ++++ policycoreutils-2.0.62/semanage/semanage 2009-05-04 13:40:26.000000000 -0400 @@ -44,16 +44,17 @@ text = _(""" semanage [ -S store ] -i [ input_file | - ] @@ -260,7 +724,7 @@ diff --exclude-from=exclude --exclude=se use_file = True + if o == "--dontaudit": -+ dontaudit = a ++ dontaudit = not int(a) + if o == "-h" or o == "--help": raise ValueError(_("%s bad option") % o) @@ -354,7 +818,7 @@ diff --exclude-from=exclude --exclude=se diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.62/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.62/semanage/semanage.8 2009-04-16 13:51:38.000000000 -0400 ++++ policycoreutils-2.0.62/semanage/semanage.8 2009-05-04 13:40:26.000000000 -0400 @@ -21,6 +21,8 @@ .br .B semanage permissive \-{a|d} type @@ -366,7 +830,14 @@ diff --exclude-from=exclude --exclude=se diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2008-11-14 17:10:15.000000000 -0500 -+++ policycoreutils-2.0.62/semanage/seobject.py 2009-04-16 14:46:58.000000000 -0400 ++++ policycoreutils-2.0.62/semanage/seobject.py 2009-05-05 14:45:58.000000000 -0400 +@@ -1,5 +1,5 @@ + #! /usr/bin/python -E +-# Copyright (C) 2005, 2006, 2007, 2008 Red Hat ++# Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat + # see file 'COPYING' for use and warranty information + # + # semanage is a tool for managing SELinux configuration files @@ -21,16 +21,16 @@ # # @@ -514,7 +985,7 @@ diff --exclude-from=exclude --exclude=se + + def dontaudit(self, dontaudit = 0): + self.begin() -+ rc = semanage_set_disable_dontaudit(self.sh, int(dontaudit)) ++ rc = semanage_set_disable_dontaudit(self.sh, dontaudit) + self.commit() + rc = semanage_reload_policy(self.sh) + @@ -940,7 +1411,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if interface %s is defined") % interface) if not exists: -@@ -1393,6 +1452,45 @@ +@@ -1393,6 +1452,48 @@ class fcontextRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self, store) @@ -963,7 +1434,10 @@ diff --exclude-from=exclude --exclude=se + for src in self.equiv.keys(): + fd.write("%s %s\n" % (src, self.equiv[src])) + fd.close() -+ os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE]) ++ try: ++ os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE]) ++ except: ++ pass + os.rename(tmpfile,subs_file) + self.equil_ind = False + semanageRecords.commit(self) @@ -986,7 +1460,7 @@ diff --exclude-from=exclude --exclude=se def createcon(self, target, seuser = "system_u"): (rc, con) = semanage_context_create(self.sh) -@@ -1429,23 +1527,23 @@ +@@ -1429,23 +1530,23 @@ if type == "": raise ValueError(_("SELinux Type is required")) @@ -1014,7 +1488,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create file context for %s") % target) -@@ -1486,21 +1584,21 @@ +@@ -1486,21 +1587,21 @@ raise ValueError(_("Requires setype, serange or seuser")) self.validate(target) @@ -1041,7 +1515,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query file context for %s") % target) -@@ -1550,7 +1648,7 @@ +@@ -1550,7 +1651,7 @@ target = semanage_fcontext_get_expr(fcontext) ftype = semanage_fcontext_get_type(fcontext) ftype_str = semanage_fcontext_get_type_str(ftype) @@ -1050,7 +1524,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not create a key for %s") % target) -@@ -1558,19 +1656,26 @@ +@@ -1558,19 +1659,26 @@ if rc < 0: raise ValueError(_("Could not delete the file context %s") % target) semanage_fcontext_key_free(k) @@ -1081,7 +1555,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if file context for %s is defined") % target) if exists: -@@ -1617,11 +1722,11 @@ +@@ -1617,11 +1725,11 @@ return ddict def list(self, heading = 1, locallist = 0 ): @@ -1095,7 +1569,7 @@ diff --exclude-from=exclude --exclude=se for k in keys: if fcon_dict[k]: if is_mls_enabled: -@@ -1630,11 +1735,17 @@ +@@ -1630,11 +1738,17 @@ print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2]) else: print "%-50s %-18s <>" % (k[0], k[1]) @@ -1114,7 +1588,7 @@ diff --exclude-from=exclude --exclude=se self.dict["TRUE"] = 1 self.dict["FALSE"] = 0 self.dict["ON"] = 1 -@@ -1643,16 +1754,16 @@ +@@ -1643,16 +1757,16 @@ self.dict["0"] = 0 def __mod(self, name, value): @@ -1134,7 +1608,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not query file context %s") % name) -@@ -1670,7 +1781,7 @@ +@@ -1670,7 +1784,7 @@ semanage_bool_key_free(k) semanage_bool_free(b) @@ -1143,7 +1617,7 @@ diff --exclude-from=exclude --exclude=se self.begin() -@@ -1694,16 +1805,16 @@ +@@ -1694,16 +1808,16 @@ def __delete(self, name): @@ -1163,7 +1637,7 @@ diff --exclude-from=exclude --exclude=se if rc < 0: raise ValueError(_("Could not check if boolean %s is defined") % name) if not exists: -@@ -1762,7 +1873,7 @@ +@@ -1762,7 +1876,7 @@ return _("unknown") def list(self, heading = True, locallist = False, use_file = False): @@ -1172,11 +1646,9 @@ diff --exclude-from=exclude --exclude=se if use_file: ddict = self.get_all(locallist) keys = ddict.keys() -Binary files nsapolicycoreutils/setfiles/restorecon and policycoreutils-2.0.62/setfiles/restorecon differ -Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-2.0.62/setfiles/setfiles differ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.62/setfiles/setfiles.c --- nsapolicycoreutils/setfiles/setfiles.c 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.62/setfiles/setfiles.c 2009-04-14 09:38:55.000000000 -0400 ++++ policycoreutils-2.0.62/setfiles/setfiles.c 2009-05-04 13:40:26.000000000 -0400 @@ -29,6 +29,8 @@ static int mass_relabel; static int mass_relabel_errs; @@ -1209,4 +1681,3 @@ diff --exclude-from=exclude --exclude=se printf("\n"); exit(errors); } -Binary files nsapolicycoreutils/setfiles/setfiles.o and policycoreutils-2.0.62/setfiles/setfiles.o differ policycoreutils-sepolgen.patch: Index: policycoreutils-sepolgen.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- policycoreutils-sepolgen.patch 9 Apr 2009 02:05:30 -0000 1.22 +++ policycoreutils-sepolgen.patch 5 May 2009 18:51:54 -0000 1.23 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py --- nsasepolgen/src/sepolgen/access.py 2009-01-13 08:45:35.000000000 -0500 -+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py 2009-04-01 10:03:43.000000000 -0400 ++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py 2009-04-21 14:54:12.000000000 -0400 @@ -313,7 +313,7 @@ def __len__(self): @@ -10,9 +10,30 @@ diff --exclude-from=exclude -N -u -r nsa def add(self, role, type): if self.role_types.has_key(role): +diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/audit.py +--- nsasepolgen/src/sepolgen/audit.py 2008-08-28 09:34:24.000000000 -0400 ++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/audit.py 2009-04-24 13:19:39.000000000 -0400 +@@ -47,6 +47,17 @@ + stdout=subprocess.PIPE).communicate()[0] + return output + ++def get_log_msgs(): ++ """Obtain all of the avc and policy load messages from /var/log/messages. ++ ++ Returns: ++ string contain all of the audit messages returned by /var/log/messages. ++ """ ++ import subprocess ++ output = subprocess.Popen(["/bin/grep", "avc", "/var/log/messages"], ++ stdout=subprocess.PIPE).communicate()[0] ++ return output ++ + # Classes representing audit messages + + class AuditMessage: diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py --- nsasepolgen/src/sepolgen/refparser.py 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py 2009-02-18 16:52:27.000000000 -0500 ++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py 2009-04-21 14:54:12.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.603 retrieving revision 1.604 diff -u -p -r1.603 -r1.604 --- policycoreutils.spec 16 Apr 2009 18:53:29 -0000 1.603 +++ policycoreutils.spec 5 May 2009 18:51:54 -0000 1.604 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.62 -Release: 11%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -201,6 +201,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/sestatus.conf %attr(755,root,root) /etc/rc.d/init.d/restorecond %config(noreplace) /etc/selinux/restorecond.conf +%config(noreplace) /etc/selinux/restorecond_user.conf +%{_sysconfdir}/xdg/autostart/restorecond.desktop +%{_datadir}/dbus-1/services/org.selinux.Restorecond.service %preun if [ $1 -eq 0 ]; then @@ -221,7 +224,13 @@ else fi %changelog -* Thu Apr 16 2009 Dan Walsh 2.0.62-11 +* Wed Apr 22 2009 Dan Walsh 2.0.62-14 +- Fix audit2allow -a to retun /var/log/messages + +* Wed Apr 22 2009 Dan Walsh 2.0.62-13 +- Run restorecond as a user service + +* Thu Apr 16 2009 Dan Walsh 2.0.62-12 - Add semanage module support * Tue Apr 14 2009 Dan Walsh 2.0.62-10 From lennart at fedoraproject.org Tue May 5 19:01:37 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Tue, 5 May 2009 19:01:37 +0000 (UTC) Subject: comps comps-f11.xml.in,1.214,1.215 Message-ID: <20090505190137.E3ED370108@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20655 Modified Files: comps-f11.xml.in Log Message: remove pavucontrol from default install, make it optional instead Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.214 retrieving revision 1.215 diff -u -p -r1.214 -r1.215 --- comps-f11.xml.in 5 May 2009 18:36:34 -0000 1.214 +++ comps-f11.xml.in 5 May 2009 19:01:07 -0000 1.215 @@ -4709,7 +4709,6 @@ gstreamer-plugins-good icedax PackageKit-gstreamer-plugin - pavucontrol pulseaudio pulseaudio-module-bluetooth pulseaudio-utils @@ -4720,6 +4719,7 @@ totem-mozplugin totem-nautilus wodim + pavucontrol abcde adplay alsamixergui From denisarnaud at fedoraproject.org Tue May 5 19:04:27 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 19:04:27 +0000 (UTC) Subject: rpms/soci/devel import.log, 1.1, 1.2 soci-3.0.0-fix-gcc43-compatibility.patch, 1.1, 1.2 soci.spec, 1.1, 1.2 Message-ID: <20090505190427.D941370108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20971/devel Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-7 - Added a missing cstdio header include for g++-4.4 compatibility Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 4 May 2009 21:56:11 -0000 1.1 +++ import.log 5 May 2009 19:03:57 -0000 1.2 @@ -1 +1,2 @@ soci-3_0_0-6_fc10:HEAD:soci-3.0.0-6.fc10.src.rpm:1241473915 +soci-3_0_0-7_fc10:HEAD:soci-3.0.0-7.fc10.src.rpm:1241549903 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci-3.0.0-fix-gcc43-compatibility.patch 4 May 2009 21:56:11 -0000 1.1 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 19:03:57 -0000 1.2 @@ -45,3 +45,14 @@ diff -u -r soci-3.0.0_ref/src/backends/m #ifdef _MSC_VER #pragma warning(disable:4355) +diff -ru soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp +--- soci-3.0.0/src/core/soci-simple.cpp 2008-07-01 09:42:25.000000000 +0200 ++++ soci-3.0.0_4-pack/src/core/soci-simple.cpp 2009-05-05 16:17:38.000000000 +0200 +@@ -9,6 +9,7 @@ + + #include "soci-simple.h" + #include "soci.h" ++#include + + using namespace soci; + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci.spec 4 May 2009 21:56:11 -0000 1.1 +++ soci.spec 5 May 2009 19:03:57 -0000 1.2 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The database access library for C++ programmers @@ -275,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-7 +- Added a missing cstdio header include for g++-4.4 compatibility + * Sat May 02 2009 Denis Arnaud 3.0.0-6 - Removed the unused build conditionals From dwalsh at fedoraproject.org Tue May 5 19:14:16 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 5 May 2009 19:14:16 +0000 (UTC) Subject: rpms/policycoreutils/devel policycoreutils.spec,1.604,1.605 Message-ID: <20090505191416.2137070108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23232 Modified Files: policycoreutils.spec Log Message: * Wed Apr 22 2009 Dan Walsh 2.0.62-14 - Fix audit2allow -a to retun /var/log/messages Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.604 retrieving revision 1.605 diff -u -p -r1.604 -r1.605 --- policycoreutils.spec 5 May 2009 18:51:54 -0000 1.604 +++ policycoreutils.spec 5 May 2009 19:13:45 -0000 1.605 @@ -26,6 +26,7 @@ Patch4: policycoreutils-sepolgen.patch Obsoletes: policycoreutils < 2.0.61-2 BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext +BuildRequires: desktop-file-utils dbus-devel Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed Requires: libsepol >= %{libsepolver} coreutils checkpolicy libselinux-utils >= %{libselinuxver} Requires(post): /sbin/service /sbin/chkconfig From wwoods at fedoraproject.org Tue May 5 19:14:38 2009 From: wwoods at fedoraproject.org (Will Woods) Date: Tue, 5 May 2009 19:14:38 +0000 (UTC) Subject: rpms/preupgrade/F-11 .cvsignore, 1.7, 1.8 preupgrade.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <20090505191438.6450770108@cvs1.fedora.phx.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/preupgrade/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23290/F-11 Modified Files: .cvsignore preupgrade.spec sources Log Message: 1.1.0pre3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-11/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 22 Apr 2009 23:40:39 -0000 1.7 +++ .cvsignore 5 May 2009 19:14:08 -0000 1.8 @@ -1 +1 @@ -preupgrade-1.1.0pre2.tar.bz2 +preupgrade-1.1.0pre3.tar.bz2 Index: preupgrade.spec =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-11/preupgrade.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- preupgrade.spec 22 Apr 2009 23:40:39 -0000 1.14 +++ preupgrade.spec 5 May 2009 19:14:08 -0000 1.15 @@ -2,11 +2,11 @@ Summary: Prepares a system for an upgrade Name: preupgrade Version: 1.1.0 -Release: 0.pre2%{?dist} +Release: 0.pre3%{?dist} License: GPLv2+ Group: System Environment/Base #Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz -Source: preupgrade-1.1.0pre2.tar.bz2 +Source: preupgrade-1.1.0pre3.tar.bz2 Source1: http://mirrors.fedoraproject.org/releases.txt URL: https://fedorahosted.org/preupgrade/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,7 +43,7 @@ by examining your system, downloading al and then setting up your system to perform the upgrade after rebooting. %prep -%setup -q -n preupgrade-1.1.0pre2 +%setup -q -n preupgrade-1.1.0pre3 %build # no op @@ -76,6 +76,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/%{name} %changelog +* Tue May 5 2009 Will Woods - 1.1.0-0.pre3 +- Drop support for /boot on RAID +- Properly enable both main and install repos +- Fix cleanup of interrupted runs +- Require VNC password to be >= 6 chars long, like anaconda (bug #498843) + * Wed Apr 22 2009 Will Woods - 1.1.0-0.pre2 - Disable bootloader installation (bug 496952) - Fix handling of releases.txt to accept Rawhide again Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-11/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 22 Apr 2009 23:40:39 -0000 1.10 +++ sources 5 May 2009 19:14:08 -0000 1.11 @@ -1 +1 @@ -5130c63fc6dd3b2dd39892ec1f2f3b39 preupgrade-1.1.0pre2.tar.bz2 +e414a72593d249e49bbacdd73fca7f98 preupgrade-1.1.0pre3.tar.bz2 From wwoods at fedoraproject.org Tue May 5 19:14:38 2009 From: wwoods at fedoraproject.org (Will Woods) Date: Tue, 5 May 2009 19:14:38 +0000 (UTC) Subject: rpms/preupgrade/F-10 .cvsignore, 1.7, 1.8 preupgrade.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <20090505191438.05A1970108@cvs1.fedora.phx.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/preupgrade/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23290/F-10 Modified Files: .cvsignore preupgrade.spec sources Log Message: 1.1.0pre3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-10/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 22 Apr 2009 23:35:54 -0000 1.7 +++ .cvsignore 5 May 2009 19:14:07 -0000 1.8 @@ -1 +1 @@ -preupgrade-1.1.0pre2.tar.bz2 +preupgrade-1.1.0pre3.tar.bz2 Index: preupgrade.spec =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-10/preupgrade.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- preupgrade.spec 22 Apr 2009 23:35:54 -0000 1.12 +++ preupgrade.spec 5 May 2009 19:14:07 -0000 1.13 @@ -2,11 +2,11 @@ Summary: Prepares a system for an upgrade Name: preupgrade Version: 1.1.0 -Release: 0.pre2%{?dist} +Release: 0.pre3%{?dist} License: GPLv2+ Group: System Environment/Base #Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz -Source: preupgrade-1.1.0pre2.tar.bz2 +Source: preupgrade-1.1.0pre3.tar.bz2 Source1: http://mirrors.fedoraproject.org/releases.txt URL: https://fedorahosted.org/preupgrade/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,7 +43,7 @@ by examining your system, downloading al and then setting up your system to perform the upgrade after rebooting. %prep -%setup -q -n preupgrade-1.1.0pre2 +%setup -q -n preupgrade-1.1.0pre3 %build # no op @@ -76,6 +76,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/%{name} %changelog +* Tue May 5 2009 Will Woods - 1.1.0-0.pre3 +- Drop support for /boot on RAID +- Properly enable both main and install repos +- Fix cleanup of interrupted runs +- Require VNC password to be >= 6 chars long, like anaconda (bug #498843) + * Wed Apr 22 2009 Will Woods - 1.1.0-0.pre2 - Disable bootloader installation (bug 496952) - Fix handling of releases.txt to accept Rawhide again Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-10/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 22 Apr 2009 23:35:54 -0000 1.10 +++ sources 5 May 2009 19:14:07 -0000 1.11 @@ -1 +1 @@ -5130c63fc6dd3b2dd39892ec1f2f3b39 preupgrade-1.1.0pre2.tar.bz2 +e414a72593d249e49bbacdd73fca7f98 preupgrade-1.1.0pre3.tar.bz2 From wwoods at fedoraproject.org Tue May 5 19:14:38 2009 From: wwoods at fedoraproject.org (Will Woods) Date: Tue, 5 May 2009 19:14:38 +0000 (UTC) Subject: rpms/preupgrade/F-9 .cvsignore, 1.6, 1.7 preupgrade.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <20090505191438.A70AB70108@cvs1.fedora.phx.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/preupgrade/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23290/F-9 Modified Files: .cvsignore preupgrade.spec sources Log Message: 1.1.0pre3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 22 Apr 2009 23:30:16 -0000 1.6 +++ .cvsignore 5 May 2009 19:14:08 -0000 1.7 @@ -1 +1 @@ -preupgrade-1.1.0pre2.tar.bz2 +preupgrade-1.1.0pre3.tar.bz2 Index: preupgrade.spec =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-9/preupgrade.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- preupgrade.spec 22 Apr 2009 23:30:17 -0000 1.13 +++ preupgrade.spec 5 May 2009 19:14:08 -0000 1.14 @@ -2,11 +2,11 @@ Summary: Prepares a system for an upgrade Name: preupgrade Version: 1.1.0 -Release: 0.pre2%{?dist} +Release: 0.pre3%{?dist} License: GPLv2+ Group: System Environment/Base #Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz -Source: preupgrade-1.1.0pre2.tar.bz2 +Source: preupgrade-1.1.0pre3.tar.bz2 Source1: http://mirrors.fedoraproject.org/releases.txt URL: https://fedorahosted.org/preupgrade/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,7 +43,7 @@ by examining your system, downloading al and then setting up your system to perform the upgrade after rebooting. %prep -%setup -q -n preupgrade-1.1.0pre2 +%setup -q -n preupgrade-1.1.0pre3 %build # no op @@ -76,6 +76,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/%{name} %changelog +* Tue May 5 2009 Will Woods - 1.1.0-0.pre3 +- Drop support for /boot on RAID +- Properly enable both main and install repos +- Fix cleanup of interrupted runs +- Require VNC password to be >= 6 chars long, like anaconda (bug #498843) + * Wed Apr 22 2009 Will Woods - 1.1.0-0.pre2 - Disable bootloader installation (bug 496952) - Fix handling of releases.txt to accept Rawhide again Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 22 Apr 2009 23:30:17 -0000 1.10 +++ sources 5 May 2009 19:14:08 -0000 1.11 @@ -1 +1 @@ -5130c63fc6dd3b2dd39892ec1f2f3b39 preupgrade-1.1.0pre2.tar.bz2 +e414a72593d249e49bbacdd73fca7f98 preupgrade-1.1.0pre3.tar.bz2 From wwoods at fedoraproject.org Tue May 5 19:14:38 2009 From: wwoods at fedoraproject.org (Will Woods) Date: Tue, 5 May 2009 19:14:38 +0000 (UTC) Subject: rpms/preupgrade/devel .cvsignore, 1.6, 1.7 preupgrade.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <20090505191438.E9E5E70108@cvs1.fedora.phx.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/preupgrade/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23290/devel Modified Files: .cvsignore preupgrade.spec sources Log Message: 1.1.0pre3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 22 Apr 2009 23:47:00 -0000 1.6 +++ .cvsignore 5 May 2009 19:14:08 -0000 1.7 @@ -1 +1 @@ -preupgrade-1.1.0pre2.tar.bz2 +preupgrade-1.1.0pre3.tar.bz2 Index: preupgrade.spec =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/devel/preupgrade.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- preupgrade.spec 22 Apr 2009 23:47:00 -0000 1.13 +++ preupgrade.spec 5 May 2009 19:14:08 -0000 1.14 @@ -2,11 +2,11 @@ Summary: Prepares a system for an upgrade Name: preupgrade Version: 1.1.0 -Release: 0.pre2%{?dist} +Release: 0.pre3%{?dist} License: GPLv2+ Group: System Environment/Base #Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz -Source: preupgrade-1.1.0pre2.tar.bz2 +Source: preupgrade-1.1.0pre3.tar.bz2 Source1: http://mirrors.fedoraproject.org/releases.txt URL: https://fedorahosted.org/preupgrade/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,7 +43,7 @@ by examining your system, downloading al and then setting up your system to perform the upgrade after rebooting. %prep -%setup -q -n preupgrade-1.1.0pre2 +%setup -q -n preupgrade-1.1.0pre3 %build # no op @@ -76,6 +76,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/%{name} %changelog +* Tue May 5 2009 Will Woods - 1.1.0-0.pre3 +- Drop support for /boot on RAID +- Properly enable both main and install repos +- Fix cleanup of interrupted runs +- Require VNC password to be >= 6 chars long, like anaconda (bug #498843) + * Wed Apr 22 2009 Will Woods - 1.1.0-0.pre2 - Disable bootloader installation (bug 496952) - Fix handling of releases.txt to accept Rawhide again Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preupgrade/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 22 Apr 2009 23:47:00 -0000 1.9 +++ sources 5 May 2009 19:14:08 -0000 1.10 @@ -1 +1 @@ -5130c63fc6dd3b2dd39892ec1f2f3b39 preupgrade-1.1.0pre2.tar.bz2 +e414a72593d249e49bbacdd73fca7f98 preupgrade-1.1.0pre3.tar.bz2 From denisarnaud at fedoraproject.org Tue May 5 19:22:06 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 19:22:06 +0000 (UTC) Subject: rpms/soci/F-11 import.log, 1.1, 1.2 soci-3.0.0-fix-gcc43-compatibility.patch, 1.1, 1.2 soci.spec, 1.1, 1.2 Message-ID: <20090505192207.0767B70108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22749/F-11 Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-7 - Added a missing cstdio header include for g++-4.4 compatibility Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 4 May 2009 22:08:22 -0000 1.1 +++ import.log 5 May 2009 19:21:36 -0000 1.2 @@ -1 +1,2 @@ soci-3_0_0-6_fc10:F-11:soci-3.0.0-6.fc10.src.rpm:1241474667 +soci-3_0_0-7_fc10:F-11:soci-3.0.0-7.fc10.src.rpm:1241550507 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci-3.0.0-fix-gcc43-compatibility.patch 4 May 2009 22:08:22 -0000 1.1 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 19:21:36 -0000 1.2 @@ -45,3 +45,14 @@ diff -u -r soci-3.0.0_ref/src/backends/m #ifdef _MSC_VER #pragma warning(disable:4355) +diff -ru soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp +--- soci-3.0.0/src/core/soci-simple.cpp 2008-07-01 09:42:25.000000000 +0200 ++++ soci-3.0.0_4-pack/src/core/soci-simple.cpp 2009-05-05 16:17:38.000000000 +0200 +@@ -9,6 +9,7 @@ + + #include "soci-simple.h" + #include "soci.h" ++#include + + using namespace soci; + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci.spec 4 May 2009 22:08:23 -0000 1.1 +++ soci.spec 5 May 2009 19:21:36 -0000 1.2 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The database access library for C++ programmers @@ -275,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-7 +- Added a missing cstdio header include for g++-4.4 compatibility + * Sat May 02 2009 Denis Arnaud 3.0.0-6 - Removed the unused build conditionals From athimm at fedoraproject.org Tue May 5 19:37:30 2009 From: athimm at fedoraproject.org (Axel Thimm) Date: Tue, 5 May 2009 19:37:30 +0000 (UTC) Subject: rpms/fedora-package-config-apt/F-11 fedora-devel.list, 1.1, 1.2 fedora-package-config-apt.spec, 1.11, 1.12 fedora-updates.list, 1.3, 1.4 fedora.list, 1.2, 1.3 Message-ID: <20090505193730.887D570108@cvs1.fedora.phx.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26029/fedora-package-config-apt/F-11 Modified Files: fedora-devel.list fedora-package-config-apt.spec fedora-updates.list fedora.list Log Message: Prepare for GA. Index: fedora-devel.list =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-11/fedora-devel.list,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- fedora-devel.list 16 Nov 2007 06:34:38 -0000 1.1 +++ fedora-devel.list 5 May 2009 19:37:00 -0000 1.2 @@ -1,5 +1,5 @@ # Fedora development -repomd http://download.fedora.redhat.com/pub/ fedora/linux/development/$(ARCH)/os/ +# repomd http://download.fedora.redhat.com/pub/ fedora/linux/development/$(ARCH)/os/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux//Everything/$(ARCH)/debug/ Index: fedora-package-config-apt.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-11/fedora-package-config-apt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- fedora-package-config-apt.spec 14 Apr 2009 07:41:49 -0000 1.11 +++ fedora-package-config-apt.spec 5 May 2009 19:37:00 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Fedora configuration files for the apt-rpm package manager Name: fedora-package-config-apt -Version: 10.92 -Release: 3 +Version: 11 +Release: 4 # Nothing in here has copyright, much less license attribution, however, # since this is "upstream", we'll take this statement as the author's intent, # and use GPL+ here (since no version is specified). @@ -65,6 +65,9 @@ rm -rf %{buildroot} %changelog +* Tue May 5 2009 Axel Thimm - 11-4 +- Update to F11. + * Tue Apr 14 2009 Axel Thimm - 10.92-3 - Fix URL and Description (RH bug #484096). Index: fedora-updates.list =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-11/fedora-updates.list,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- fedora-updates.list 16 Nov 2007 06:34:38 -0000 1.3 +++ fedora-updates.list 5 May 2009 19:37:00 -0000 1.4 @@ -1,5 +1,5 @@ # Fedora -#repomd http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/$(ARCH)/ +repomd http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/$(ARCH)/ # Debug packages #repomd http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/$(ARCH)/debug/ Index: fedora.list =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-11/fedora.list,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- fedora.list 16 Nov 2007 06:34:38 -0000 1.2 +++ fedora.list 5 May 2009 19:37:00 -0000 1.3 @@ -1,5 +1,5 @@ # Fedora -#repomd http://download.fedora.redhat.com/pub/ fedora/linux/releases/$(VERSION)/Everything/$(ARCH)/os/ +repomd http://download.fedora.redhat.com/pub/ fedora/linux/releases/$(VERSION)/Everything/$(ARCH)/os/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/releases/$(VERSION)/Everything/$(ARCH)/debug/ From athimm at fedoraproject.org Tue May 5 19:37:30 2009 From: athimm at fedoraproject.org (Axel Thimm) Date: Tue, 5 May 2009 19:37:30 +0000 (UTC) Subject: rpms/fedora-package-config-smart/F-11 fedora-package-config-smart.spec, 1.13, 1.14 Message-ID: <20090505193730.A197770108@cvs1.fedora.phx.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26029/fedora-package-config-smart/F-11 Modified Files: fedora-package-config-smart.spec Log Message: Prepare for GA. Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-11/fedora-package-config-smart.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- fedora-package-config-smart.spec 14 Apr 2009 08:45:02 -0000 1.13 +++ fedora-package-config-smart.spec 5 May 2009 19:37:00 -0000 1.14 @@ -1,11 +1,11 @@ %global debug_package %{nil} # Set to 1 to use rawhide repos. -%global rawhide 1 +%global rawhide 0 Summary: Fedora configuration files for the Smart package manager Name: fedora-package-config-smart -Version: 10.92 -Release: 16 +Version: 11 +Release: 17 License: GPL+ Group: System Environment/Base URL: http://fedoraproject.org/ @@ -51,12 +51,12 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/smart/channels/*.channel %changelog +* Tue May 5 2009 Axel Thimm - 11-17 +- Switch to stable release. + * Tue Apr 14 2009 Axel Thimm - 10.92-16 - Use %%_arch instead of %%_target_cpu. -* Tue Feb 24 2009 Fedora Release Engineering - 9.89-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - * Sat Mar 22 2008 Axel Thimm - 8.92-11 - Create common source tarball. From dwalsh at fedoraproject.org Tue May 5 19:51:10 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 5 May 2009 19:51:10 +0000 (UTC) Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.417,1.418 Message-ID: <20090505195110.CC88370108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28287 Modified Files: policycoreutils-rhat.patch Log Message: * Wed Apr 22 2009 Dan Walsh 2.0.62-14 - Fix audit2allow -a to retun /var/log/messages policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.417 retrieving revision 1.418 diff -u -p -r1.417 -r1.418 --- policycoreutils-rhat.patch 5 May 2009 18:51:52 -0000 1.417 +++ policycoreutils-rhat.patch 5 May 2009 19:50:40 -0000 1.418 @@ -20,7 +20,7 @@ diff --exclude-from=exclude --exclude=se diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.62/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 2009-02-18 16:44:47.000000000 -0500 -+++ policycoreutils-2.0.62/restorecond/Makefile 2009-05-04 13:40:26.000000000 -0400 ++++ policycoreutils-2.0.62/restorecond/Makefile 2009-05-05 15:49:19.000000000 -0400 @@ -2,16 +2,21 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(PREFIX)/sbin @@ -35,7 +35,7 @@ diff --exclude-from=exclude --exclude=se CFLAGS ?= -g -Werror -Wall -W -override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 -LDLIBS += -lselinux -L$(PREFIX)/lib -+override CFLAGS += -I$(PREFIX)/include -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -D_FILE_OFFSET_BITS=64 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include ++override CFLAGS += -I$(PREFIX)/include -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include -D_FILE_OFFSET_BITS=64 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include + +LDLIBS += -lselinux -ldbus-glib-1 -lglib-2.0 -L$(PREFIX)/lib From pkgdb at fedoraproject.org Tue May 5 20:43:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:43:00 +0000 Subject: [pkgdb] kdegraphics had acl change status Message-ID: <20090505204301.486FF10F893@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdegraphics (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics From pkgdb at fedoraproject.org Tue May 5 20:43:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:43:02 +0000 Subject: [pkgdb] kdegraphics had acl change status Message-ID: <20090505204303.0653510F89E@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdegraphics (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics From pkgdb at fedoraproject.org Tue May 5 20:43:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:43:04 +0000 Subject: [pkgdb] kdegraphics had acl change status Message-ID: <20090505204304.8588910F8A2@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdegraphics (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics From pkgdb at fedoraproject.org Tue May 5 20:43:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:43:49 +0000 Subject: [pkgdb] kdenetwork had acl change status Message-ID: <20090505204349.9E69E10F89F@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdenetwork (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 20:43:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:43:50 +0000 Subject: [pkgdb] kdenetwork had acl change status Message-ID: <20090505204350.3056F10F8A3@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdenetwork (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 20:43:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:43:52 +0000 Subject: [pkgdb] kdenetwork had acl change status Message-ID: <20090505204352.9B52310F8A6@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdenetwork (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 20:43:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:43:58 +0000 Subject: [pkgdb] kdenetwork had acl change status Message-ID: <20090505204358.5B58610F89D@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdenetwork (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 20:44:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:44:00 +0000 Subject: [pkgdb] kdenetwork had acl change status Message-ID: <20090505204401.1879910F8A8@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdenetwork (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 20:44:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:44:01 +0000 Subject: [pkgdb] kdenetwork had acl change status Message-ID: <20090505204401.6D59210F8AB@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdenetwork (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork From pkgdb at fedoraproject.org Tue May 5 20:44:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:44:37 +0000 Subject: [pkgdb] kdemultimedia had acl change status Message-ID: <20090505204437.D4A1210F89E@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdemultimedia (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From pkgdb at fedoraproject.org Tue May 5 20:44:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:44:40 +0000 Subject: [pkgdb] kdemultimedia had acl change status Message-ID: <20090505204440.4A8DD10F8A1@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdemultimedia (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From pkgdb at fedoraproject.org Tue May 5 20:44:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:44:41 +0000 Subject: [pkgdb] kdemultimedia had acl change status Message-ID: <20090505204441.5E21110F8A5@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdemultimedia (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From pkgdb at fedoraproject.org Tue May 5 20:44:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:44:45 +0000 Subject: [pkgdb] kdemultimedia had acl change status Message-ID: <20090505204445.76B5110F8AB@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdemultimedia (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From pkgdb at fedoraproject.org Tue May 5 20:44:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:44:43 +0000 Subject: [pkgdb] kdemultimedia had acl change status Message-ID: <20090505204443.8B8EA10F8A9@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdemultimedia (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From pkgdb at fedoraproject.org Tue May 5 20:44:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 20:44:47 +0000 Subject: [pkgdb] kdemultimedia had acl change status Message-ID: <20090505204447.56A8410F8AF@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdemultimedia (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia From oget at fedoraproject.org Tue May 5 20:45:19 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Tue, 5 May 2009 20:45:19 +0000 (UTC) Subject: rpms/slv2/F-11 .cvsignore, 1.2, 1.3 slv2.spec, 1.2, 1.3 sources, 1.2, 1.3 slv2_plugininstance.h_r1948.diff, 1.1, NONE Message-ID: <20090505204519.6E89270108@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/slv2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2123 Modified Files: .cvsignore slv2.spec sources Removed Files: slv2_plugininstance.h_r1948.diff Log Message: * Tue May 05 2009 Orcan Ogetbil - 0.6.4-1 - Version update: 0.6.4 - Drop plugininstance patch (upstreamed) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/slv2/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Mar 2009 22:09:09 -0000 1.2 +++ .cvsignore 5 May 2009 20:44:48 -0000 1.3 @@ -1 +1 @@ -slv2-0.6.2.tar.bz2 +slv2-0.6.4.tar.bz2 Index: slv2.spec =================================================================== RCS file: /cvs/pkgs/rpms/slv2/F-11/slv2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- slv2.spec 8 Apr 2009 20:23:54 -0000 1.2 +++ slv2.spec 5 May 2009 20:44:48 -0000 1.3 @@ -1,14 +1,10 @@ Name: slv2 Summary: LV2 host library -Version: 0.6.2 -Release: 3%{?dist} +Version: 0.6.4 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries Source0: http://download.drobilla.net/%{name}-%{version}.tar.bz2 -# Some plugins fail (NULL is undefined) to compile without this patch. -# Imported from the upstream trunk: -# http://dev.drobilla.net/changeset/1948/trunk/slv2/slv2/plugininstance.h -Patch0: slv2_plugininstance.h_r1948.diff URL: http://drobilla.net/software/slv2/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,7 +43,6 @@ This package contains the headers and de %prep %setup -q -%patch0 -p2 -b .add_stdlib.h # Fix possible multilib issues sed -i 's|/lib/|/%{_lib}/|g' src/world.c @@ -82,6 +77,7 @@ rm -rf %{buildroot} %doc AUTHORS ChangeLog COPYING README %{_bindir}/lv2* %{_libdir}/lib%{name}.so.* +%{_mandir}/man1/* %files devel %defattr(-,root,root,-) @@ -92,6 +88,10 @@ rm -rf %{buildroot} %{_mandir}/man3/%{name}* %changelog +* Tue May 05 2009 Orcan Ogetbil - 0.6.4-1 +- Version update: 0.6.4 +- Drop plugininstance patch (upstreamed) + * Wed Apr 08 2009 Orcan Ogetbil - 0.6.2-3 - Change CCFLAGS to CFLAGS Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slv2/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Mar 2009 22:09:09 -0000 1.2 +++ sources 5 May 2009 20:44:49 -0000 1.3 @@ -1 +1 @@ -4e8bb5f5e96d0edea988018b6297cf99 slv2-0.6.2.tar.bz2 +2ccd51eb58b5c75128643f9b85507943 slv2-0.6.4.tar.bz2 --- slv2_plugininstance.h_r1948.diff DELETED --- From dwalsh at fedoraproject.org Tue May 5 20:48:33 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 5 May 2009 20:48:33 +0000 (UTC) Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.113, 1.114 selinux-policy.spec, 1.851, 1.852 Message-ID: <20090505204833.E2FE570108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2458 Modified Files: policy-20090105.patch selinux-policy.spec Log Message: * Tue May 5 2009 Dan Walsh 3.6.12-29 - Allow svirt to manage pci and other sysfs device data policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v retrieving revision 1.113 retrieving revision 1.114 diff -u -p -r1.113 -r1.114 --- policy-20090105.patch 4 May 2009 18:20:20 -0000 1.113 +++ policy-20090105.patch 5 May 2009 20:48:32 -0000 1.114 @@ -4897,7 +4897,7 @@ diff -b -B --ignore-all-space --exclude- +corecmd_executable_file(wm_exec_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2009-03-05 10:34:00.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc 2009-04-30 08:31:43.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc 2009-05-05 14:05:47.000000000 -0400 @@ -32,6 +32,8 @@ # # /etc @@ -4907,16 +4907,18 @@ diff -b -B --ignore-all-space --exclude- /etc/apcupsd/apccontrol -- gen_context(system_u:object_r:bin_t,s0) /etc/apcupsd/changeme -- gen_context(system_u:object_r:bin_t,s0) /etc/apcupsd/commfailure -- gen_context(system_u:object_r:bin_t,s0) -@@ -134,6 +136,8 @@ +@@ -134,6 +136,10 @@ /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0) ') +/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) ++/opt/OpenPrinting-Gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) ++/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) + # # /usr # -@@ -210,6 +214,7 @@ +@@ -210,6 +216,7 @@ /usr/share/Modules/init(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/share/printconf/util/print\.py -- gen_context(system_u:object_r:bin_t,s0) /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0) @@ -4924,7 +4926,7 @@ diff -b -B --ignore-all-space --exclude- /usr/share/turboprint/lib(/.*)? -- gen_context(system_u:object_r:bin_t,s0) /usr/X11R6/lib(64)?/X11/xkb/xkbcomp -- gen_context(system_u:object_r:bin_t,s0) -@@ -299,3 +304,20 @@ +@@ -299,3 +306,20 @@ ifdef(`distro_suse',` /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) ') @@ -5157,7 +5159,7 @@ diff -b -B --ignore-all-space --exclude- /dev/usb.+ -c gen_context(system_u:object_r:usb_device_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.12/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2009-03-05 12:28:56.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/devices.if 2009-04-28 15:25:49.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/devices.if 2009-05-05 16:42:47.000000000 -0400 @@ -2268,6 +2268,25 @@ ######################################## @@ -11482,7 +11484,7 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.12/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/cups.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/cups.te 2009-05-05 14:06:36.000000000 -0400 @@ -20,9 +20,18 @@ type cupsd_etc_t; files_config_file(cupsd_etc_t) @@ -11660,7 +11662,7 @@ diff -b -B --ignore-all-space --exclude- files_list_world_readable(cupsd_t) files_read_world_readable_files(cupsd_t) files_read_world_readable_symlinks(cupsd_t) -@@ -195,15 +240,16 @@ +@@ -195,19 +240,21 @@ files_read_var_symlinks(cupsd_t) # for /etc/printcap files_dontaudit_write_etc_files(cupsd_t) @@ -11681,7 +11683,12 @@ diff -b -B --ignore-all-space --exclude- auth_use_nsswitch(cupsd_t) # Read /usr/lib/gconv/gconv-modules.* and /usr/lib/python2.2/.* -@@ -217,17 +263,21 @@ + libs_read_lib_files(cupsd_t) ++libs_exec_lib_files(cupsd_t) + + logging_send_audit_msgs(cupsd_t) + logging_send_syslog_msg(cupsd_t) +@@ -217,17 +264,21 @@ miscfiles_read_fonts(cupsd_t) seutil_read_config(cupsd_t) @@ -11706,7 +11713,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -244,8 +294,16 @@ +@@ -244,8 +295,16 @@ userdom_dbus_send_all_users(cupsd_t) optional_policy(` @@ -11723,7 +11730,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -261,6 +319,10 @@ +@@ -261,6 +320,10 @@ ') optional_policy(` @@ -11734,7 +11741,7 @@ diff -b -B --ignore-all-space --exclude- # cups execs smbtool which reads samba_etc_t files samba_read_config(cupsd_t) samba_rw_var_files(cupsd_t) -@@ -279,7 +341,7 @@ +@@ -279,7 +342,7 @@ # Cups configuration daemon local policy # @@ -11743,7 +11750,7 @@ diff -b -B --ignore-all-space --exclude- dontaudit cupsd_config_t self:capability sys_tty_config; allow cupsd_config_t self:process signal_perms; allow cupsd_config_t self:fifo_file rw_fifo_file_perms; -@@ -302,8 +364,10 @@ +@@ -302,8 +365,10 @@ allow cupsd_config_t cupsd_log_t:file rw_file_perms; @@ -11756,7 +11763,7 @@ diff -b -B --ignore-all-space --exclude- allow cupsd_config_t cupsd_var_run_t:file read_file_perms; -@@ -311,7 +375,7 @@ +@@ -311,7 +376,7 @@ files_pid_filetrans(cupsd_config_t, cupsd_config_var_run_t, file) kernel_read_system_state(cupsd_config_t) @@ -11765,7 +11772,7 @@ diff -b -B --ignore-all-space --exclude- corenet_all_recvfrom_unlabeled(cupsd_config_t) corenet_all_recvfrom_netlabel(cupsd_config_t) -@@ -324,6 +388,7 @@ +@@ -324,6 +389,7 @@ dev_read_sysfs(cupsd_config_t) dev_read_urand(cupsd_config_t) dev_read_rand(cupsd_config_t) @@ -11773,7 +11780,7 @@ diff -b -B --ignore-all-space --exclude- fs_getattr_all_fs(cupsd_config_t) fs_search_auto_mountpoints(cupsd_config_t) -@@ -341,13 +406,14 @@ +@@ -341,13 +407,14 @@ files_read_var_symlinks(cupsd_config_t) # Alternatives asks for this @@ -11789,7 +11796,7 @@ diff -b -B --ignore-all-space --exclude- seutil_dontaudit_search_config(cupsd_config_t) -@@ -359,14 +425,16 @@ +@@ -359,14 +426,16 @@ lpd_read_config(cupsd_config_t) ifdef(`distro_redhat',` @@ -11808,7 +11815,7 @@ diff -b -B --ignore-all-space --exclude- cron_system_entry(cupsd_config_t, cupsd_config_exec_t) ') -@@ -382,6 +450,7 @@ +@@ -382,6 +451,7 @@ optional_policy(` hal_domtrans(cupsd_config_t) hal_read_tmp_files(cupsd_config_t) @@ -11816,7 +11823,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -491,7 +560,10 @@ +@@ -491,7 +561,10 @@ allow hplip_t self:udp_socket create_socket_perms; allow hplip_t self:rawip_socket create_socket_perms; @@ -11828,7 +11835,7 @@ diff -b -B --ignore-all-space --exclude- cups_stream_connect(hplip_t) -@@ -500,6 +572,13 @@ +@@ -500,6 +573,13 @@ read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t) files_search_etc(hplip_t) @@ -11842,7 +11849,7 @@ diff -b -B --ignore-all-space --exclude- manage_files_pattern(hplip_t, hplip_var_run_t, hplip_var_run_t) files_pid_filetrans(hplip_t, hplip_var_run_t, file) -@@ -529,7 +608,8 @@ +@@ -529,7 +609,8 @@ dev_read_urand(hplip_t) dev_read_rand(hplip_t) dev_rw_generic_usb_dev(hplip_t) @@ -11852,7 +11859,7 @@ diff -b -B --ignore-all-space --exclude- fs_getattr_all_fs(hplip_t) fs_search_auto_mountpoints(hplip_t) -@@ -553,7 +633,9 @@ +@@ -553,7 +634,9 @@ userdom_dontaudit_search_user_home_dirs(hplip_t) userdom_dontaudit_search_user_home_content(hplip_t) @@ -11863,7 +11870,7 @@ diff -b -B --ignore-all-space --exclude- optional_policy(` dbus_system_bus_client(hplip_t) -@@ -635,3 +717,49 @@ +@@ -635,3 +718,49 @@ optional_policy(` udev_read_db(ptal_t) ') @@ -13478,6 +13485,17 @@ diff -b -B --ignore-all-space --exclude- # pid file manage_dirs_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t) manage_sock_files_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.6.12/policy/modules/services/fetchmail.te +--- nsaserefpolicy/policy/modules/services/fetchmail.te 2009-01-19 11:06:49.000000000 -0500 ++++ serefpolicy-3.6.12/policy/modules/services/fetchmail.te 2009-05-04 15:58:59.000000000 -0400 +@@ -9,6 +9,7 @@ + type fetchmail_t; + type fetchmail_exec_t; + init_daemon_domain(fetchmail_t, fetchmail_exec_t) ++application_executable_file(fetchmail_exec_t) + + type fetchmail_var_run_t; + files_pid_file(fetchmail_var_run_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.fc serefpolicy-3.6.12/policy/modules/services/fprintd.fc --- nsaserefpolicy/policy/modules/services/fprintd.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/services/fprintd.fc 2009-04-28 15:26:41.000000000 -0400 @@ -24168,8 +24186,8 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te --- nsaserefpolicy/policy/modules/services/virt.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/virt.te 2009-04-30 18:07:51.000000000 -0400 -@@ -8,19 +8,24 @@ ++++ serefpolicy-3.6.12/policy/modules/services/virt.te 2009-05-05 16:45:39.000000000 -0400 +@@ -8,19 +8,31 @@ ## ##

@@ -24190,14 +24208,21 @@ diff -b -B --ignore-all-space --exclude- -attribute virt_image_type; +## +##

-+## Allow svirt to user serial/parallell communication ports ++## Allow svirt to manage device configuration, (pci) ++##

++## ++gen_tunable(virt_manage_sysfs, false) ++ ++## ++##

++## Allow svirt to use serial/parallell communication ports +##

+## +gen_tunable(virt_use_comm, false) type virt_etc_t; files_config_file(virt_etc_t) -@@ -29,8 +34,13 @@ +@@ -29,8 +41,13 @@ files_type(virt_etc_rw_t) # virt Image files @@ -24213,7 +24238,7 @@ diff -b -B --ignore-all-space --exclude- type virt_log_t; logging_log_file(virt_log_t) -@@ -48,17 +58,39 @@ +@@ -48,17 +65,39 @@ type virtd_initrc_exec_t; init_script_file(virtd_initrc_exec_t) @@ -24255,7 +24280,7 @@ diff -b -B --ignore-all-space --exclude- read_files_pattern(virtd_t, virt_etc_t, virt_etc_t) read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t) -@@ -67,7 +99,11 @@ +@@ -67,7 +106,11 @@ manage_lnk_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t) filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir) @@ -24268,7 +24293,7 @@ diff -b -B --ignore-all-space --exclude- manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t) manage_files_pattern(virtd_t, virt_log_t, virt_log_t) -@@ -86,6 +122,7 @@ +@@ -86,6 +129,7 @@ kernel_read_network_state(virtd_t) kernel_rw_net_sysctls(virtd_t) kernel_load_module(virtd_t) @@ -24276,7 +24301,7 @@ diff -b -B --ignore-all-space --exclude- corecmd_exec_bin(virtd_t) corecmd_exec_shell(virtd_t) -@@ -96,7 +133,7 @@ +@@ -96,7 +140,7 @@ corenet_tcp_sendrecv_generic_node(virtd_t) corenet_tcp_sendrecv_all_ports(virtd_t) corenet_tcp_bind_generic_node(virtd_t) @@ -24285,7 +24310,7 @@ diff -b -B --ignore-all-space --exclude- corenet_tcp_bind_vnc_port(virtd_t) corenet_tcp_connect_vnc_port(virtd_t) corenet_tcp_connect_soundd_port(virtd_t) -@@ -104,21 +141,39 @@ +@@ -104,21 +148,39 @@ dev_read_sysfs(virtd_t) dev_read_rand(virtd_t) @@ -24326,7 +24351,7 @@ diff -b -B --ignore-all-space --exclude- term_getattr_pty_fs(virtd_t) term_use_ptmx(virtd_t) -@@ -129,6 +184,13 @@ +@@ -129,6 +191,13 @@ logging_send_syslog_msg(virtd_t) @@ -24340,7 +24365,7 @@ diff -b -B --ignore-all-space --exclude- userdom_read_all_users_state(virtd_t) tunable_policy(`virt_use_nfs',` -@@ -167,22 +229,34 @@ +@@ -167,22 +236,34 @@ dnsmasq_domtrans(virtd_t) dnsmasq_signal(virtd_t) dnsmasq_kill(virtd_t) @@ -24363,15 +24388,15 @@ diff -b -B --ignore-all-space --exclude- +optional_policy(` + lvm_domtrans(virtd_t) +') - - optional_policy(` -- qemu_domtrans(virtd_t) ++ ++optional_policy(` + polkit_domtrans_auth(virtd_t) + polkit_domtrans_resolve(virtd_t) + polkit_read_lib(virtd_t) +') -+ -+optional_policy(` + + optional_policy(` +- qemu_domtrans(virtd_t) + qemu_spec_domtrans(virtd_t, svirt_t) qemu_read_state(virtd_t) qemu_signal(virtd_t) @@ -24380,7 +24405,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -195,8 +269,84 @@ +@@ -195,8 +276,88 @@ xen_stream_connect(virtd_t) xen_stream_connect_xenstore(virtd_t) @@ -24444,6 +24469,10 @@ diff -b -B --ignore-all-space --exclude- + dev_rw_printer(svirt_t) +') + ++tunable_policy(`virt_manage_sysfs',` ++ dev_rw_sysfs(svirt_t) ++') ++ +tunable_policy(`virt_use_nfs',` + fs_manage_nfs_dirs(svirt_t) + fs_manage_nfs_files(svirt_t) @@ -32373,7 +32402,7 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.12/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/userdomain.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/userdomain.te 2009-05-05 08:21:50.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -32433,7 +32462,7 @@ diff -b -B --ignore-all-space --exclude- userdom_user_home_content(user_home_t) fs_associate_tmpfs(user_home_t) files_associate_tmp(user_home_t) -@@ -95,3 +91,23 @@ +@@ -95,3 +91,25 @@ type user_tty_device_t alias { staff_tty_device_t sysadm_tty_device_t secadm_tty_device_t auditadm_tty_device_t unconfined_tty_device_t }; dev_node(user_tty_device_t) ubac_constrained(user_tty_device_t) @@ -32457,6 +32486,8 @@ diff -b -B --ignore-all-space --exclude- + fs_read_cifs_named_sockets(userhomereader) + fs_read_cifs_named_pipes(userhomereader) +') ++ ++allow userdomain userdomain:process signull; diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.12/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/system/virtual.fc 2009-04-23 09:44:57.000000000 -0400 @@ -32783,7 +32814,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.12/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/xen.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/xen.te 2009-05-05 14:42:25.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -32970,7 +33001,7 @@ diff -b -B --ignore-all-space --exclude- kernel_write_xen_state(xenstored_t) kernel_read_xen_state(xenstored_t) -@@ -312,18 +358,21 @@ +@@ -312,24 +358,28 @@ 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) @@ -32993,7 +33024,14 @@ diff -b -B --ignore-all-space --exclude- corenet_tcp_sendrecv_generic_if(xm_t) corenet_tcp_sendrecv_generic_node(xm_t) -@@ -339,15 +388,58 @@ + corenet_tcp_connect_soundd_port(xm_t) + + dev_read_urand(xm_t) ++dev_search_sysfs(xm_t) + + files_read_etc_runtime_files(xm_t) + files_read_usr_files(xm_t) +@@ -339,15 +389,58 @@ storage_raw_read_fixed_disk(xm_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v retrieving revision 1.851 retrieving revision 1.852 diff -u -p -r1.851 -r1.852 --- selinux-policy.spec 4 May 2009 19:36:29 -0000 1.851 +++ selinux-policy.spec 5 May 2009 20:48:33 -0000 1.852 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.12 -Release: 28%{?dist} +Release: 29%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -477,6 +477,9 @@ exit 0 %endif %changelog +* Tue May 5 2009 Dan Walsh 3.6.12-29 +- Allow svirt to manage pci and other sysfs device data + * Mon May 4 2009 Dan Walsh 3.6.12-28 - Fix package selection handling From dwalsh at fedoraproject.org Tue May 5 20:48:40 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 5 May 2009 20:48:40 +0000 (UTC) Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.108, 1.109 selinux-policy.spec, 1.846, 1.847 Message-ID: <20090505204840.B6C8D70108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2488 Modified Files: policy-20090105.patch selinux-policy.spec Log Message: * Tue May 5 2009 Dan Walsh 3.6.12-29 - Allow svirt to manage pci and other sysfs device data policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.108 retrieving revision 1.109 diff -u -p -r1.108 -r1.109 --- policy-20090105.patch 4 May 2009 18:20:27 -0000 1.108 +++ policy-20090105.patch 5 May 2009 20:48:39 -0000 1.109 @@ -4897,7 +4897,7 @@ diff -b -B --ignore-all-space --exclude- +corecmd_executable_file(wm_exec_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2009-03-05 10:34:00.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc 2009-04-30 08:31:43.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc 2009-05-05 14:05:47.000000000 -0400 @@ -32,6 +32,8 @@ # # /etc @@ -4907,16 +4907,18 @@ diff -b -B --ignore-all-space --exclude- /etc/apcupsd/apccontrol -- gen_context(system_u:object_r:bin_t,s0) /etc/apcupsd/changeme -- gen_context(system_u:object_r:bin_t,s0) /etc/apcupsd/commfailure -- gen_context(system_u:object_r:bin_t,s0) -@@ -134,6 +136,8 @@ +@@ -134,6 +136,10 @@ /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0) ') +/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) ++/opt/OpenPrinting-Gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) ++/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) + # # /usr # -@@ -210,6 +214,7 @@ +@@ -210,6 +216,7 @@ /usr/share/Modules/init(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/share/printconf/util/print\.py -- gen_context(system_u:object_r:bin_t,s0) /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0) @@ -4924,7 +4926,7 @@ diff -b -B --ignore-all-space --exclude- /usr/share/turboprint/lib(/.*)? -- gen_context(system_u:object_r:bin_t,s0) /usr/X11R6/lib(64)?/X11/xkb/xkbcomp -- gen_context(system_u:object_r:bin_t,s0) -@@ -299,3 +304,20 @@ +@@ -299,3 +306,20 @@ ifdef(`distro_suse',` /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) ') @@ -5157,7 +5159,7 @@ diff -b -B --ignore-all-space --exclude- /dev/usb.+ -c gen_context(system_u:object_r:usb_device_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.12/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2009-03-05 12:28:56.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/devices.if 2009-04-28 15:25:49.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/devices.if 2009-05-05 16:42:47.000000000 -0400 @@ -2268,6 +2268,25 @@ ######################################## @@ -11482,7 +11484,7 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.12/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/cups.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/cups.te 2009-05-05 14:06:36.000000000 -0400 @@ -20,9 +20,18 @@ type cupsd_etc_t; files_config_file(cupsd_etc_t) @@ -11660,7 +11662,7 @@ diff -b -B --ignore-all-space --exclude- files_list_world_readable(cupsd_t) files_read_world_readable_files(cupsd_t) files_read_world_readable_symlinks(cupsd_t) -@@ -195,15 +240,16 @@ +@@ -195,19 +240,21 @@ files_read_var_symlinks(cupsd_t) # for /etc/printcap files_dontaudit_write_etc_files(cupsd_t) @@ -11681,7 +11683,12 @@ diff -b -B --ignore-all-space --exclude- auth_use_nsswitch(cupsd_t) # Read /usr/lib/gconv/gconv-modules.* and /usr/lib/python2.2/.* -@@ -217,17 +263,21 @@ + libs_read_lib_files(cupsd_t) ++libs_exec_lib_files(cupsd_t) + + logging_send_audit_msgs(cupsd_t) + logging_send_syslog_msg(cupsd_t) +@@ -217,17 +264,21 @@ miscfiles_read_fonts(cupsd_t) seutil_read_config(cupsd_t) @@ -11706,7 +11713,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -244,8 +294,16 @@ +@@ -244,8 +295,16 @@ userdom_dbus_send_all_users(cupsd_t) optional_policy(` @@ -11723,7 +11730,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -261,6 +319,10 @@ +@@ -261,6 +320,10 @@ ') optional_policy(` @@ -11734,7 +11741,7 @@ diff -b -B --ignore-all-space --exclude- # cups execs smbtool which reads samba_etc_t files samba_read_config(cupsd_t) samba_rw_var_files(cupsd_t) -@@ -279,7 +341,7 @@ +@@ -279,7 +342,7 @@ # Cups configuration daemon local policy # @@ -11743,7 +11750,7 @@ diff -b -B --ignore-all-space --exclude- dontaudit cupsd_config_t self:capability sys_tty_config; allow cupsd_config_t self:process signal_perms; allow cupsd_config_t self:fifo_file rw_fifo_file_perms; -@@ -302,8 +364,10 @@ +@@ -302,8 +365,10 @@ allow cupsd_config_t cupsd_log_t:file rw_file_perms; @@ -11756,7 +11763,7 @@ diff -b -B --ignore-all-space --exclude- allow cupsd_config_t cupsd_var_run_t:file read_file_perms; -@@ -311,7 +375,7 @@ +@@ -311,7 +376,7 @@ files_pid_filetrans(cupsd_config_t, cupsd_config_var_run_t, file) kernel_read_system_state(cupsd_config_t) @@ -11765,7 +11772,7 @@ diff -b -B --ignore-all-space --exclude- corenet_all_recvfrom_unlabeled(cupsd_config_t) corenet_all_recvfrom_netlabel(cupsd_config_t) -@@ -324,6 +388,7 @@ +@@ -324,6 +389,7 @@ dev_read_sysfs(cupsd_config_t) dev_read_urand(cupsd_config_t) dev_read_rand(cupsd_config_t) @@ -11773,7 +11780,7 @@ diff -b -B --ignore-all-space --exclude- fs_getattr_all_fs(cupsd_config_t) fs_search_auto_mountpoints(cupsd_config_t) -@@ -341,13 +406,14 @@ +@@ -341,13 +407,14 @@ files_read_var_symlinks(cupsd_config_t) # Alternatives asks for this @@ -11789,7 +11796,7 @@ diff -b -B --ignore-all-space --exclude- seutil_dontaudit_search_config(cupsd_config_t) -@@ -359,14 +425,16 @@ +@@ -359,14 +426,16 @@ lpd_read_config(cupsd_config_t) ifdef(`distro_redhat',` @@ -11808,7 +11815,7 @@ diff -b -B --ignore-all-space --exclude- cron_system_entry(cupsd_config_t, cupsd_config_exec_t) ') -@@ -382,6 +450,7 @@ +@@ -382,6 +451,7 @@ optional_policy(` hal_domtrans(cupsd_config_t) hal_read_tmp_files(cupsd_config_t) @@ -11816,7 +11823,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -491,7 +560,10 @@ +@@ -491,7 +561,10 @@ allow hplip_t self:udp_socket create_socket_perms; allow hplip_t self:rawip_socket create_socket_perms; @@ -11828,7 +11835,7 @@ diff -b -B --ignore-all-space --exclude- cups_stream_connect(hplip_t) -@@ -500,6 +572,13 @@ +@@ -500,6 +573,13 @@ read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t) files_search_etc(hplip_t) @@ -11842,7 +11849,7 @@ diff -b -B --ignore-all-space --exclude- manage_files_pattern(hplip_t, hplip_var_run_t, hplip_var_run_t) files_pid_filetrans(hplip_t, hplip_var_run_t, file) -@@ -529,7 +608,8 @@ +@@ -529,7 +609,8 @@ dev_read_urand(hplip_t) dev_read_rand(hplip_t) dev_rw_generic_usb_dev(hplip_t) @@ -11852,7 +11859,7 @@ diff -b -B --ignore-all-space --exclude- fs_getattr_all_fs(hplip_t) fs_search_auto_mountpoints(hplip_t) -@@ -553,7 +633,9 @@ +@@ -553,7 +634,9 @@ userdom_dontaudit_search_user_home_dirs(hplip_t) userdom_dontaudit_search_user_home_content(hplip_t) @@ -11863,7 +11870,7 @@ diff -b -B --ignore-all-space --exclude- optional_policy(` dbus_system_bus_client(hplip_t) -@@ -635,3 +717,49 @@ +@@ -635,3 +718,49 @@ optional_policy(` udev_read_db(ptal_t) ') @@ -13478,6 +13485,17 @@ diff -b -B --ignore-all-space --exclude- # pid file manage_dirs_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t) manage_sock_files_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.6.12/policy/modules/services/fetchmail.te +--- nsaserefpolicy/policy/modules/services/fetchmail.te 2009-01-19 11:06:49.000000000 -0500 ++++ serefpolicy-3.6.12/policy/modules/services/fetchmail.te 2009-05-04 15:58:59.000000000 -0400 +@@ -9,6 +9,7 @@ + type fetchmail_t; + type fetchmail_exec_t; + init_daemon_domain(fetchmail_t, fetchmail_exec_t) ++application_executable_file(fetchmail_exec_t) + + type fetchmail_var_run_t; + files_pid_file(fetchmail_var_run_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.fc serefpolicy-3.6.12/policy/modules/services/fprintd.fc --- nsaserefpolicy/policy/modules/services/fprintd.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/services/fprintd.fc 2009-04-28 15:26:41.000000000 -0400 @@ -24168,8 +24186,8 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te --- nsaserefpolicy/policy/modules/services/virt.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/virt.te 2009-04-30 18:07:51.000000000 -0400 -@@ -8,19 +8,24 @@ ++++ serefpolicy-3.6.12/policy/modules/services/virt.te 2009-05-05 16:45:39.000000000 -0400 +@@ -8,19 +8,31 @@ ## ##

@@ -24190,14 +24208,21 @@ diff -b -B --ignore-all-space --exclude- -attribute virt_image_type; +## +##

-+## Allow svirt to user serial/parallell communication ports ++## Allow svirt to manage device configuration, (pci) ++##

++## ++gen_tunable(virt_manage_sysfs, false) ++ ++## ++##

++## Allow svirt to use serial/parallell communication ports +##

+## +gen_tunable(virt_use_comm, false) type virt_etc_t; files_config_file(virt_etc_t) -@@ -29,8 +34,13 @@ +@@ -29,8 +41,13 @@ files_type(virt_etc_rw_t) # virt Image files @@ -24213,7 +24238,7 @@ diff -b -B --ignore-all-space --exclude- type virt_log_t; logging_log_file(virt_log_t) -@@ -48,17 +58,39 @@ +@@ -48,17 +65,39 @@ type virtd_initrc_exec_t; init_script_file(virtd_initrc_exec_t) @@ -24255,7 +24280,7 @@ diff -b -B --ignore-all-space --exclude- read_files_pattern(virtd_t, virt_etc_t, virt_etc_t) read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t) -@@ -67,7 +99,11 @@ +@@ -67,7 +106,11 @@ manage_lnk_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t) filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir) @@ -24268,7 +24293,7 @@ diff -b -B --ignore-all-space --exclude- manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t) manage_files_pattern(virtd_t, virt_log_t, virt_log_t) -@@ -86,6 +122,7 @@ +@@ -86,6 +129,7 @@ kernel_read_network_state(virtd_t) kernel_rw_net_sysctls(virtd_t) kernel_load_module(virtd_t) @@ -24276,7 +24301,7 @@ diff -b -B --ignore-all-space --exclude- corecmd_exec_bin(virtd_t) corecmd_exec_shell(virtd_t) -@@ -96,7 +133,7 @@ +@@ -96,7 +140,7 @@ corenet_tcp_sendrecv_generic_node(virtd_t) corenet_tcp_sendrecv_all_ports(virtd_t) corenet_tcp_bind_generic_node(virtd_t) @@ -24285,7 +24310,7 @@ diff -b -B --ignore-all-space --exclude- corenet_tcp_bind_vnc_port(virtd_t) corenet_tcp_connect_vnc_port(virtd_t) corenet_tcp_connect_soundd_port(virtd_t) -@@ -104,21 +141,39 @@ +@@ -104,21 +148,39 @@ dev_read_sysfs(virtd_t) dev_read_rand(virtd_t) @@ -24326,7 +24351,7 @@ diff -b -B --ignore-all-space --exclude- term_getattr_pty_fs(virtd_t) term_use_ptmx(virtd_t) -@@ -129,6 +184,13 @@ +@@ -129,6 +191,13 @@ logging_send_syslog_msg(virtd_t) @@ -24340,7 +24365,7 @@ diff -b -B --ignore-all-space --exclude- userdom_read_all_users_state(virtd_t) tunable_policy(`virt_use_nfs',` -@@ -167,22 +229,34 @@ +@@ -167,22 +236,34 @@ dnsmasq_domtrans(virtd_t) dnsmasq_signal(virtd_t) dnsmasq_kill(virtd_t) @@ -24363,15 +24388,15 @@ diff -b -B --ignore-all-space --exclude- +optional_policy(` + lvm_domtrans(virtd_t) +') - - optional_policy(` -- qemu_domtrans(virtd_t) ++ ++optional_policy(` + polkit_domtrans_auth(virtd_t) + polkit_domtrans_resolve(virtd_t) + polkit_read_lib(virtd_t) +') -+ -+optional_policy(` + + optional_policy(` +- qemu_domtrans(virtd_t) + qemu_spec_domtrans(virtd_t, svirt_t) qemu_read_state(virtd_t) qemu_signal(virtd_t) @@ -24380,7 +24405,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -195,8 +269,84 @@ +@@ -195,8 +276,88 @@ xen_stream_connect(virtd_t) xen_stream_connect_xenstore(virtd_t) @@ -24444,6 +24469,10 @@ diff -b -B --ignore-all-space --exclude- + dev_rw_printer(svirt_t) +') + ++tunable_policy(`virt_manage_sysfs',` ++ dev_rw_sysfs(svirt_t) ++') ++ +tunable_policy(`virt_use_nfs',` + fs_manage_nfs_dirs(svirt_t) + fs_manage_nfs_files(svirt_t) @@ -29613,7 +29642,7 @@ diff -b -B --ignore-all-space --exclude- xen_append_log(ifconfig_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2009-04-07 15:53:36.000000000 -0400 -+++ serefpolicy-3.6.12/policy/modules/system/udev.te 2009-05-04 14:15:06.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/udev.te 2009-05-04 14:18:49.000000000 -0400 @@ -50,6 +50,7 @@ allow udev_t self:unix_stream_socket connectto; allow udev_t self:netlink_kobject_uevent_socket create_socket_perms; @@ -32373,7 +32402,7 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.12/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/userdomain.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/userdomain.te 2009-05-05 08:21:50.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -32433,7 +32462,7 @@ diff -b -B --ignore-all-space --exclude- userdom_user_home_content(user_home_t) fs_associate_tmpfs(user_home_t) files_associate_tmp(user_home_t) -@@ -95,3 +91,23 @@ +@@ -95,3 +91,25 @@ type user_tty_device_t alias { staff_tty_device_t sysadm_tty_device_t secadm_tty_device_t auditadm_tty_device_t unconfined_tty_device_t }; dev_node(user_tty_device_t) ubac_constrained(user_tty_device_t) @@ -32457,6 +32486,8 @@ diff -b -B --ignore-all-space --exclude- + fs_read_cifs_named_sockets(userhomereader) + fs_read_cifs_named_pipes(userhomereader) +') ++ ++allow userdomain userdomain:process signull; diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.12/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/system/virtual.fc 2009-04-23 09:44:57.000000000 -0400 @@ -32783,7 +32814,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.12/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/xen.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/xen.te 2009-05-05 14:42:25.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -32970,7 +33001,7 @@ diff -b -B --ignore-all-space --exclude- kernel_write_xen_state(xenstored_t) kernel_read_xen_state(xenstored_t) -@@ -312,18 +358,21 @@ +@@ -312,24 +358,28 @@ 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) @@ -32993,7 +33024,14 @@ diff -b -B --ignore-all-space --exclude- corenet_tcp_sendrecv_generic_if(xm_t) corenet_tcp_sendrecv_generic_node(xm_t) -@@ -339,15 +388,58 @@ + corenet_tcp_connect_soundd_port(xm_t) + + dev_read_urand(xm_t) ++dev_search_sysfs(xm_t) + + files_read_etc_runtime_files(xm_t) + files_read_usr_files(xm_t) +@@ -339,15 +389,58 @@ storage_raw_read_fixed_disk(xm_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.846 retrieving revision 1.847 diff -u -p -r1.846 -r1.847 --- selinux-policy.spec 4 May 2009 19:37:29 -0000 1.846 +++ selinux-policy.spec 5 May 2009 20:48:39 -0000 1.847 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.12 -Release: 28%{?dist} +Release: 29%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -477,6 +477,9 @@ exit 0 %endif %changelog +* Tue May 5 2009 Dan Walsh 3.6.12-29 +- Allow svirt to manage pci and other sysfs device data + * Mon May 4 2009 Dan Walsh 3.6.12-28 - Fix package selection handling From than at fedoraproject.org Tue May 5 20:51:41 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 5 May 2009 20:51:41 +0000 (UTC) Subject: rpms/kdepim/F-11 sources,1.69,1.70 Message-ID: <20090505205141.6D7AB70108@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2931 Modified Files: sources Log Message: respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepim/F-11/sources,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- sources 3 May 2009 22:08:33 -0000 1.69 +++ sources 5 May 2009 20:51:10 -0000 1.70 @@ -1 +1 @@ -a141915b7e97ad16e5601281ab3e4976 kdepim-4.2.3.tar.bz2 +94ad0eb531eb8ca03e3355ea9e2e90d6 kdepim-4.2.3.tar.bz2 From oget at fedoraproject.org Tue May 5 20:53:14 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Tue, 5 May 2009 20:53:14 +0000 (UTC) Subject: rpms/slv2/F-10 .cvsignore, 1.2, 1.3 slv2.spec, 1.2, 1.3 sources, 1.2, 1.3 slv2_plugininstance.h_r1948.diff, 1.1, NONE Message-ID: <20090505205314.0DBA070108@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/slv2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3218 Modified Files: .cvsignore slv2.spec sources Removed Files: slv2_plugininstance.h_r1948.diff Log Message: * Tue May 05 2009 Orcan Ogetbil - 0.6.4-1 - Version update: 0.6.4 - Drop plugininstance patch (upstreamed) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/slv2/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Mar 2009 22:23:35 -0000 1.2 +++ .cvsignore 5 May 2009 20:52:43 -0000 1.3 @@ -1 +1 @@ -slv2-0.6.2.tar.bz2 +slv2-0.6.4.tar.bz2 Index: slv2.spec =================================================================== RCS file: /cvs/pkgs/rpms/slv2/F-10/slv2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- slv2.spec 8 Apr 2009 20:46:16 -0000 1.2 +++ slv2.spec 5 May 2009 20:52:43 -0000 1.3 @@ -1,14 +1,10 @@ Name: slv2 Summary: LV2 host library -Version: 0.6.2 -Release: 3%{?dist} +Version: 0.6.4 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries Source0: http://download.drobilla.net/%{name}-%{version}.tar.bz2 -# Some plugins fail (NULL is undefined) to compile without this patch. -# Imported from the upstream trunk: -# http://dev.drobilla.net/changeset/1948/trunk/slv2/slv2/plugininstance.h -Patch0: slv2_plugininstance.h_r1948.diff URL: http://drobilla.net/software/slv2/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,7 +43,6 @@ This package contains the headers and de %prep %setup -q -%patch0 -p2 -b .add_stdlib.h # Fix possible multilib issues sed -i 's|/lib/|/%{_lib}/|g' src/world.c @@ -82,6 +77,7 @@ rm -rf %{buildroot} %doc AUTHORS ChangeLog COPYING README %{_bindir}/lv2* %{_libdir}/lib%{name}.so.* +%{_mandir}/man1/* %files devel %defattr(-,root,root,-) @@ -92,6 +88,10 @@ rm -rf %{buildroot} %{_mandir}/man3/%{name}* %changelog +* Tue May 05 2009 Orcan Ogetbil - 0.6.4-1 +- Version update: 0.6.4 +- Drop plugininstance patch (upstreamed) + * Wed Apr 08 2009 Orcan Ogetbil - 0.6.2-3 - Change CCFLAGS to CFLAGS Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slv2/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Mar 2009 22:23:35 -0000 1.2 +++ sources 5 May 2009 20:52:43 -0000 1.3 @@ -1 +1 @@ -4e8bb5f5e96d0edea988018b6297cf99 slv2-0.6.2.tar.bz2 +2ccd51eb58b5c75128643f9b85507943 slv2-0.6.4.tar.bz2 --- slv2_plugininstance.h_r1948.diff DELETED --- From transif at fedoraproject.org Tue May 5 20:53:48 2009 From: transif at fedoraproject.org (Transifex System User) Date: Tue, 5 May 2009 20:53:48 +0000 (UTC) Subject: comps/po da.po,1.17,1.18 Message-ID: <20090505205348.DEE3670108@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3370/po Modified Files: da.po Log Message: Sending translation for Danish Index: da.po =================================================================== RCS file: /cvs/pkgs/comps/po/da.po,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- da.po 29 Apr 2009 20:00:18 -0000 1.17 +++ da.po 5 May 2009 20:53:18 -0000 1.18 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: comps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-04-10 22:25+0200\n" +"POT-Creation-Date: 2009-05-05 19:09+0000\n" +"PO-Revision-Date: 2009-05-06 22:26+0200\n" "Last-Translator: Kris Thomsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -1301,19 +1301,16 @@ msgid "Amazigh Support" msgstr "Underst??ttelse af amazigh" #: ../comps-f11.xml.in.h:13 -#, fuzzy msgid "Azerbaijani Support" -msgstr "Underst??ttelse af serbisk" +msgstr "Underst??ttelse af azeri" #: ../comps-f11.xml.in.h:27 -#, fuzzy msgid "Chichewa Support" -msgstr "Underst??ttelse af kinesisk" +msgstr "Underst??ttelse af nyanja" #: ../comps-f11.xml.in.h:31 -#, fuzzy msgid "Coptic Support" -msgstr "Underst??ttelse af kroatisk" +msgstr "Underst??ttelse af koptisk" #: ../comps-f11.xml.in.h:37 msgid "Design and Simulation tools for hardware engineers" @@ -1324,9 +1321,8 @@ msgid "Electronic Lab" msgstr "Elektroniklaboratorium" #: ../comps-f11.xml.in.h:58 -#, fuzzy msgid "Fijian Support" -msgstr "Underst??ttelse af frisisk" +msgstr "Underst??ttelse af fijiansk" #: ../comps-f11.xml.in.h:61 msgid "Font design and packaging" @@ -1341,47 +1337,40 @@ msgid "Friulian Support" msgstr "Underst??ttelse af friulisk" #: ../comps-f11.xml.in.h:83 -#, fuzzy msgid "Hiligaynon Support" -msgstr "Underst??ttelse af filipinsk" +msgstr "Underst??ttelse af hiligaynon" #: ../comps-f11.xml.in.h:96 -#, fuzzy msgid "Interlingua Support" -msgstr "Underst??ttelse af italiensk" +msgstr "Underst??ttelse af interlingua" #: ../comps-f11.xml.in.h:109 -#, fuzzy msgid "Kazakh Support" -msgstr "Underst??ttelse af kannada" +msgstr "Underst??ttelse af kasakhisk" #: ../comps-f11.xml.in.h:111 msgid "Kinyarwanda Support" msgstr "Underst??ttelse af kinyarwanda" #: ../comps-f11.xml.in.h:118 -#, fuzzy msgid "Latin Support" -msgstr "Underst??ttelse af lettisk" +msgstr "Underst??ttelse af latinsk" #: ../comps-f11.xml.in.h:126 -#, fuzzy msgid "Luxembourgish Support" -msgstr "Underst??ttelse af tyrkisk" +msgstr "Underst??ttelse af luxembourgsk" #: ../comps-f11.xml.in.h:130 msgid "Malagasy Support" msgstr "Underst??ttelse af malagasy" #: ../comps-f11.xml.in.h:133 -#, fuzzy msgid "Maltese Support" -msgstr "Underst??ttelse af malajisk" +msgstr "Underst??ttelse af maltesisk" #: ../comps-f11.xml.in.h:134 -#, fuzzy msgid "Manx Support" -msgstr "Underst??ttelse af malajisk" +msgstr "Underst??ttelse af manx" #: ../comps-f11.xml.in.h:137 msgid "MinGW cross-compiler" @@ -1400,14 +1389,12 @@ msgid "Online Help and Documentation" msgstr "Hj??lp og dokumentation p?? nettet" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "Underst??ttelse af spansk" +msgstr "Underst??ttelse af sanskrit" #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "Underst??ttelse af ukrainsk" +msgstr "Underst??ttelse af sardinsk" #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" @@ -1430,14 +1417,12 @@ msgstr "" "programmeringssprog og biblioteker." #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "Underst??ttelse af swati" +msgstr "Underst??ttelse af swahili" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "Underst??ttelse af telugu" +msgstr "Underst??ttelse af tetum" #: ../comps-f11.xml.in.h:223 msgid "" From than at fedoraproject.org Tue May 5 20:58:04 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 5 May 2009 20:58:04 +0000 (UTC) Subject: rpms/kdepim/F-10 kdepim.spec, 1.209, 1.210 sources, 1.70, 1.71 kdepim-4.2.2-korganizer-crash.patch, 1.1, NONE Message-ID: <20090505205804.F037A70108@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909 Modified Files: kdepim.spec sources Removed Files: kdepim-4.2.2-korganizer-crash.patch Log Message: respin Index: kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v retrieving revision 1.209 retrieving revision 1.210 diff -u -p -r1.209 -r1.210 --- kdepim.spec 6 Apr 2009 11:12:22 -0000 1.209 +++ kdepim.spec 5 May 2009 20:57:34 -0000 1.210 @@ -5,8 +5,8 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 Group: Applications/Productivity @@ -14,7 +14,6 @@ URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kdepim-4.1.80-libqgpgme-link-fix.patch # 4.2 upstream patches -Patch100: kdepim-4.2.2-korganizer-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,23 +30,22 @@ BuildRequires: gnokii-devel BuildRequires: gpgme-devel BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: libassuan-devel +BuildRequires: libical-devel BuildRequires: libXpm-devel libXScrnSaver-devel # TODO: libmapi from http://www.openchange.org/ #BuildRequires: libmapi-devel # Not used, has broken deps to boot -- Rex #BuildRequires: libopensync-devel BuildRequires: libxslt-devel -BuildRequires: lockdev-devel -%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12 libmal-devel >= 0.40} +%if 0%{?_with_pilot_link:1} +# libmal currently not used, recheck with kdepim-4.3 +#BuildRequirs: libmal-devel >= 0.40 +BuildRequires: pilot-link-devel >= 0.12 +%endif BuildRequires: python-devel BuildRequires: soprano-devel BuildRequires: qca2-devel BuildRequires: zlib-devel -# these seem mostly bogus, not checked for, but linked nonetheless -- Rex -BuildRequires: giflib-devel -BuildRequires: openldap-devel -BuildRequires: pcre-devel -BuildRequires: libical-devel ##Optional bits Requires(hint): pinentry-gui @@ -91,7 +89,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}% %patch0 -p1 -b .libqgpgme-link-fix # upstream patches -%patch100 -p0 -b .crash %build mkdir -p %{_target_platform} @@ -188,6 +185,12 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + +* Mon Apr 13 2009 Rex Dieter - 4.2.2-4 +- drop extraneous BR's, including libmal-devel (not currently used) + * Mon Apr 06 2009 Than Ngo - 4.2.2-3 - apply upstream patch to fix crash in korganizer Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepim/F-10/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- sources 2 Apr 2009 15:10:25 -0000 1.70 +++ sources 5 May 2009 20:57:34 -0000 1.71 @@ -1 +1 @@ -964208d570845c75e0c482bb3d33892f kdepim-4.2.2.tar.bz2 +94ad0eb531eb8ca03e3355ea9e2e90d6 kdepim-4.2.3.tar.bz2 --- kdepim-4.2.2-korganizer-crash.patch DELETED --- From than at fedoraproject.org Tue May 5 21:02:39 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 5 May 2009 21:02:39 +0000 (UTC) Subject: rpms/kdepimlibs/F-11 sources,1.35,1.36 Message-ID: <20090505210239.B8E0E70108@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdepimlibs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4407 Modified Files: sources Log Message: respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/F-11/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- sources 3 May 2009 22:13:35 -0000 1.35 +++ sources 5 May 2009 21:02:09 -0000 1.36 @@ -1 +1 @@ -7b5250a44291c42c5fa4110da19890bb kdepimlibs-4.2.3.tar.bz2 +0c6f760fd1b3e031254b0a3082396657 kdepimlibs-4.2.3.tar.bz2 From denisarnaud at fedoraproject.org Tue May 5 21:15:17 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 21:15:17 +0000 (UTC) Subject: rpms/soci/F-11 import.log, 1.2, 1.3 soci-3.0.0-fix-gcc43-compatibility.patch, 1.2, 1.3 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.1, 1.2 soci.spec, 1.2, 1.3 Message-ID: <20090505211517.535C870108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6169/F-11 Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-8 - Added missing cstdio header includes for g++-4.4 compatibility Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 5 May 2009 19:21:36 -0000 1.2 +++ import.log 5 May 2009 21:14:46 -0000 1.3 @@ -1,2 +1,3 @@ soci-3_0_0-6_fc10:F-11:soci-3.0.0-6.fc10.src.rpm:1241474667 soci-3_0_0-7_fc10:F-11:soci-3.0.0-7.fc10.src.rpm:1241550507 +soci-3_0_0-8_fc10:F-11:soci-3.0.0-8.fc10.src.rpm:1241557840 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 19:21:36 -0000 1.2 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 21:14:46 -0000 1.3 @@ -1,17 +1,17 @@ -diff -u -r soci-3.0.0_ref/src/backends/mysql/common.h soci-3.0.0_working/src/backends/mysql/common.h ---- soci-3.0.0_ref/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/common.h 2009-03-26 15:33:33.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h +--- soci-3.0.0/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 22:44:49.000000000 +0200 @@ -10,6 +10,7 @@ - + #include #include "soci-mysql.h" +#include - + namespace soci { -diff -u -r soci-3.0.0_ref/src/backends/mysql/session.cpp soci-3.0.0_working/src/backends/mysql/session.cpp ---- soci-3.0.0_ref/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/session.cpp 2009-03-26 15:34:50.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp +--- soci-3.0.0/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 22:44:49.000000000 +0200 @@ -11,7 +11,8 @@ #include #include @@ -19,40 +19,82 @@ diff -u -r soci-3.0.0_ref/src/backends/m - +#include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -u -r soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp 2009-03-26 15:34:09.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp +--- soci-3.0.0/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 22:44:49.000000000 +0200 @@ -12,6 +12,8 @@ #include "common.h" #include #include +#include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -u -r soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp ---- soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp 2009-03-26 15:33:14.000000000 +0100 -@@ -13,6 +13,7 @@ +diff -ur soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp +--- soci-3.0.0/src/backends/mysql/standard-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 22:48:13.000000000 +0200 +@@ -9,9 +9,16 @@ + #define SOCI_MYSQL_SOURCE + #include "soci-mysql.h" + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// #include #include ++#include + #include + + #ifdef _MSC_VER +diff -ur soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp +--- soci-3.0.0/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 22:48:23.000000000 +0200 +@@ -9,10 +9,18 @@ + #define SOCI_MYSQL_SOURCE + #include "soci-mysql.h" + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// + #include + #include ++#include #include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ru soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp ---- soci-3.0.0/src/core/soci-simple.cpp 2008-07-01 09:42:25.000000000 +0200 -+++ soci-3.0.0_4-pack/src/core/soci-simple.cpp 2009-05-05 16:17:38.000000000 +0200 -@@ -9,6 +9,7 @@ - - #include "soci-simple.h" - #include "soci.h" +diff -ur soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp +--- soci-3.0.0/src/backends/postgresql/common.cpp 2008-06-27 16:38:05.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 22:47:18.000000000 +0200 +@@ -6,8 +6,15 @@ + // + + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// + #include +#include - - using namespace soci; - + #include + + soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 4 May 2009 22:08:22 -0000 1.1 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:14:46 -0000 1.2 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-03 00:20:33.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 22:51:55.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-03 00:20:39.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-05 22:52:01.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-03 00:20:39.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-05 22:52:01.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-03 00:20:36.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-05 23:06:26.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-05 22:51:58.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="6" ++RPM_RELEASE="8" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-03 00:01:43.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-05 22:33:10.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="6" ++RPM_RELEASE="8" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-03 00:20:45.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53397,24 +53397,6 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include #include -diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/mysql/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 -@@ -9,7 +9,13 @@ - #define SOCI_MYSQL_SOURCE - #include "soci-mysql.h" - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - #include diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.am --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.am 2009-04-16 19:37:06.000000000 +0200 @@ -53438,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53465,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53987,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54028,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54045,26 +54027,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #ifdef _MSC_VER -diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-use-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-use-type.cpp 2009-05-03 00:24:15.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/mysql/vector-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 -@@ -9,7 +9,13 @@ - #define SOCI_MYSQL_SOURCE - #include "soci-mysql.h" - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54113,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54213,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55016,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55055,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55080,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55105,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55149,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55177,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55703,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55727,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55745,24 +55709,6 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include #include -diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/common.cpp soci-3.0.0_trep300/soci/backends/postgresql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/common.cpp 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/postgresql/common.cpp 2009-04-16 19:37:05.000000000 +0200 -@@ -6,7 +6,13 @@ - // - - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am soci-3.0.0_trep300/soci/backends/postgresql/Makefile.am --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.am 2009-04-16 19:37:05.000000000 +0200 @@ -55798,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55898,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56703,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56742,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56765,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56807,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56834,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57357,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57382,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-03 00:20:38.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 22:52:00.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57559,7 +57505,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-03 00:24:14.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57640,7 +57586,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58599,7 +58545,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 @@ -8,14 +8,24 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58652,7 +58598,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,470 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59145,7 +59091,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59920,8 +59866,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-02 17:23:39.000000000 +0200 -@@ -0,0 +1,294 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 22:33:42.000000000 +0200 +@@ -0,0 +1,300 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60199,6 +60145,12 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-8 ++- Added missing cstdio header includes for g++-4.4 compatibility ++ ++* Tue May 05 2009 Denis Arnaud 3.0.0-7 ++- Added a missing cstdio header include for g++-4.4 compatibility ++ +* Sat May 02 2009 Denis Arnaud 3.0.0-6 +- Removed the unused build conditionals + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci.spec 5 May 2009 19:21:36 -0000 1.2 +++ soci.spec 5 May 2009 21:14:46 -0000 1.3 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The database access library for C++ programmers @@ -275,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-8 +- Added missing cstdio header includes for g++-4.4 compatibility + * Tue May 05 2009 Denis Arnaud 3.0.0-7 - Added a missing cstdio header include for g++-4.4 compatibility From karsten at fedoraproject.org Tue May 5 21:16:47 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Tue, 5 May 2009 21:16:47 +0000 (UTC) Subject: rpms/db4/F-11 db4.spec,1.73,1.74 Message-ID: <20090505211647.B2E1470108@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/db4/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6684 Modified Files: db4.spec Log Message: - add s390 and s390x to java_arches Index: db4.spec =================================================================== RCS file: /cvs/extras/rpms/db4/F-11/db4.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -r1.73 -r1.74 --- db4.spec 27 Feb 2009 09:09:21 -0000 1.73 +++ db4.spec 5 May 2009 21:16:17 -0000 1.74 @@ -1,5 +1,5 @@ # the set of arches on which libgcj provides gcj and libgcj-javac-placeholder.sh -%define java_arches %{ix86} alpha ia64 ppc sparc sparcv9 x86_64 +%define java_arches %{ix86} alpha ia64 ppc sparc sparcv9 x86_64 s390 s390x %define __soversion 4.7 # switch back to md5 file digests (due to rpm) until the dust settles a bit @@ -9,7 +9,7 @@ Summary: The Berkeley DB database library (version 4) for C Name: db4 Version: 4.7.25 -Release: 11%{?dist} +Release: 11%{?dist}.1 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz # db-4.7.25 upstream patches @@ -378,6 +378,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Tue May 05 2009 Karsten Hopp 4.7.25-11.1 +- add s390 and s390x to java_arches + * Fri Feb 27 2009 Panu Matilainen - 4.7.25-11 - build with md5 file digests for now to ensure upgradability of rpm From karsten at fedoraproject.org Tue May 5 21:18:11 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Tue, 5 May 2009 21:18:11 +0000 (UTC) Subject: rpms/db4/devel db4.spec,1.73,1.74 Message-ID: <20090505211811.00F5870108@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/db4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6919 Modified Files: db4.spec Log Message: - add s390 and s390x to java_arches Index: db4.spec =================================================================== RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -r1.73 -r1.74 --- db4.spec 27 Feb 2009 09:09:21 -0000 1.73 +++ db4.spec 5 May 2009 21:17:40 -0000 1.74 @@ -1,5 +1,5 @@ # the set of arches on which libgcj provides gcj and libgcj-javac-placeholder.sh -%define java_arches %{ix86} alpha ia64 ppc sparc sparcv9 x86_64 +%define java_arches %{ix86} alpha ia64 ppc sparc sparcv9 x86_64 s390 s390x %define __soversion 4.7 # switch back to md5 file digests (due to rpm) until the dust settles a bit @@ -9,7 +9,7 @@ Summary: The Berkeley DB database library (version 4) for C Name: db4 Version: 4.7.25 -Release: 11%{?dist} +Release: 11%{?dist}.1 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz # db-4.7.25 upstream patches @@ -378,6 +378,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Tue May 05 2009 Karsten Hopp 4.7.25-11.1 +- add s390 and s390x to java_arches + * Fri Feb 27 2009 Panu Matilainen - 4.7.25-11 - build with md5 file digests for now to ensure upgradability of rpm From denisarnaud at fedoraproject.org Tue May 5 21:22:01 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 21:22:01 +0000 (UTC) Subject: rpms/soci/devel import.log, 1.2, 1.3 soci-3.0.0-fix-gcc43-compatibility.patch, 1.2, 1.3 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.1, 1.2 soci.spec, 1.2, 1.3 Message-ID: <20090505212201.0A4AC70108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7278/devel Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-8 - Added missing cstdio header includes for g++-4.4 compatibility Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 5 May 2009 19:03:57 -0000 1.2 +++ import.log 5 May 2009 21:21:30 -0000 1.3 @@ -1,2 +1,3 @@ soci-3_0_0-6_fc10:HEAD:soci-3.0.0-6.fc10.src.rpm:1241473915 soci-3_0_0-7_fc10:HEAD:soci-3.0.0-7.fc10.src.rpm:1241549903 +soci-3_0_0-8_fc10:HEAD:soci-3.0.0-8.fc10.src.rpm:1241558219 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 19:03:57 -0000 1.2 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 21:21:30 -0000 1.3 @@ -1,17 +1,17 @@ -diff -u -r soci-3.0.0_ref/src/backends/mysql/common.h soci-3.0.0_working/src/backends/mysql/common.h ---- soci-3.0.0_ref/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/common.h 2009-03-26 15:33:33.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h +--- soci-3.0.0/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 22:44:49.000000000 +0200 @@ -10,6 +10,7 @@ - + #include #include "soci-mysql.h" +#include - + namespace soci { -diff -u -r soci-3.0.0_ref/src/backends/mysql/session.cpp soci-3.0.0_working/src/backends/mysql/session.cpp ---- soci-3.0.0_ref/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/session.cpp 2009-03-26 15:34:50.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp +--- soci-3.0.0/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 22:44:49.000000000 +0200 @@ -11,7 +11,8 @@ #include #include @@ -19,40 +19,82 @@ diff -u -r soci-3.0.0_ref/src/backends/m - +#include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -u -r soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp 2009-03-26 15:34:09.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp +--- soci-3.0.0/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 22:44:49.000000000 +0200 @@ -12,6 +12,8 @@ #include "common.h" #include #include +#include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -u -r soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp ---- soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp 2009-03-26 15:33:14.000000000 +0100 -@@ -13,6 +13,7 @@ +diff -ur soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp +--- soci-3.0.0/src/backends/mysql/standard-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 22:48:13.000000000 +0200 +@@ -9,9 +9,16 @@ + #define SOCI_MYSQL_SOURCE + #include "soci-mysql.h" + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// #include #include ++#include + #include + + #ifdef _MSC_VER +diff -ur soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp +--- soci-3.0.0/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 22:48:23.000000000 +0200 +@@ -9,10 +9,18 @@ + #define SOCI_MYSQL_SOURCE + #include "soci-mysql.h" + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// + #include + #include ++#include #include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ru soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp ---- soci-3.0.0/src/core/soci-simple.cpp 2008-07-01 09:42:25.000000000 +0200 -+++ soci-3.0.0_4-pack/src/core/soci-simple.cpp 2009-05-05 16:17:38.000000000 +0200 -@@ -9,6 +9,7 @@ - - #include "soci-simple.h" - #include "soci.h" +diff -ur soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp +--- soci-3.0.0/src/backends/postgresql/common.cpp 2008-06-27 16:38:05.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 22:47:18.000000000 +0200 +@@ -6,8 +6,15 @@ + // + + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// + #include +#include - - using namespace soci; - + #include + + soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 4 May 2009 21:56:11 -0000 1.1 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:21:30 -0000 1.2 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-03 00:20:33.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 22:51:55.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-03 00:20:39.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-05 22:52:01.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-03 00:20:39.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-05 22:52:01.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-03 00:20:36.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-05 23:06:26.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-05 22:51:58.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="6" ++RPM_RELEASE="8" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-03 00:01:43.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-05 22:33:10.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="6" ++RPM_RELEASE="8" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-03 00:20:45.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53397,24 +53397,6 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include #include -diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/mysql/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 -@@ -9,7 +9,13 @@ - #define SOCI_MYSQL_SOURCE - #include "soci-mysql.h" - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - #include diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.am --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.am 2009-04-16 19:37:06.000000000 +0200 @@ -53438,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53465,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53987,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54028,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54045,26 +54027,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #ifdef _MSC_VER -diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-use-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-use-type.cpp 2009-05-03 00:24:15.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/mysql/vector-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 -@@ -9,7 +9,13 @@ - #define SOCI_MYSQL_SOURCE - #include "soci-mysql.h" - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54113,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54213,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55016,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55055,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55080,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55105,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55149,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55177,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55703,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55727,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55745,24 +55709,6 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include #include -diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/common.cpp soci-3.0.0_trep300/soci/backends/postgresql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/common.cpp 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/postgresql/common.cpp 2009-04-16 19:37:05.000000000 +0200 -@@ -6,7 +6,13 @@ - // - - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am soci-3.0.0_trep300/soci/backends/postgresql/Makefile.am --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.am 2009-04-16 19:37:05.000000000 +0200 @@ -55798,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55898,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56703,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56742,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56765,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56807,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56834,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57357,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57382,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-03 00:20:38.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 22:52:00.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57559,7 +57505,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-03 00:24:14.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57640,7 +57586,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58599,7 +58545,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 @@ -8,14 +8,24 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58652,7 +58598,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,470 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59145,7 +59091,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59920,8 +59866,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-02 17:23:39.000000000 +0200 -@@ -0,0 +1,294 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 22:33:42.000000000 +0200 +@@ -0,0 +1,300 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60199,6 +60145,12 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-8 ++- Added missing cstdio header includes for g++-4.4 compatibility ++ ++* Tue May 05 2009 Denis Arnaud 3.0.0-7 ++- Added a missing cstdio header include for g++-4.4 compatibility ++ +* Sat May 02 2009 Denis Arnaud 3.0.0-6 +- Removed the unused build conditionals + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci.spec 5 May 2009 19:03:57 -0000 1.2 +++ soci.spec 5 May 2009 21:21:30 -0000 1.3 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The database access library for C++ programmers @@ -275,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-8 +- Added missing cstdio header includes for g++-4.4 compatibility + * Tue May 05 2009 Denis Arnaud 3.0.0-7 - Added a missing cstdio header include for g++-4.4 compatibility From denisarnaud at fedoraproject.org Tue May 5 21:30:23 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 21:30:23 +0000 (UTC) Subject: rpms/soci/F-10 import.log, 1.1, 1.2 soci-3.0.0-fix-gcc43-compatibility.patch, 1.1, 1.2 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.1, 1.2 soci.spec, 1.1, 1.2 Message-ID: <20090505213023.B59B070108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8341/F-10 Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-8 - Added missing cstdio header includes for g++-4.4 compatibility Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 4 May 2009 22:02:36 -0000 1.1 +++ import.log 5 May 2009 21:29:52 -0000 1.2 @@ -1 +1,2 @@ soci-3_0_0-6_fc10:F-10:soci-3.0.0-6.fc10.src.rpm:1241474307 +soci-3_0_0-8_fc10:F-10:soci-3.0.0-8.fc10.src.rpm:1241558624 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci-3.0.0-fix-gcc43-compatibility.patch 4 May 2009 22:02:36 -0000 1.1 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 21:29:52 -0000 1.2 @@ -1,17 +1,17 @@ -diff -u -r soci-3.0.0_ref/src/backends/mysql/common.h soci-3.0.0_working/src/backends/mysql/common.h ---- soci-3.0.0_ref/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/common.h 2009-03-26 15:33:33.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h +--- soci-3.0.0/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 22:44:49.000000000 +0200 @@ -10,6 +10,7 @@ - + #include #include "soci-mysql.h" +#include - + namespace soci { -diff -u -r soci-3.0.0_ref/src/backends/mysql/session.cpp soci-3.0.0_working/src/backends/mysql/session.cpp ---- soci-3.0.0_ref/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/session.cpp 2009-03-26 15:34:50.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp +--- soci-3.0.0/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 22:44:49.000000000 +0200 @@ -11,7 +11,8 @@ #include #include @@ -19,29 +19,82 @@ diff -u -r soci-3.0.0_ref/src/backends/m - +#include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -u -r soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp 2009-03-26 15:34:09.000000000 +0100 +diff -ur soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp +--- soci-3.0.0/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 22:44:49.000000000 +0200 @@ -12,6 +12,8 @@ #include "common.h" #include #include +#include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -u -r soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp ---- soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp 2009-03-26 15:33:14.000000000 +0100 -@@ -13,6 +13,7 @@ +diff -ur soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp +--- soci-3.0.0/src/backends/mysql/standard-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 22:48:13.000000000 +0200 +@@ -9,9 +9,16 @@ + #define SOCI_MYSQL_SOURCE + #include "soci-mysql.h" + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// #include #include ++#include + #include + + #ifdef _MSC_VER +diff -ur soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp +--- soci-3.0.0/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 22:48:23.000000000 +0200 +@@ -9,10 +9,18 @@ + #define SOCI_MYSQL_SOURCE + #include "soci-mysql.h" + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// + #include + #include ++#include #include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) +diff -ur soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp +--- soci-3.0.0/src/backends/postgresql/common.cpp 2008-06-27 16:38:05.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 22:47:18.000000000 +0200 +@@ -6,8 +6,15 @@ + // + + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// + #include ++#include + #include + + soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 4 May 2009 22:02:36 -0000 1.1 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:29:52 -0000 1.2 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-03 00:20:33.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 22:51:55.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-03 00:20:39.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-05 22:52:01.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-03 00:20:39.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-05 22:52:01.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-03 00:20:36.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-05 23:06:26.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-05 22:51:58.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="6" ++RPM_RELEASE="8" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-03 00:01:43.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-05 22:33:10.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="6" ++RPM_RELEASE="8" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-03 00:20:45.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-05 22:52:05.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53397,24 +53397,6 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include #include -diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/mysql/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 -@@ -9,7 +9,13 @@ - #define SOCI_MYSQL_SOURCE - #include "soci-mysql.h" - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - #include diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.am --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.am 2009-04-16 19:37:06.000000000 +0200 @@ -53438,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53465,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 22:52:03.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53987,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54028,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54045,26 +54027,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #ifdef _MSC_VER -diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-use-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-use-type.cpp 2009-05-03 00:24:15.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/mysql/vector-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 -@@ -9,7 +9,13 @@ - #define SOCI_MYSQL_SOURCE - #include "soci-mysql.h" - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54113,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54213,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55016,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55055,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55080,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55105,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55149,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55177,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55703,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55727,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55745,24 +55709,6 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include #include -diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/common.cpp soci-3.0.0_trep300/soci/backends/postgresql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/common.cpp 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/postgresql/common.cpp 2009-04-16 19:37:05.000000000 +0200 -@@ -6,7 +6,13 @@ - // - - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am soci-3.0.0_trep300/soci/backends/postgresql/Makefile.am --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.am 2009-04-16 19:37:05.000000000 +0200 @@ -55798,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55898,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56703,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56742,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56765,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56807,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56834,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57357,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57382,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-03 00:20:38.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 22:52:00.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57559,7 +57505,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-03 00:24:14.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57640,7 +57586,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58599,7 +58545,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:06:27.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 @@ -8,14 +8,24 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58652,7 +58598,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 @@ -0,0 +1,470 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59145,7 +59091,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 22:52:02.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59920,8 +59866,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-02 17:23:39.000000000 +0200 -@@ -0,0 +1,294 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 22:33:42.000000000 +0200 +@@ -0,0 +1,300 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60199,6 +60145,12 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-8 ++- Added missing cstdio header includes for g++-4.4 compatibility ++ ++* Tue May 05 2009 Denis Arnaud 3.0.0-7 ++- Added a missing cstdio header include for g++-4.4 compatibility ++ +* Sat May 02 2009 Denis Arnaud 3.0.0-6 +- Removed the unused build conditionals + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/soci.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci.spec 4 May 2009 22:02:37 -0000 1.1 +++ soci.spec 5 May 2009 21:29:52 -0000 1.2 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 6%{?dist} +Release: 8%{?dist} Summary: The database access library for C++ programmers @@ -275,6 +275,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-8 +- Added missing cstdio header includes for g++-4.4 compatibility + +* Tue May 05 2009 Denis Arnaud 3.0.0-7 +- Added a missing cstdio header include for g++-4.4 compatibility + * Sat May 02 2009 Denis Arnaud 3.0.0-6 - Removed the unused build conditionals From slankes at fedoraproject.org Tue May 5 21:42:56 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Tue, 5 May 2009 21:42:56 +0000 (UTC) Subject: rpms/qca2/devel .cvsignore, 1.4, 1.5 qca2.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <20090505214256.5900E70108@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/qca2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9953 Modified Files: .cvsignore qca2.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qca2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 8 Apr 2009 18:52:42 -0000 1.4 +++ .cvsignore 5 May 2009 21:42:25 -0000 1.5 @@ -1 +1 @@ -qca-2.0.1.tar.bz2 +qca-2.0.2.tar.bz2 Index: qca2.spec =================================================================== RCS file: /cvs/pkgs/rpms/qca2/devel/qca2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- qca2.spec 8 Apr 2009 19:41:58 -0000 1.11 +++ qca2.spec 5 May 2009 21:42:25 -0000 1.12 @@ -1,5 +1,5 @@ Name: qca2 -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} Summary: Qt Cryptographic Architecture @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Sven Lankes - 2.0.2-1 +- new upstream release - qt 4.5-compat-fixes + * Wed Apr 08 2009 Sven Lankes - 2.0.1-1 - new upstream release - removed 64bit patch - now upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qca2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 8 Apr 2009 18:52:42 -0000 1.4 +++ sources 5 May 2009 21:42:25 -0000 1.5 @@ -1 +1 @@ -a0a87d0b3210e23f8c1713562282b7d6 qca-2.0.1.tar.bz2 +27ebdfbd9869d90dae078a6decd029f4 qca-2.0.2.tar.bz2 From denisarnaud at fedoraproject.org Tue May 5 21:46:33 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 21:46:33 +0000 (UTC) Subject: rpms/soci/devel import.log, 1.3, 1.4 soci-3.0.0-fix-gcc43-compatibility.patch, 1.3, 1.4 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.2, 1.3 soci.spec, 1.3, 1.4 Message-ID: <20090505214633.64F4D70108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11031/devel Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-9 - Added a missing cstdio header include for g++-4.4 compatibility Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 5 May 2009 21:21:30 -0000 1.3 +++ import.log 5 May 2009 21:46:02 -0000 1.4 @@ -1,3 +1,4 @@ soci-3_0_0-6_fc10:HEAD:soci-3.0.0-6.fc10.src.rpm:1241473915 soci-3_0_0-7_fc10:HEAD:soci-3.0.0-7.fc10.src.rpm:1241549903 soci-3_0_0-8_fc10:HEAD:soci-3.0.0-8.fc10.src.rpm:1241558219 +soci-3_0_0-9_fc10:HEAD:soci-3.0.0-9.fc10.src.rpm:1241559732 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 21:21:30 -0000 1.3 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 21:46:02 -0000 1.4 @@ -1,6 +1,6 @@ -diff -ur soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h +diff -ru soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h --- soci-3.0.0/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 23:32:22.000000000 +0200 @@ -10,6 +10,7 @@ #include @@ -9,9 +9,9 @@ diff -ur soci-3.0.0/src/backends/mysql/c namespace soci { -diff -ur soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp +diff -ru soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp --- soci-3.0.0/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -11,7 +11,8 @@ #include #include @@ -22,9 +22,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp --- soci-3.0.0/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -12,6 +12,8 @@ #include "common.h" #include @@ -34,9 +34,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp --- soci-3.0.0/src/backends/mysql/standard-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 22:48:13.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -9,9 +9,16 @@ #define SOCI_MYSQL_SOURCE #include "soci-mysql.h" @@ -55,9 +55,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #include #ifdef _MSC_VER -diff -ur soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp --- soci-3.0.0/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 22:48:23.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -9,10 +9,18 @@ #define SOCI_MYSQL_SOURCE #include "soci-mysql.h" @@ -78,9 +78,9 @@ diff -ur soci-3.0.0/src/backends/mysql/v #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp +diff -ru soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp --- soci-3.0.0/src/backends/postgresql/common.cpp 2008-06-27 16:38:05.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 22:47:18.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -6,8 +6,15 @@ // @@ -98,3 +98,15 @@ diff -ur soci-3.0.0/src/backends/postgre #include +diff -ru soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp +--- soci-3.0.0/src/core/soci-simple.cpp 2008-07-01 09:42:25.000000000 +0200 ++++ soci-3.0.0_4-pack/src/core/soci-simple.cpp 2009-05-05 23:33:57.000000000 +0200 +@@ -9,6 +9,8 @@ + + #include "soci-simple.h" + #include "soci.h" ++// ++#include + + using namespace soci; + soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:21:30 -0000 1.2 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:46:02 -0000 1.3 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 22:51:55.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 23:31:06.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-05 22:52:01.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-05 22:52:01.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-05 23:06:26.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-05 22:51:58.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-05 23:39:48.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-05 23:31:09.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="8" ++RPM_RELEASE="9" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-05 22:33:10.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-05 23:30:10.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="8" ++RPM_RELEASE="9" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 22:52:00.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 23:31:11.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57505,7 +57505,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57586,7 +57586,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58545,7 +58545,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 @@ -8,14 +8,24 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58598,7 +58598,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,470 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59091,7 +59091,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59866,8 +59866,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 22:33:42.000000000 +0200 -@@ -0,0 +1,300 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 23:30:38.000000000 +0200 +@@ -0,0 +1,303 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60145,6 +60145,9 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-9 ++- Added a missing cstdio header include for g++-4.4 compatibility ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-8 +- Added missing cstdio header includes for g++-4.4 compatibility + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci.spec 5 May 2009 21:21:30 -0000 1.3 +++ soci.spec 5 May 2009 21:46:02 -0000 1.4 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: The database access library for C++ programmers @@ -275,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-9 +- Added a missing cstdio header include for g++-4.4 compatibility + * Tue May 05 2009 Denis Arnaud 3.0.0-8 - Added missing cstdio header includes for g++-4.4 compatibility From denisarnaud at fedoraproject.org Tue May 5 21:59:41 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 21:59:41 +0000 (UTC) Subject: rpms/soci/F-11 import.log, 1.3, 1.4 soci-3.0.0-fix-gcc43-compatibility.patch, 1.3, 1.4 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.2, 1.3 soci.spec, 1.3, 1.4 Message-ID: <20090505215941.E727170108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12657/F-11 Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-9 - Added a missing cstdio header include for g++-4.4 compatibility Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 5 May 2009 21:14:46 -0000 1.3 +++ import.log 5 May 2009 21:59:10 -0000 1.4 @@ -1,3 +1,4 @@ soci-3_0_0-6_fc10:F-11:soci-3.0.0-6.fc10.src.rpm:1241474667 soci-3_0_0-7_fc10:F-11:soci-3.0.0-7.fc10.src.rpm:1241550507 soci-3_0_0-8_fc10:F-11:soci-3.0.0-8.fc10.src.rpm:1241557840 +soci-3_0_0-9_fc10:F-11:soci-3.0.0-9.fc10.src.rpm:1241560148 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 21:14:46 -0000 1.3 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 21:59:10 -0000 1.4 @@ -1,6 +1,6 @@ -diff -ur soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h +diff -ru soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h --- soci-3.0.0/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 23:32:22.000000000 +0200 @@ -10,6 +10,7 @@ #include @@ -9,9 +9,9 @@ diff -ur soci-3.0.0/src/backends/mysql/c namespace soci { -diff -ur soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp +diff -ru soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp --- soci-3.0.0/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -11,7 +11,8 @@ #include #include @@ -22,9 +22,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp --- soci-3.0.0/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -12,6 +12,8 @@ #include "common.h" #include @@ -34,9 +34,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp --- soci-3.0.0/src/backends/mysql/standard-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 22:48:13.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -9,9 +9,16 @@ #define SOCI_MYSQL_SOURCE #include "soci-mysql.h" @@ -55,9 +55,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #include #ifdef _MSC_VER -diff -ur soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp --- soci-3.0.0/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 22:48:23.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -9,10 +9,18 @@ #define SOCI_MYSQL_SOURCE #include "soci-mysql.h" @@ -78,9 +78,9 @@ diff -ur soci-3.0.0/src/backends/mysql/v #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp +diff -ru soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp --- soci-3.0.0/src/backends/postgresql/common.cpp 2008-06-27 16:38:05.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 22:47:18.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -6,8 +6,15 @@ // @@ -98,3 +98,15 @@ diff -ur soci-3.0.0/src/backends/postgre #include +diff -ru soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp +--- soci-3.0.0/src/core/soci-simple.cpp 2008-07-01 09:42:25.000000000 +0200 ++++ soci-3.0.0_4-pack/src/core/soci-simple.cpp 2009-05-05 23:33:57.000000000 +0200 +@@ -9,6 +9,8 @@ + + #include "soci-simple.h" + #include "soci.h" ++// ++#include + + using namespace soci; + soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:14:46 -0000 1.2 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:59:10 -0000 1.3 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 22:51:55.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 23:31:06.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-05 22:52:01.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-05 22:52:01.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-05 23:31:12.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-05 23:06:26.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-05 22:51:58.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-05 23:39:48.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-05 23:31:09.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="8" ++RPM_RELEASE="9" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-05 22:33:10.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-05 23:30:10.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="8" ++RPM_RELEASE="9" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:39:48.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 23:31:14.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 22:52:00.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 23:31:11.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57505,7 +57505,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57586,7 +57586,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58545,7 +58545,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:39:49.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 @@ -8,14 +8,24 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58598,7 +58598,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 23:31:15.000000000 +0200 @@ -0,0 +1,470 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59091,7 +59091,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 23:31:13.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59866,8 +59866,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 22:33:42.000000000 +0200 -@@ -0,0 +1,300 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 23:30:38.000000000 +0200 +@@ -0,0 +1,303 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60145,6 +60145,9 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-9 ++- Added a missing cstdio header include for g++-4.4 compatibility ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-8 +- Added missing cstdio header includes for g++-4.4 compatibility + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci.spec 5 May 2009 21:14:46 -0000 1.3 +++ soci.spec 5 May 2009 21:59:10 -0000 1.4 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: The database access library for C++ programmers @@ -275,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-9 +- Added a missing cstdio header include for g++-4.4 compatibility + * Tue May 05 2009 Denis Arnaud 3.0.0-8 - Added missing cstdio header includes for g++-4.4 compatibility From slankes at fedoraproject.org Tue May 5 22:05:39 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Tue, 5 May 2009 22:05:39 +0000 (UTC) Subject: rpms/qca2/F-10 .cvsignore, 1.3, 1.4 qca2.spec, 1.8, 1.9 sources, 1.3, 1.4 qca2-2.0.0-64bits.patch, 1.1, NONE Message-ID: <20090505220539.25C2A70108@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/qca2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13923 Modified Files: .cvsignore qca2.spec sources Removed Files: qca2-2.0.0-64bits.patch Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qca2/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 21 Oct 2007 21:16:56 -0000 1.3 +++ .cvsignore 5 May 2009 22:05:08 -0000 1.4 @@ -1 +1 @@ -qca-2.0.0.tar.bz2 +qca-2.0.2.tar.bz2 Index: qca2.spec =================================================================== RCS file: /cvs/pkgs/rpms/qca2/F-10/qca2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- qca2.spec 31 May 2008 02:42:17 -0000 1.8 +++ qca2.spec 5 May 2009 22:05:08 -0000 1.9 @@ -1,6 +1,6 @@ Name: qca2 -Version: 2.0.0 -Release: 3%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Qt Cryptographic Architecture @@ -8,13 +8,9 @@ Group: System Environment/Libra License: LGPLv2+ URL: http://delta.affinix.com/qca Source0: http://delta.affinix.com/download/qca/2.0/qca-%{version}.tar.bz2 -# Fix build on x86_64 -Patch0: qca2-2.0.0-64bits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel -# For certstore -BuildRequires: openssl %description Taking a hint from the similarly-named Java Cryptography Architecture, @@ -37,8 +33,6 @@ This packages contains the development f %prep %setup -q -n qca-%{version} -%patch0 -p0 -b .64bits - %build unset QTDIR @@ -84,6 +78,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Sven Lankes - 2.0.2-1 +- new upstream release - qt 4.5-compat-fixes + +* Wed Apr 08 2009 Sven Lankes - 2.0.1-1 +- new upstream release +- removed 64bit patch - now upstream + +* Wed Feb 25 2009 Fedora Release Engineering - 2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri May 30 2008 Dennis Gilmore - 2.0.0-3 - crypto.prf is in libdir not datadir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qca2/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 21 Oct 2007 21:16:56 -0000 1.3 +++ sources 5 May 2009 22:05:08 -0000 1.4 @@ -1 +1 @@ -07d54358ef4880d05b3c6f56b629aa55 qca-2.0.0.tar.bz2 +27ebdfbd9869d90dae078a6decd029f4 qca-2.0.2.tar.bz2 --- qca2-2.0.0-64bits.patch DELETED --- From pkgdb at fedoraproject.org Tue May 5 22:06:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 22:06:02 +0000 Subject: [pkgdb] qca2: slankes has requested watchbugzilla Message-ID: <20090505220602.88FFD10F893@bastion2.fedora.phx.redhat.com> slankes has requested the watchbugzilla acl on qca2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qca2 From pkgdb at fedoraproject.org Tue May 5 22:06:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 22:06:03 +0000 Subject: [pkgdb] qca2: slankes has requested watchcommits Message-ID: <20090505220603.50A4110F8A0@bastion2.fedora.phx.redhat.com> slankes has requested the watchcommits acl on qca2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qca2 From pkgdb at fedoraproject.org Tue May 5 22:06:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 05 May 2009 22:06:07 +0000 Subject: [pkgdb] qca2: slankes has requested commit Message-ID: <20090505220607.358EA10F8A3@bastion2.fedora.phx.redhat.com> slankes has requested the commit acl on qca2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qca2 From slankes at fedoraproject.org Tue May 5 22:06:54 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Tue, 5 May 2009 22:06:54 +0000 (UTC) Subject: rpms/qca2/F-11 .cvsignore, 1.4, 1.5 qca2.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <20090505220654.E397C70108@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/qca2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14086 Modified Files: .cvsignore qca2.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qca2/F-11/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 8 Apr 2009 18:52:42 -0000 1.4 +++ .cvsignore 5 May 2009 22:06:24 -0000 1.5 @@ -1 +1 @@ -qca-2.0.1.tar.bz2 +qca-2.0.2.tar.bz2 Index: qca2.spec =================================================================== RCS file: /cvs/pkgs/rpms/qca2/F-11/qca2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- qca2.spec 8 Apr 2009 19:41:58 -0000 1.11 +++ qca2.spec 5 May 2009 22:06:24 -0000 1.12 @@ -1,5 +1,5 @@ Name: qca2 -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} Summary: Qt Cryptographic Architecture @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Sven Lankes - 2.0.2-1 +- new upstream release - qt 4.5-compat-fixes + * Wed Apr 08 2009 Sven Lankes - 2.0.1-1 - new upstream release - removed 64bit patch - now upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qca2/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 8 Apr 2009 18:52:42 -0000 1.4 +++ sources 5 May 2009 22:06:24 -0000 1.5 @@ -1 +1 @@ -a0a87d0b3210e23f8c1713562282b7d6 qca-2.0.1.tar.bz2 +27ebdfbd9869d90dae078a6decd029f4 qca-2.0.2.tar.bz2 From denisarnaud at fedoraproject.org Tue May 5 22:40:22 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 22:40:22 +0000 (UTC) Subject: rpms/soci/F-11 import.log, 1.4, 1.5 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.3, 1.4 soci.spec, 1.4, 1.5 Message-ID: <20090505224022.7CA4870108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18385/F-11 Modified Files: import.log soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-10 - Burried the Boost Fusion header include for core/test/common-tests.h Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- import.log 5 May 2009 21:59:10 -0000 1.4 +++ import.log 5 May 2009 22:39:49 -0000 1.5 @@ -2,3 +2,4 @@ soci-3_0_0-6_fc10:F-11:soci-3.0.0-6.fc10 soci-3_0_0-7_fc10:F-11:soci-3.0.0-7.fc10.src.rpm:1241550507 soci-3_0_0-8_fc10:F-11:soci-3.0.0-8.fc10.src.rpm:1241557840 soci-3_0_0-9_fc10:F-11:soci-3.0.0-9.fc10.src.rpm:1241560148 +soci-3_0_0-10_fc10:F-11:soci-3.0.0-10.fc10.src.rpm:1241562900 soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:59:10 -0000 1.3 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 22:39:49 -0000 1.4 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 23:31:06.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 00:29:55.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-06 00:30:09.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-06 00:30:09.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-05 23:39:48.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-05 23:31:09.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-06 00:31:55.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-06 00:30:03.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="9" ++RPM_RELEASE="10" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-05 23:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-06 00:13:26.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="9" ++RPM_RELEASE="10" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 23:31:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 00:30:07.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57474,8 +57474,8 @@ diff -Nur soci-3.0.0_4-pack/soci/config. +#undef VERSION diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.am soci-3.0.0_trep300/soci/core/Makefile.am --- soci-3.0.0_4-pack/soci/core/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.am 2009-04-16 19:37:05.000000000 +0200 -@@ -0,0 +1,28 @@ ++++ soci-3.0.0_trep300/soci/core/Makefile.am 2009-05-06 00:28:10.000000000 +0200 +@@ -0,0 +1,29 @@ +## core sub-directory +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk @@ -57504,8 +57504,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +soci_include_dir = $(includedir) +endif +pkgincludedir = $(soci_include_dir) ++ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57586,7 +57587,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58545,9 +58546,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:39:49.000000000 +0200 -+++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 -@@ -8,14 +8,24 @@ +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 00:31:55.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-05-06 00:02:36.000000000 +0200 +@@ -8,16 +8,30 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED #define SOCI_COMMON_TESTS_H_INCLUDED @@ -58575,31 +58576,48 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te -#include -#include #if defined(BOOST_VERSION) && BOOST_VERSION >= 103500 ++#if defined(SOCI_HEADERS_BURIED) ++#include ++#else #include ++#endif #endif // BOOST_VERSION + + #include diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.am soci-3.0.0_trep300/soci/core/test/Makefile.am --- soci-3.0.0_4-pack/soci/core/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.am 2009-04-16 19:37:05.000000000 +0200 -@@ -0,0 +1,15 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.am 2009-05-06 00:29:06.000000000 +0200 +@@ -0,0 +1,26 @@ +## core sub-directory +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk + +MAINTAINERCLEANFILES = Makefile.in + ++EXTRA_DIST_FOR_SOCI_COMPATIBILITY = ++ ++EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) ++ +noinst_LTLIBRARIES= libsoci_core_test.la + +libsoci_core_test_la_SOURCES= $(core_test_h_sources) +libsoci_core_test_la_CXXFLAGS = +libsoci_core_test_la_LIBADD = -+libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++#libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++libsoci_core_test_la_LDFLAGS = ++ ++pkginclude_HEADERS = $(core_test_h_sources) ++if SOCI_HEADERS_BURIED ++soci_include_dir = $(includedir)/soci/core/test ++else ++soci_include_dir = $(includedir) ++endif ++pkgincludedir = $(soci_include_dir) + -+#nodist_pkginclude_HEADERS = $(core_test_h_sources) -+#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 23:31:15.000000000 +0200 -@@ -0,0 +1,470 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 00:30:13.000000000 +0200 +@@ -0,0 +1,505 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + @@ -58616,10 +58634,10 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + + at SET_MAKE@ + ++ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c @@ -58634,8 +58652,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/sources.mk $(top_srcdir)/Makefile.common ++DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/sources.mk \ ++ $(top_srcdir)/Makefile.common +subdir = soci/core/test +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \ @@ -58668,9 +58687,19 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + $(LDFLAGS) -o $@ +SOURCES = $(libsoci_core_test_la_SOURCES) +DIST_SOURCES = $(libsoci_core_test_la_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(pkgincludedir)" ++pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(pkginclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++pkgincludedir = $(soci_include_dir) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ @@ -58828,11 +58857,17 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +core_test_h_sources = $(top_srcdir)/soci/core/test/common-tests.h +core_test_cc_sources = +MAINTAINERCLEANFILES = Makefile.in ++EXTRA_DIST_FOR_SOCI_COMPATIBILITY = ++EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) +noinst_LTLIBRARIES = libsoci_core_test.la +libsoci_core_test_la_SOURCES = $(core_test_h_sources) +libsoci_core_test_la_CXXFLAGS = +libsoci_core_test_la_LIBADD = -+libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++#libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++libsoci_core_test_la_LDFLAGS = ++pkginclude_HEADERS = $(core_test_h_sources) ++ at SOCI_HEADERS_BURIED_FALSE@soci_include_dir = $(includedir) ++ at SOCI_HEADERS_BURIED_TRUE@soci_include_dir = $(includedir)/soci/core/test +all: all-am + +.SUFFIXES: @@ -58888,6 +58923,23 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +clean-libtool: + -rm -rf .libs _libs ++install-pkgincludeHEADERS: $(pkginclude_HEADERS) ++ @$(NORMAL_INSTALL) ++ test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" ++ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ done ++ ++uninstall-pkgincludeHEADERS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -58964,8 +59016,11 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + done +check-am: all-am +check: check-am -+all-am: Makefile $(LTLIBRARIES) ++all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: ++ for dir in "$(DESTDIR)$(pkgincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am @@ -59011,7 +59066,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +info-am: + -+install-data-am: ++install-data-am: install-pkgincludeHEADERS + +install-dvi: install-dvi-am + @@ -59046,7 +59101,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +ps-am: + -+uninstall-am: ++uninstall-am: uninstall-pkgincludeHEADERS + +.MAKE: install-am install-strip + @@ -59057,16 +59112,14 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am ++ install-pdf install-pdf-am install-pkgincludeHEADERS \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-pkgincludeHEADERS + + at SET_MAKE@ -+ -+#nodist_pkginclude_HEADERS = $(core_test_h_sources) -+#pkgincludedir = $(includedir)/soci/core +# 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. +.NOEXPORT: @@ -59091,7 +59144,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59866,8 +59919,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 23:30:38.000000000 +0200 -@@ -0,0 +1,303 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 00:22:28.000000000 +0200 +@@ -0,0 +1,308 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60109,8 +60162,10 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} ++%dir %{_includedir}/%{name}/core +%{_includedir}/%{name}/*.h -+%{_includedir}/%{name}/core ++%{_includedir}/%{name}/core/*.h ++%{_includedir}/%{name}/core/test +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}_core.so +%{_libdir}/pkgconfig/%{name}.pc @@ -60145,6 +60200,9 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-10 ++- Burried the Boost Fusion header include for core/test/common-tests.h ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-9 +- Added a missing cstdio header include for g++-4.4 compatibility + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-11/soci.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- soci.spec 5 May 2009 21:59:10 -0000 1.4 +++ soci.spec 5 May 2009 22:39:50 -0000 1.5 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The database access library for C++ programmers @@ -239,8 +239,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/core %{_includedir}/%{name}/*.h -%{_includedir}/%{name}/core +%{_includedir}/%{name}/core/*.h +%{_includedir}/%{name}/core/test %{_bindir}/%{name}-config %{_libdir}/lib%{name}_core.so %{_libdir}/pkgconfig/%{name}.pc @@ -275,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-10 +- Burried the Boost Fusion header include for core/test/common-tests.h + * Tue May 05 2009 Denis Arnaud 3.0.0-9 - Added a missing cstdio header include for g++-4.4 compatibility From mbarnes at fedoraproject.org Tue May 5 22:45:25 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Tue, 5 May 2009 22:45:25 +0000 (UTC) Subject: rpms/pygobject2/F-11 pygobject-2.16.1-classic-classes.patch, NONE, 1.1 pygobject2.spec, 1.48, 1.49 Message-ID: <20090505224525.91F2170108@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/pygobject2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19208 Modified Files: pygobject2.spec Added Files: pygobject-2.16.1-classic-classes.patch Log Message: * Wed Apr 22 2009 Matthew Barnes - 2.16.1-4.fc11 - Add patch for GNOME bug #566571 (classic vs new-style inheritance crash). pygobject-2.16.1-classic-classes.patch: --- NEW FILE pygobject-2.16.1-classic-classes.patch --- diff -up pygobject-2.16.1/gobject/gobjectmodule.c.classic-classes pygobject-2.16.1/gobject/gobjectmodule.c --- pygobject-2.16.1/gobject/gobjectmodule.c.classic-classes 2009-02-20 16:48:29.000000000 -0500 +++ pygobject-2.16.1/gobject/gobjectmodule.c 2009-05-05 18:21:45.000000000 -0400 @@ -1079,16 +1079,20 @@ pyg_type_add_interfaces(PyTypeObject *cl for (i = 0; i < PyTuple_GET_SIZE(bases); ++i) { guint k; - PyTypeObject *base = (PyTypeObject *) PyTuple_GET_ITEM(bases, i); + PyObject *base = PyTuple_GET_ITEM(bases, i); GType itype; gboolean is_new = TRUE; const GInterfaceInfo *iinfo; GInterfaceInfo iinfo_copy; - if (!PyType_IsSubtype(base, &PyGInterface_Type)) + /* 'base' can also be a PyClassObject, see bug #566571. */ + if (!PyType_Check(base)) continue; - itype = pyg_type_from_object((PyObject *) base); + if (!PyType_IsSubtype((PyTypeObject*) base, &PyGInterface_Type)) + continue; + + itype = pyg_type_from_object(base); /* Happens for _implementations_ of an interface. */ if (!G_TYPE_IS_INTERFACE(itype)) @@ -1109,7 +1113,7 @@ pyg_type_add_interfaces(PyTypeObject *cl gchar *error; error = g_strdup_printf("Interface type %s " "has no Python implementation support", - base->tp_name); + ((PyTypeObject *) base)->tp_name); PyErr_Warn(PyExc_RuntimeWarning, error); g_free(error); continue; Index: pygobject2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/F-11/pygobject2.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- pygobject2.spec 26 Feb 2009 20:00:16 -0000 1.48 +++ pygobject2.spec 5 May 2009 22:44:55 -0000 1.49 @@ -18,6 +18,8 @@ Source: pygobject-%{version}.tar.bz2 ### Patches ### +Patch1: pygobject-2.16.1-classic-classes.patch + ### Build Dependencies ### BuildRequires: automake @@ -59,6 +61,7 @@ This package contains documentation file %prep %setup -q -n pygobject-%{version} +%patch1 -p1 -b .classic-classes %build %configure --enable-thread @@ -113,6 +116,9 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/pygobject/xsl %changelog +* Wed Apr 22 2009 Matthew Barnes - 2.16.1-4.fc11 +- Add patch for GNOME bug #566571 (classic vs new-style inheritance crash). + * Thu Feb 26 2009 Fedora Release Engineering - 2.16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From denisarnaud at fedoraproject.org Tue May 5 22:46:11 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 22:46:11 +0000 (UTC) Subject: rpms/soci/devel import.log, 1.4, 1.5 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.3, 1.4 soci.spec, 1.4, 1.5 Message-ID: <20090505224611.A69DE70108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19162/devel Modified Files: import.log soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-10 - Burried the Boost Fusion header include for core/test/common-tests.h Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- import.log 5 May 2009 21:46:02 -0000 1.4 +++ import.log 5 May 2009 22:45:40 -0000 1.5 @@ -2,3 +2,4 @@ soci-3_0_0-6_fc10:HEAD:soci-3.0.0-6.fc10 soci-3_0_0-7_fc10:HEAD:soci-3.0.0-7.fc10.src.rpm:1241549903 soci-3_0_0-8_fc10:HEAD:soci-3.0.0-8.fc10.src.rpm:1241558219 soci-3_0_0-9_fc10:HEAD:soci-3.0.0-9.fc10.src.rpm:1241559732 +soci-3_0_0-10_fc10:HEAD:soci-3.0.0-10.fc10.src.rpm:1241563311 soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:46:02 -0000 1.3 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 22:45:40 -0000 1.4 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 23:31:06.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 00:29:55.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-06 00:30:09.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-05 23:31:12.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-06 00:30:09.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-05 23:39:48.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-05 23:31:09.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-06 00:31:55.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-06 00:30:03.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="9" ++RPM_RELEASE="10" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-05 23:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-06 00:13:26.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="9" ++RPM_RELEASE="10" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:39:48.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 23:31:14.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 23:31:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 00:30:07.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57474,8 +57474,8 @@ diff -Nur soci-3.0.0_4-pack/soci/config. +#undef VERSION diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.am soci-3.0.0_trep300/soci/core/Makefile.am --- soci-3.0.0_4-pack/soci/core/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.am 2009-04-16 19:37:05.000000000 +0200 -@@ -0,0 +1,28 @@ ++++ soci-3.0.0_trep300/soci/core/Makefile.am 2009-05-06 00:28:10.000000000 +0200 +@@ -0,0 +1,29 @@ +## core sub-directory +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk @@ -57504,8 +57504,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +soci_include_dir = $(includedir) +endif +pkgincludedir = $(soci_include_dir) ++ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:39:49.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57586,7 +57587,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 23:31:15.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58545,9 +58546,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:39:49.000000000 +0200 -+++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 -@@ -8,14 +8,24 @@ +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 00:31:55.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-05-06 00:02:36.000000000 +0200 +@@ -8,16 +8,30 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED #define SOCI_COMMON_TESTS_H_INCLUDED @@ -58575,31 +58576,48 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te -#include -#include #if defined(BOOST_VERSION) && BOOST_VERSION >= 103500 ++#if defined(SOCI_HEADERS_BURIED) ++#include ++#else #include ++#endif #endif // BOOST_VERSION + + #include diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.am soci-3.0.0_trep300/soci/core/test/Makefile.am --- soci-3.0.0_4-pack/soci/core/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.am 2009-04-16 19:37:05.000000000 +0200 -@@ -0,0 +1,15 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.am 2009-05-06 00:29:06.000000000 +0200 +@@ -0,0 +1,26 @@ +## core sub-directory +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk + +MAINTAINERCLEANFILES = Makefile.in + ++EXTRA_DIST_FOR_SOCI_COMPATIBILITY = ++ ++EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) ++ +noinst_LTLIBRARIES= libsoci_core_test.la + +libsoci_core_test_la_SOURCES= $(core_test_h_sources) +libsoci_core_test_la_CXXFLAGS = +libsoci_core_test_la_LIBADD = -+libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++#libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++libsoci_core_test_la_LDFLAGS = ++ ++pkginclude_HEADERS = $(core_test_h_sources) ++if SOCI_HEADERS_BURIED ++soci_include_dir = $(includedir)/soci/core/test ++else ++soci_include_dir = $(includedir) ++endif ++pkgincludedir = $(soci_include_dir) + -+#nodist_pkginclude_HEADERS = $(core_test_h_sources) -+#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 23:31:15.000000000 +0200 -@@ -0,0 +1,470 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 00:30:13.000000000 +0200 +@@ -0,0 +1,505 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + @@ -58616,10 +58634,10 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + + at SET_MAKE@ + ++ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c @@ -58634,8 +58652,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/sources.mk $(top_srcdir)/Makefile.common ++DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/sources.mk \ ++ $(top_srcdir)/Makefile.common +subdir = soci/core/test +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \ @@ -58668,9 +58687,19 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + $(LDFLAGS) -o $@ +SOURCES = $(libsoci_core_test_la_SOURCES) +DIST_SOURCES = $(libsoci_core_test_la_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(pkgincludedir)" ++pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(pkginclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++pkgincludedir = $(soci_include_dir) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ @@ -58828,11 +58857,17 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +core_test_h_sources = $(top_srcdir)/soci/core/test/common-tests.h +core_test_cc_sources = +MAINTAINERCLEANFILES = Makefile.in ++EXTRA_DIST_FOR_SOCI_COMPATIBILITY = ++EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) +noinst_LTLIBRARIES = libsoci_core_test.la +libsoci_core_test_la_SOURCES = $(core_test_h_sources) +libsoci_core_test_la_CXXFLAGS = +libsoci_core_test_la_LIBADD = -+libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++#libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++libsoci_core_test_la_LDFLAGS = ++pkginclude_HEADERS = $(core_test_h_sources) ++ at SOCI_HEADERS_BURIED_FALSE@soci_include_dir = $(includedir) ++ at SOCI_HEADERS_BURIED_TRUE@soci_include_dir = $(includedir)/soci/core/test +all: all-am + +.SUFFIXES: @@ -58888,6 +58923,23 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +clean-libtool: + -rm -rf .libs _libs ++install-pkgincludeHEADERS: $(pkginclude_HEADERS) ++ @$(NORMAL_INSTALL) ++ test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" ++ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ done ++ ++uninstall-pkgincludeHEADERS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -58964,8 +59016,11 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + done +check-am: all-am +check: check-am -+all-am: Makefile $(LTLIBRARIES) ++all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: ++ for dir in "$(DESTDIR)$(pkgincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am @@ -59011,7 +59066,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +info-am: + -+install-data-am: ++install-data-am: install-pkgincludeHEADERS + +install-dvi: install-dvi-am + @@ -59046,7 +59101,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +ps-am: + -+uninstall-am: ++uninstall-am: uninstall-pkgincludeHEADERS + +.MAKE: install-am install-strip + @@ -59057,16 +59112,14 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am ++ install-pdf install-pdf-am install-pkgincludeHEADERS \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-pkgincludeHEADERS + + at SET_MAKE@ -+ -+#nodist_pkginclude_HEADERS = $(core_test_h_sources) -+#pkgincludedir = $(includedir)/soci/core +# 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. +.NOEXPORT: @@ -59091,7 +59144,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 23:31:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59866,8 +59919,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 23:30:38.000000000 +0200 -@@ -0,0 +1,303 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 00:22:28.000000000 +0200 +@@ -0,0 +1,308 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60109,8 +60162,10 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} ++%dir %{_includedir}/%{name}/core +%{_includedir}/%{name}/*.h -+%{_includedir}/%{name}/core ++%{_includedir}/%{name}/core/*.h ++%{_includedir}/%{name}/core/test +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}_core.so +%{_libdir}/pkgconfig/%{name}.pc @@ -60145,6 +60200,9 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-10 ++- Burried the Boost Fusion header include for core/test/common-tests.h ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-9 +- Added a missing cstdio header include for g++-4.4 compatibility + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- soci.spec 5 May 2009 21:46:02 -0000 1.4 +++ soci.spec 5 May 2009 22:45:41 -0000 1.5 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The database access library for C++ programmers @@ -239,8 +239,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/core %{_includedir}/%{name}/*.h -%{_includedir}/%{name}/core +%{_includedir}/%{name}/core/*.h +%{_includedir}/%{name}/core/test %{_bindir}/%{name}-config %{_libdir}/lib%{name}_core.so %{_libdir}/pkgconfig/%{name}.pc @@ -275,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-10 +- Burried the Boost Fusion header include for core/test/common-tests.h + * Tue May 05 2009 Denis Arnaud 3.0.0-9 - Added a missing cstdio header include for g++-4.4 compatibility From mbarnes at fedoraproject.org Tue May 5 22:49:25 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Tue, 5 May 2009 22:49:25 +0000 (UTC) Subject: rpms/pygobject2/F-11 pygobject2.spec,1.49,1.50 Message-ID: <20090505224925.26EB170108@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/pygobject2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20451 Modified Files: pygobject2.spec Log Message: Bump the release. Index: pygobject2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/F-11/pygobject2.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- pygobject2.spec 5 May 2009 22:44:55 -0000 1.49 +++ pygobject2.spec 5 May 2009 22:48:54 -0000 1.50 @@ -8,7 +8,7 @@ Name: pygobject2 Version: 2.16.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GObject From denisarnaud at fedoraproject.org Tue May 5 22:52:45 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 22:52:45 +0000 (UTC) Subject: rpms/soci/F-10 import.log, 1.2, 1.3 soci-3.0.0-fix-gcc43-compatibility.patch, 1.2, 1.3 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.2, 1.3 soci.spec, 1.2, 1.3 Message-ID: <20090505225245.0784E70108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20693/F-10 Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-10 - Burried the Boost Fusion header include for core/test/common-tests.h Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 5 May 2009 21:29:52 -0000 1.2 +++ import.log 5 May 2009 22:52:13 -0000 1.3 @@ -1,2 +1,3 @@ soci-3_0_0-6_fc10:F-10:soci-3.0.0-6.fc10.src.rpm:1241474307 soci-3_0_0-8_fc10:F-10:soci-3.0.0-8.fc10.src.rpm:1241558624 +soci-3_0_0-10_fc10:F-10:soci-3.0.0-10.fc10.src.rpm:1241563665 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 21:29:52 -0000 1.2 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 22:52:13 -0000 1.3 @@ -1,6 +1,6 @@ -diff -ur soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h +diff -ru soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h --- soci-3.0.0/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 23:32:22.000000000 +0200 @@ -10,6 +10,7 @@ #include @@ -9,9 +9,9 @@ diff -ur soci-3.0.0/src/backends/mysql/c namespace soci { -diff -ur soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp +diff -ru soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp --- soci-3.0.0/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -11,7 +11,8 @@ #include #include @@ -22,9 +22,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp --- soci-3.0.0/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 22:44:49.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -12,6 +12,8 @@ #include "common.h" #include @@ -34,9 +34,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp --- soci-3.0.0/src/backends/mysql/standard-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 22:48:13.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -9,9 +9,16 @@ #define SOCI_MYSQL_SOURCE #include "soci-mysql.h" @@ -55,9 +55,9 @@ diff -ur soci-3.0.0/src/backends/mysql/s #include #ifdef _MSC_VER -diff -ur soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp +diff -ru soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp --- soci-3.0.0/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 22:48:23.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -9,10 +9,18 @@ #define SOCI_MYSQL_SOURCE #include "soci-mysql.h" @@ -78,9 +78,9 @@ diff -ur soci-3.0.0/src/backends/mysql/v #ifdef _MSC_VER #pragma warning(disable:4355) -diff -ur soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp +diff -ru soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp --- soci-3.0.0/src/backends/postgresql/common.cpp 2008-06-27 16:38:05.000000000 +0200 -+++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 22:47:18.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -6,8 +6,15 @@ // @@ -98,3 +98,15 @@ diff -ur soci-3.0.0/src/backends/postgre #include +diff -ru soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp +--- soci-3.0.0/src/core/soci-simple.cpp 2008-07-01 09:42:25.000000000 +0200 ++++ soci-3.0.0_4-pack/src/core/soci-simple.cpp 2009-05-05 23:33:57.000000000 +0200 +@@ -9,6 +9,8 @@ + + #include "soci-simple.h" + #include "soci.h" ++// ++#include + + using namespace soci; + soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 21:29:52 -0000 1.2 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 22:52:13 -0000 1.3 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-05 22:51:55.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 00:29:55.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-05 22:52:01.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-06 00:30:09.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-05 22:52:01.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-06 00:30:09.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-05 23:06:26.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-05 22:51:58.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-06 00:31:55.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-06 00:30:03.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="8" ++RPM_RELEASE="10" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-05 22:33:10.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-06 00:13:26.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="8" ++RPM_RELEASE="10" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-05 22:52:05.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-05 22:52:03.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-05 23:06:26.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-05 22:52:00.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 00:30:07.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57474,8 +57474,8 @@ diff -Nur soci-3.0.0_4-pack/soci/config. +#undef VERSION diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.am soci-3.0.0_trep300/soci/core/Makefile.am --- soci-3.0.0_4-pack/soci/core/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.am 2009-04-16 19:37:05.000000000 +0200 -@@ -0,0 +1,28 @@ ++++ soci-3.0.0_trep300/soci/core/Makefile.am 2009-05-06 00:28:10.000000000 +0200 +@@ -0,0 +1,29 @@ +## core sub-directory +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk @@ -57504,8 +57504,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +soci_include_dir = $(includedir) +endif +pkgincludedir = $(soci_include_dir) ++ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-05 23:06:27.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57586,7 +57587,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-05 22:52:04.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58545,9 +58546,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-05 23:06:27.000000000 +0200 -+++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 -@@ -8,14 +8,24 @@ +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 00:31:55.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-05-06 00:02:36.000000000 +0200 +@@ -8,16 +8,30 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED #define SOCI_COMMON_TESTS_H_INCLUDED @@ -58575,31 +58576,48 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te -#include -#include #if defined(BOOST_VERSION) && BOOST_VERSION >= 103500 ++#if defined(SOCI_HEADERS_BURIED) ++#include ++#else #include ++#endif #endif // BOOST_VERSION + + #include diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.am soci-3.0.0_trep300/soci/core/test/Makefile.am --- soci-3.0.0_4-pack/soci/core/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.am 2009-04-16 19:37:05.000000000 +0200 -@@ -0,0 +1,15 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.am 2009-05-06 00:29:06.000000000 +0200 +@@ -0,0 +1,26 @@ +## core sub-directory +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk + +MAINTAINERCLEANFILES = Makefile.in + ++EXTRA_DIST_FOR_SOCI_COMPATIBILITY = ++ ++EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) ++ +noinst_LTLIBRARIES= libsoci_core_test.la + +libsoci_core_test_la_SOURCES= $(core_test_h_sources) +libsoci_core_test_la_CXXFLAGS = +libsoci_core_test_la_LIBADD = -+libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++#libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++libsoci_core_test_la_LDFLAGS = ++ ++pkginclude_HEADERS = $(core_test_h_sources) ++if SOCI_HEADERS_BURIED ++soci_include_dir = $(includedir)/soci/core/test ++else ++soci_include_dir = $(includedir) ++endif ++pkgincludedir = $(soci_include_dir) + -+#nodist_pkginclude_HEADERS = $(core_test_h_sources) -+#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-05 22:52:04.000000000 +0200 -@@ -0,0 +1,470 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 00:30:13.000000000 +0200 +@@ -0,0 +1,505 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + @@ -58616,10 +58634,10 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + + at SET_MAKE@ + ++ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c @@ -58634,8 +58652,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/sources.mk $(top_srcdir)/Makefile.common ++DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/sources.mk \ ++ $(top_srcdir)/Makefile.common +subdir = soci/core/test +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \ @@ -58668,9 +58687,19 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + $(LDFLAGS) -o $@ +SOURCES = $(libsoci_core_test_la_SOURCES) +DIST_SOURCES = $(libsoci_core_test_la_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(pkgincludedir)" ++pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(pkginclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++pkgincludedir = $(soci_include_dir) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ @@ -58828,11 +58857,17 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +core_test_h_sources = $(top_srcdir)/soci/core/test/common-tests.h +core_test_cc_sources = +MAINTAINERCLEANFILES = Makefile.in ++EXTRA_DIST_FOR_SOCI_COMPATIBILITY = ++EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) +noinst_LTLIBRARIES = libsoci_core_test.la +libsoci_core_test_la_SOURCES = $(core_test_h_sources) +libsoci_core_test_la_CXXFLAGS = +libsoci_core_test_la_LIBADD = -+libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++#libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++libsoci_core_test_la_LDFLAGS = ++pkginclude_HEADERS = $(core_test_h_sources) ++ at SOCI_HEADERS_BURIED_FALSE@soci_include_dir = $(includedir) ++ at SOCI_HEADERS_BURIED_TRUE@soci_include_dir = $(includedir)/soci/core/test +all: all-am + +.SUFFIXES: @@ -58888,6 +58923,23 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +clean-libtool: + -rm -rf .libs _libs ++install-pkgincludeHEADERS: $(pkginclude_HEADERS) ++ @$(NORMAL_INSTALL) ++ test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" ++ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ done ++ ++uninstall-pkgincludeHEADERS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -58964,8 +59016,11 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + done +check-am: all-am +check: check-am -+all-am: Makefile $(LTLIBRARIES) ++all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: ++ for dir in "$(DESTDIR)$(pkgincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am @@ -59011,7 +59066,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +info-am: + -+install-data-am: ++install-data-am: install-pkgincludeHEADERS + +install-dvi: install-dvi-am + @@ -59046,7 +59101,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +ps-am: + -+uninstall-am: ++uninstall-am: uninstall-pkgincludeHEADERS + +.MAKE: install-am install-strip + @@ -59057,16 +59112,14 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am ++ install-pdf install-pdf-am install-pkgincludeHEADERS \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-pkgincludeHEADERS + + at SET_MAKE@ -+ -+#nodist_pkginclude_HEADERS = $(core_test_h_sources) -+#pkgincludedir = $(includedir)/soci/core +# 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. +.NOEXPORT: @@ -59091,7 +59144,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-05 22:52:02.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59866,8 +59919,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-05 22:33:42.000000000 +0200 -@@ -0,0 +1,300 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 00:22:28.000000000 +0200 +@@ -0,0 +1,308 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60109,8 +60162,10 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} ++%dir %{_includedir}/%{name}/core +%{_includedir}/%{name}/*.h -+%{_includedir}/%{name}/core ++%{_includedir}/%{name}/core/*.h ++%{_includedir}/%{name}/core/test +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}_core.so +%{_libdir}/pkgconfig/%{name}.pc @@ -60145,6 +60200,12 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-10 ++- Burried the Boost Fusion header include for core/test/common-tests.h ++ ++* Tue May 05 2009 Denis Arnaud 3.0.0-9 ++- Added a missing cstdio header include for g++-4.4 compatibility ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-8 +- Added missing cstdio header includes for g++-4.4 compatibility + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/soci.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci.spec 5 May 2009 21:29:52 -0000 1.2 +++ soci.spec 5 May 2009 22:52:14 -0000 1.3 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 8%{?dist} +Release: 10%{?dist} Summary: The database access library for C++ programmers @@ -239,8 +239,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/core %{_includedir}/%{name}/*.h -%{_includedir}/%{name}/core +%{_includedir}/%{name}/core/*.h +%{_includedir}/%{name}/core/test %{_bindir}/%{name}-config %{_libdir}/lib%{name}_core.so %{_libdir}/pkgconfig/%{name}.pc @@ -275,6 +277,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-10 +- Burried the Boost Fusion header include for core/test/common-tests.h + +* Tue May 05 2009 Denis Arnaud 3.0.0-9 +- Added a missing cstdio header include for g++-4.4 compatibility + * Tue May 05 2009 Denis Arnaud 3.0.0-8 - Added missing cstdio header includes for g++-4.4 compatibility From denisarnaud at fedoraproject.org Tue May 5 22:58:35 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 22:58:35 +0000 (UTC) Subject: rpms/soci/EL-5 import.log, 1.1, 1.2 soci-3.0.0-fix-gcc43-compatibility.patch, 1.1, 1.2 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.1, 1.2 soci.spec, 1.1, 1.2 Message-ID: <20090505225835.3F56E70108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21533/EL-5 Modified Files: import.log soci-3.0.0-fix-gcc43-compatibility.patch soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-10 - Burried the Boost Fusion header include for core/test/common-tests.h Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 4 May 2009 22:16:19 -0000 1.1 +++ import.log 5 May 2009 22:58:03 -0000 1.2 @@ -1 +1,2 @@ soci-3_0_0-6_fc10:EL-5:soci-3.0.0-6.fc10.src.rpm:1241475130 +soci-3_0_0-10_fc10:EL-5:soci-3.0.0-10.fc10.src.rpm:1241564064 soci-3.0.0-fix-gcc43-compatibility.patch: Index: soci-3.0.0-fix-gcc43-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/soci-3.0.0-fix-gcc43-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci-3.0.0-fix-gcc43-compatibility.patch 4 May 2009 22:16:19 -0000 1.1 +++ soci-3.0.0-fix-gcc43-compatibility.patch 5 May 2009 22:58:03 -0000 1.2 @@ -1,17 +1,17 @@ -diff -u -r soci-3.0.0_ref/src/backends/mysql/common.h soci-3.0.0_working/src/backends/mysql/common.h ---- soci-3.0.0_ref/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/common.h 2009-03-26 15:33:33.000000000 +0100 +diff -ru soci-3.0.0/src/backends/mysql/common.h soci-3.0.0_4-pack/src/backends/mysql/common.h +--- soci-3.0.0/src/backends/mysql/common.h 2008-07-03 09:22:57.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/common.h 2009-05-05 23:32:22.000000000 +0200 @@ -10,6 +10,7 @@ - + #include #include "soci-mysql.h" +#include - + namespace soci { -diff -u -r soci-3.0.0_ref/src/backends/mysql/session.cpp soci-3.0.0_working/src/backends/mysql/session.cpp ---- soci-3.0.0_ref/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/session.cpp 2009-03-26 15:34:50.000000000 +0100 +diff -ru soci-3.0.0/src/backends/mysql/session.cpp soci-3.0.0_4-pack/src/backends/mysql/session.cpp +--- soci-3.0.0/src/backends/mysql/session.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/session.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -11,7 +11,8 @@ #include #include @@ -19,29 +19,94 @@ diff -u -r soci-3.0.0_ref/src/backends/m - +#include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -u -r soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_ref/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/standard-into-type.cpp 2009-03-26 15:34:09.000000000 +0100 +diff -ru soci-3.0.0/src/backends/mysql/standard-into-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp +--- soci-3.0.0/src/backends/mysql/standard-into-type.cpp 2008-05-30 13:33:45.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-into-type.cpp 2009-05-05 23:32:22.000000000 +0200 @@ -12,6 +12,8 @@ #include "common.h" #include #include +#include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) -diff -u -r soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp ---- soci-3.0.0_ref/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 -+++ soci-3.0.0_working/src/backends/mysql/vector-use-type.cpp 2009-03-26 15:33:14.000000000 +0100 -@@ -13,6 +13,7 @@ +diff -ru soci-3.0.0/src/backends/mysql/standard-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp +--- soci-3.0.0/src/backends/mysql/standard-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/standard-use-type.cpp 2009-05-05 23:32:22.000000000 +0200 +@@ -9,9 +9,16 @@ + #define SOCI_MYSQL_SOURCE + #include "soci-mysql.h" + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// #include #include ++#include + #include + + #ifdef _MSC_VER +diff -ru soci-3.0.0/src/backends/mysql/vector-use-type.cpp soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp +--- soci-3.0.0/src/backends/mysql/vector-use-type.cpp 2008-05-15 15:58:38.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/mysql/vector-use-type.cpp 2009-05-05 23:32:22.000000000 +0200 +@@ -9,10 +9,18 @@ + #define SOCI_MYSQL_SOURCE + #include "soci-mysql.h" + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// + #include + #include ++#include #include +#include - + #ifdef _MSC_VER #pragma warning(disable:4355) +diff -ru soci-3.0.0/src/backends/postgresql/common.cpp soci-3.0.0_4-pack/src/backends/postgresql/common.cpp +--- soci-3.0.0/src/backends/postgresql/common.cpp 2008-06-27 16:38:05.000000000 +0200 ++++ soci-3.0.0_4-pack/src/backends/postgresql/common.cpp 2009-05-05 23:32:22.000000000 +0200 +@@ -6,8 +6,15 @@ + // + + #include "common.h" +-#include ++// ++#if defined(SOCI_HEADERS_BURIED) ++# include ++#else ++# include ++#endif ++// + #include ++#include + #include + + +diff -ru soci-3.0.0/src/core/soci-simple.cpp soci-3.0.0_4-pack/src/core/soci-simple.cpp +--- soci-3.0.0/src/core/soci-simple.cpp 2008-07-01 09:42:25.000000000 +0200 ++++ soci-3.0.0_4-pack/src/core/soci-simple.cpp 2009-05-05 23:33:57.000000000 +0200 +@@ -9,6 +9,8 @@ + + #include "soci-simple.h" + #include "soci.h" ++// ++#include + + using namespace soci; + soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 4 May 2009 22:16:19 -0000 1.1 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 22:58:03 -0000 1.2 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-03 00:20:33.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 00:29:55.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-03 00:20:39.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-06 00:30:09.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-03 00:20:39.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-06 00:30:09.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-03 00:20:36.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-06 00:31:55.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-06 00:30:03.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="6" ++RPM_RELEASE="10" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-03 00:01:43.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-06 00:13:26.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="6" ++RPM_RELEASE="10" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-03 00:20:45.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-06 00:30:13.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 00:30:10.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-03 00:24:15.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53397,24 +53397,6 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include #include -diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/mysql/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 -@@ -9,7 +9,13 @@ - #define SOCI_MYSQL_SOURCE - #include "soci-mysql.h" - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - #include diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.am --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.am 2009-04-16 19:37:06.000000000 +0200 @@ -53438,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53465,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53987,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54028,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54045,26 +54027,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #ifdef _MSC_VER -diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-use-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-use-type.cpp 2009-05-03 00:24:15.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/mysql/vector-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 -@@ -9,7 +9,13 @@ - #define SOCI_MYSQL_SOURCE - #include "soci-mysql.h" - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54113,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54213,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55016,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55055,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55080,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55105,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55149,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55177,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-03 00:20:41.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55703,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55727,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55745,24 +55709,6 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include #include -diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/common.cpp soci-3.0.0_trep300/soci/backends/postgresql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/common.cpp 2009-05-03 00:24:13.000000000 +0200 -+++ soci-3.0.0_trep300/soci/backends/postgresql/common.cpp 2009-04-16 19:37:05.000000000 +0200 -@@ -6,7 +6,13 @@ - // - - #include "common.h" --#include -+// -+#if defined(SOCI_HEADERS_BURIED) -+# include -+#else -+# include -+#endif -+// - #include - #include - diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am soci-3.0.0_trep300/soci/backends/postgresql/Makefile.am --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.am 2009-04-16 19:37:05.000000000 +0200 @@ -55798,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55898,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56703,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56742,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56765,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56807,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56834,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-03 00:20:42.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57357,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-03 00:24:13.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57382,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-03 00:20:38.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 00:30:07.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57528,8 +57474,8 @@ diff -Nur soci-3.0.0_4-pack/soci/config. +#undef VERSION diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.am soci-3.0.0_trep300/soci/core/Makefile.am --- soci-3.0.0_4-pack/soci/core/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.am 2009-04-16 19:37:05.000000000 +0200 -@@ -0,0 +1,28 @@ ++++ soci-3.0.0_trep300/soci/core/Makefile.am 2009-05-06 00:28:10.000000000 +0200 +@@ -0,0 +1,29 @@ +## core sub-directory +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk @@ -57558,8 +57504,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +soci_include_dir = $(includedir) +endif +pkgincludedir = $(soci_include_dir) ++ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-03 00:24:14.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57640,7 +57587,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-03 00:20:44.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 00:30:12.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58599,9 +58546,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-03 00:24:15.000000000 +0200 -+++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-04-16 19:37:05.000000000 +0200 -@@ -8,14 +8,24 @@ +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 00:31:55.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-05-06 00:02:36.000000000 +0200 +@@ -8,16 +8,30 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED #define SOCI_COMMON_TESTS_H_INCLUDED @@ -58629,31 +58576,48 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te -#include -#include #if defined(BOOST_VERSION) && BOOST_VERSION >= 103500 ++#if defined(SOCI_HEADERS_BURIED) ++#include ++#else #include ++#endif #endif // BOOST_VERSION + + #include diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.am soci-3.0.0_trep300/soci/core/test/Makefile.am --- soci-3.0.0_4-pack/soci/core/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.am 2009-04-16 19:37:05.000000000 +0200 -@@ -0,0 +1,15 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.am 2009-05-06 00:29:06.000000000 +0200 +@@ -0,0 +1,26 @@ +## core sub-directory +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk + +MAINTAINERCLEANFILES = Makefile.in + ++EXTRA_DIST_FOR_SOCI_COMPATIBILITY = ++ ++EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) ++ +noinst_LTLIBRARIES= libsoci_core_test.la + +libsoci_core_test_la_SOURCES= $(core_test_h_sources) +libsoci_core_test_la_CXXFLAGS = +libsoci_core_test_la_LIBADD = -+libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++#libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++libsoci_core_test_la_LDFLAGS = ++ ++pkginclude_HEADERS = $(core_test_h_sources) ++if SOCI_HEADERS_BURIED ++soci_include_dir = $(includedir)/soci/core/test ++else ++soci_include_dir = $(includedir) ++endif ++pkgincludedir = $(soci_include_dir) + -+#nodist_pkginclude_HEADERS = $(core_test_h_sources) -+#pkgincludedir = $(includedir)/soci/core diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-03 00:20:44.000000000 +0200 -@@ -0,0 +1,470 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 00:30:13.000000000 +0200 +@@ -0,0 +1,505 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + @@ -58670,10 +58634,10 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + + at SET_MAKE@ + ++ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c @@ -58688,8 +58652,9 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/sources.mk $(top_srcdir)/Makefile.common ++DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/sources.mk \ ++ $(top_srcdir)/Makefile.common +subdir = soci/core/test +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \ @@ -58722,9 +58687,19 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + $(LDFLAGS) -o $@ +SOURCES = $(libsoci_core_test_la_SOURCES) +DIST_SOURCES = $(libsoci_core_test_la_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(pkgincludedir)" ++pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(pkginclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++pkgincludedir = $(soci_include_dir) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ @@ -58882,11 +58857,17 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te +core_test_h_sources = $(top_srcdir)/soci/core/test/common-tests.h +core_test_cc_sources = +MAINTAINERCLEANFILES = Makefile.in ++EXTRA_DIST_FOR_SOCI_COMPATIBILITY = ++EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) +noinst_LTLIBRARIES = libsoci_core_test.la +libsoci_core_test_la_SOURCES = $(core_test_h_sources) +libsoci_core_test_la_CXXFLAGS = +libsoci_core_test_la_LIBADD = -+libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++#libsoci_core_test_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) ++libsoci_core_test_la_LDFLAGS = ++pkginclude_HEADERS = $(core_test_h_sources) ++ at SOCI_HEADERS_BURIED_FALSE@soci_include_dir = $(includedir) ++ at SOCI_HEADERS_BURIED_TRUE@soci_include_dir = $(includedir)/soci/core/test +all: all-am + +.SUFFIXES: @@ -58942,6 +58923,23 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +clean-libtool: + -rm -rf .libs _libs ++install-pkgincludeHEADERS: $(pkginclude_HEADERS) ++ @$(NORMAL_INSTALL) ++ test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" ++ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ done ++ ++uninstall-pkgincludeHEADERS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -59018,8 +59016,11 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + done +check-am: all-am +check: check-am -+all-am: Makefile $(LTLIBRARIES) ++all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: ++ for dir in "$(DESTDIR)$(pkgincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am @@ -59065,7 +59066,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +info-am: + -+install-data-am: ++install-data-am: install-pkgincludeHEADERS + +install-dvi: install-dvi-am + @@ -59100,7 +59101,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + +ps-am: + -+uninstall-am: ++uninstall-am: uninstall-pkgincludeHEADERS + +.MAKE: install-am install-strip + @@ -59111,16 +59112,14 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am ++ install-pdf install-pdf-am install-pkgincludeHEADERS \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-pkgincludeHEADERS + + at SET_MAKE@ -+ -+#nodist_pkginclude_HEADERS = $(core_test_h_sources) -+#pkgincludedir = $(includedir)/soci/core +# 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. +.NOEXPORT: @@ -59145,7 +59144,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-03 00:20:40.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 00:30:11.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59920,8 +59919,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-02 17:23:39.000000000 +0200 -@@ -0,0 +1,294 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 00:22:28.000000000 +0200 +@@ -0,0 +1,308 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60163,8 +60162,10 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} ++%dir %{_includedir}/%{name}/core +%{_includedir}/%{name}/*.h -+%{_includedir}/%{name}/core ++%{_includedir}/%{name}/core/*.h ++%{_includedir}/%{name}/core/test +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}_core.so +%{_libdir}/pkgconfig/%{name}.pc @@ -60199,6 +60200,18 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-10 ++- Burried the Boost Fusion header include for core/test/common-tests.h ++ ++* Tue May 05 2009 Denis Arnaud 3.0.0-9 ++- Added a missing cstdio header include for g++-4.4 compatibility ++ ++* Tue May 05 2009 Denis Arnaud 3.0.0-8 ++- Added missing cstdio header includes for g++-4.4 compatibility ++ ++* Tue May 05 2009 Denis Arnaud 3.0.0-7 ++- Added a missing cstdio header include for g++-4.4 compatibility ++ +* Sat May 02 2009 Denis Arnaud 3.0.0-6 +- Removed the unused build conditionals + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/soci.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- soci.spec 4 May 2009 22:16:20 -0000 1.1 +++ soci.spec 5 May 2009 22:58:04 -0000 1.2 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 6%{?dist} +Release: 10%{?dist} Summary: The database access library for C++ programmers @@ -239,8 +239,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/core %{_includedir}/%{name}/*.h -%{_includedir}/%{name}/core +%{_includedir}/%{name}/core/*.h +%{_includedir}/%{name}/core/test %{_bindir}/%{name}-config %{_libdir}/lib%{name}_core.so %{_libdir}/pkgconfig/%{name}.pc @@ -275,6 +277,18 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-10 +- Burried the Boost Fusion header include for core/test/common-tests.h + +* Tue May 05 2009 Denis Arnaud 3.0.0-9 +- Added a missing cstdio header include for g++-4.4 compatibility + +* Tue May 05 2009 Denis Arnaud 3.0.0-8 +- Added missing cstdio header includes for g++-4.4 compatibility + +* Tue May 05 2009 Denis Arnaud 3.0.0-7 +- Added a missing cstdio header include for g++-4.4 compatibility + * Sat May 02 2009 Denis Arnaud 3.0.0-6 - Removed the unused build conditionals From jkeating at fedoraproject.org Tue May 5 23:31:55 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 5 May 2009 23:31:55 +0000 (UTC) Subject: rpms/trac/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 trac.spec, 1.28, 1.29 Message-ID: <20090505233155.7B1D670108@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/trac/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26311 Modified Files: .cvsignore sources trac.spec Log Message: * Tue May 05 2009 Jesse Keating - 0.11.4-1 - New upstream release to fix bugs and minor enhancements. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trac/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 15 Feb 2009 22:02:56 -0000 1.14 +++ .cvsignore 5 May 2009 23:31:24 -0000 1.15 @@ -1 +1 @@ -Trac-0.11.3.tar.gz +Trac-0.11.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trac/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 15 Feb 2009 22:02:56 -0000 1.14 +++ sources 5 May 2009 23:31:24 -0000 1.15 @@ -1 +1 @@ -df29c9be868ab5aa02cfaa0e3bbc7a2b Trac-0.11.3.tar.gz +a765087b22661cf4aa1520518cddecae Trac-0.11.4.tar.gz Index: trac.spec =================================================================== RCS file: /cvs/pkgs/rpms/trac/devel/trac.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- trac.spec 31 Mar 2009 20:20:31 -0000 1.28 +++ trac.spec 5 May 2009 23:31:24 -0000 1.29 @@ -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.11.3 -Release: 4%{?dist} +Version: 0.11.4 +Release: 1%{?dist} Summary: Enhanced wiki and issue tracking system Group: Applications/Internet License: BSD @@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %{_var}/www/cgi-bin/trac.fcgi %changelog +* Tue May 05 2009 Jesse Keating - 0.11.4-1 +- New upstream release to fix bugs and minor enhancements. + * Tue Mar 31 2009 Michael Schwendt - 0.11.3-4 - Fix unowned directory (#473989) From denisarnaud at fedoraproject.org Tue May 5 23:44:04 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 23:44:04 +0000 (UTC) Subject: rpms/soci/EL-5 import.log, 1.2, 1.3 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.2, 1.3 soci.spec, 1.2, 1.3 Message-ID: <20090505234404.E036770108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27646/EL-5 Modified Files: import.log soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-11 - Removed the dependency on Latex for documentation delivery Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 5 May 2009 22:58:03 -0000 1.2 +++ import.log 5 May 2009 23:43:31 -0000 1.3 @@ -1,2 +1,3 @@ soci-3_0_0-6_fc10:EL-5:soci-3.0.0-6.fc10.src.rpm:1241475130 soci-3_0_0-10_fc10:EL-5:soci-3.0.0-10.fc10.src.rpm:1241564064 +soci-3_0_0-11_fc10:EL-5:soci-3.0.0-11.fc10.src.rpm:1241566772 soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 22:58:03 -0000 1.2 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 23:43:32 -0000 1.3 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 00:29:55.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 01:31:41.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-06 00:30:09.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-06 00:30:09.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-06 00:31:55.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-06 00:30:03.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-06 01:32:40.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-06 01:31:44.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="10" ++RPM_RELEASE="11" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-06 00:13:26.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-06 01:30:30.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="10" ++RPM_RELEASE="11" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 00:30:07.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 01:31:46.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57506,7 +57506,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +pkgincludedir = $(soci_include_dir) + diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57587,7 +57587,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58546,7 +58546,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-05-06 00:02:36.000000000 +0200 @@ -8,16 +8,30 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58616,7 +58616,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,505 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59144,7 +59144,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59919,8 +59919,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 00:22:28.000000000 +0200 -@@ -0,0 +1,308 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 01:31:18.000000000 +0200 +@@ -0,0 +1,311 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60056,7 +60056,7 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in +Summary: HTML documentation for the @PACKAGE_NAME@ library +Group: Documentation +BuildArch: noarch -+BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript ++#BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript + +%description doc +This package contains the documentation in the HTML format of the @PACKAGE_NAME@ @@ -60200,6 +60200,9 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-11 ++- Removed the dependency on Latex for documentation delivery ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-10 +- Burried the Boost Fusion header include for core/test/common-tests.h + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/soci.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- soci.spec 5 May 2009 22:58:04 -0000 1.2 +++ soci.spec 5 May 2009 23:43:32 -0000 1.3 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The database access library for C++ programmers @@ -133,7 +133,7 @@ to install %{name}-oracle.} Summary: HTML documentation for the SOCI library Group: Documentation BuildArch: noarch -BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript +#BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript %description doc This package contains the documentation in the HTML format of the SOCI @@ -277,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-11 +- Removed the dependency on Latex for documentation delivery + * Tue May 05 2009 Denis Arnaud 3.0.0-10 - Burried the Boost Fusion header include for core/test/common-tests.h From denisarnaud at fedoraproject.org Tue May 5 23:50:23 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 23:50:23 +0000 (UTC) Subject: rpms/soci/devel import.log, 1.5, 1.6 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.4, 1.5 soci.spec, 1.5, 1.6 Message-ID: <20090505235023.D515470131@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28533/devel Modified Files: import.log soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-11 - Removed the dependency on Latex for documentation delivery Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 5 May 2009 22:45:40 -0000 1.5 +++ import.log 5 May 2009 23:49:52 -0000 1.6 @@ -3,3 +3,4 @@ soci-3_0_0-7_fc10:HEAD:soci-3.0.0-7.fc10 soci-3_0_0-8_fc10:HEAD:soci-3.0.0-8.fc10.src.rpm:1241558219 soci-3_0_0-9_fc10:HEAD:soci-3.0.0-9.fc10.src.rpm:1241559732 soci-3_0_0-10_fc10:HEAD:soci-3.0.0-10.fc10.src.rpm:1241563311 +soci-3_0_0-11_fc10:HEAD:soci-3.0.0-11.fc10.src.rpm:1241567153 soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 22:45:40 -0000 1.4 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 23:49:52 -0000 1.5 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 00:29:55.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 01:31:41.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-06 00:30:09.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-06 00:30:09.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-06 00:31:55.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-06 00:30:03.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-06 01:32:40.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-06 01:31:44.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="10" ++RPM_RELEASE="11" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-06 00:13:26.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-06 01:30:30.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="10" ++RPM_RELEASE="11" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 00:30:07.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 01:31:46.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57506,7 +57506,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +pkgincludedir = $(soci_include_dir) + diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57587,7 +57587,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58546,7 +58546,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-05-06 00:02:36.000000000 +0200 @@ -8,16 +8,30 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58616,7 +58616,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,505 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59144,7 +59144,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59919,8 +59919,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 00:22:28.000000000 +0200 -@@ -0,0 +1,308 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 01:31:18.000000000 +0200 +@@ -0,0 +1,311 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60056,7 +60056,7 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in +Summary: HTML documentation for the @PACKAGE_NAME@ library +Group: Documentation +BuildArch: noarch -+BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript ++#BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript + +%description doc +This package contains the documentation in the HTML format of the @PACKAGE_NAME@ @@ -60200,6 +60200,9 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-11 ++- Removed the dependency on Latex for documentation delivery ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-10 +- Burried the Boost Fusion header include for core/test/common-tests.h + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/devel/soci.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- soci.spec 5 May 2009 22:45:41 -0000 1.5 +++ soci.spec 5 May 2009 23:49:52 -0000 1.6 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The database access library for C++ programmers @@ -133,7 +133,7 @@ to install %{name}-oracle.} Summary: HTML documentation for the SOCI library Group: Documentation BuildArch: noarch -BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript +#BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript %description doc This package contains the documentation in the HTML format of the SOCI @@ -277,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-11 +- Removed the dependency on Latex for documentation delivery + * Tue May 05 2009 Denis Arnaud 3.0.0-10 - Burried the Boost Fusion header include for core/test/common-tests.h From denisarnaud at fedoraproject.org Tue May 5 23:58:30 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Tue, 5 May 2009 23:58:30 +0000 (UTC) Subject: rpms/soci/F-10 import.log, 1.3, 1.4 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.3, 1.4 soci.spec, 1.3, 1.4 Message-ID: <20090505235830.644BD700E1@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30367/F-10 Modified Files: import.log soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-11 - Removed the dependency on Latex for documentation delivery Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 5 May 2009 22:52:13 -0000 1.3 +++ import.log 5 May 2009 23:57:59 -0000 1.4 @@ -1,3 +1,4 @@ soci-3_0_0-6_fc10:F-10:soci-3.0.0-6.fc10.src.rpm:1241474307 soci-3_0_0-8_fc10:F-10:soci-3.0.0-8.fc10.src.rpm:1241558624 soci-3_0_0-10_fc10:F-10:soci-3.0.0-10.fc10.src.rpm:1241563665 +soci-3_0_0-11_fc10:F-10:soci-3.0.0-11.fc10.src.rpm:1241567654 soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 22:52:13 -0000 1.3 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 23:57:59 -0000 1.4 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 00:29:55.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 01:31:41.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-06 00:30:09.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-06 00:30:09.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-06 00:31:55.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-06 00:30:03.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-06 01:32:40.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-06 01:31:44.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="10" ++RPM_RELEASE="11" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-06 00:13:26.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-06 01:30:30.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="10" ++RPM_RELEASE="11" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 01:31:47.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 00:30:10.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 01:32:40.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 00:30:07.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 01:31:46.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57506,7 +57506,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +pkgincludedir = $(soci_include_dir) + diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57587,7 +57587,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 00:30:12.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 01:31:49.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58546,7 +58546,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 00:31:55.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 01:32:41.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-05-06 00:02:36.000000000 +0200 @@ -8,16 +8,30 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58616,7 +58616,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 00:30:13.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 01:31:50.000000000 +0200 @@ -0,0 +1,505 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59144,7 +59144,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 00:30:11.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 01:31:48.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59919,8 +59919,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 00:22:28.000000000 +0200 -@@ -0,0 +1,308 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 01:31:18.000000000 +0200 +@@ -0,0 +1,311 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -60056,7 +60056,7 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in +Summary: HTML documentation for the @PACKAGE_NAME@ library +Group: Documentation +BuildArch: noarch -+BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript ++#BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript + +%description doc +This package contains the documentation in the HTML format of the @PACKAGE_NAME@ @@ -60200,6 +60200,9 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-11 ++- Removed the dependency on Latex for documentation delivery ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-10 +- Burried the Boost Fusion header include for core/test/common-tests.h + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/F-10/soci.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci.spec 5 May 2009 22:52:14 -0000 1.3 +++ soci.spec 5 May 2009 23:57:59 -0000 1.4 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The database access library for C++ programmers @@ -133,7 +133,7 @@ to install %{name}-oracle.} Summary: HTML documentation for the SOCI library Group: Documentation BuildArch: noarch -BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript +#BuildRequires: doxygen, texlive-latex, texlive-dvips, ghostscript %description doc This package contains the documentation in the HTML format of the SOCI @@ -277,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-11 +- Removed the dependency on Latex for documentation delivery + * Tue May 05 2009 Denis Arnaud 3.0.0-10 - Burried the Boost Fusion header include for core/test/common-tests.h From denisarnaud at fedoraproject.org Wed May 6 00:06:15 2009 From: denisarnaud at fedoraproject.org (Denis Arnaud) Date: Wed, 6 May 2009 00:06:15 +0000 (UTC) Subject: rpms/soci/EL-5 import.log, 1.3, 1.4 soci-3.0.0-fix-gnu-autotools-compatibility.patch, 1.3, 1.4 soci.spec, 1.3, 1.4 Message-ID: <20090506000615.1EEA470108@cvs1.fedora.phx.redhat.com> Author: denisarnaud Update of /cvs/pkgs/rpms/soci/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31522/EL-5 Modified Files: import.log soci-3.0.0-fix-gnu-autotools-compatibility.patch soci.spec Log Message: * Tue May 05 2009 Denis Arnaud 3.0.0-12 - Removed the dependency on the version of Boost, and on CPPUnit Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 5 May 2009 23:43:31 -0000 1.3 +++ import.log 6 May 2009 00:05:44 -0000 1.4 @@ -1,3 +1,4 @@ soci-3_0_0-6_fc10:EL-5:soci-3.0.0-6.fc10.src.rpm:1241475130 soci-3_0_0-10_fc10:EL-5:soci-3.0.0-10.fc10.src.rpm:1241564064 soci-3_0_0-11_fc10:EL-5:soci-3.0.0-11.fc10.src.rpm:1241566772 +soci-3_0_0-12_fc10:EL-5:soci-3.0.0-12.fc10.src.rpm:1241568056 soci-3.0.0-fix-gnu-autotools-compatibility.patch: Index: soci-3.0.0-fix-gnu-autotools-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/soci-3.0.0-fix-gnu-autotools-compatibility.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci-3.0.0-fix-gnu-autotools-compatibility.patch 5 May 2009 23:43:32 -0000 1.3 +++ soci-3.0.0-fix-gnu-autotools-compatibility.patch 6 May 2009 00:05:44 -0000 1.4 @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 01:31:41.000000000 +0200 ++++ soci-3.0.0_trep300/aclocal.m4 2009-05-06 01:57:28.000000000 +0200 @@ -0,0 +1,7512 @@ +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + @@ -7540,7 +7540,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefi + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 01:31:47.000000000 +0200 ++++ soci-3.0.0_trep300/build/Makefile.in 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,535 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8094,7 +8094,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 01:31:47.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8496,7 +8496,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 01:31:47.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -8895,7 +8895,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80 +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 01:31:47.000000000 +0200 ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -9450,7 +9450,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/M + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 01:31:47.000000000 +0200 ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -11016,7 +11016,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_po +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2009-05-06 01:31:50.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.guess 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -12546,7 +12546,7 @@ diff -Nur soci-3.0.0_4-pack/config/confi +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2009-05-06 01:31:50.000000000 +0200 ++++ soci-3.0.0_trep300/config/config.sub 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -14305,7 +14305,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppun + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2009-05-06 01:31:49.000000000 +0200 ++++ soci-3.0.0_trep300/config/depcomp 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -14898,7 +14898,7 @@ diff -Nur soci-3.0.0_4-pack/config/depco +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2009-05-06 01:31:47.000000000 +0200 ++++ soci-3.0.0_trep300/config/install-sh 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -22381,7 +22381,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmai +# End: diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2009-05-06 01:31:47.000000000 +0200 ++++ soci-3.0.0_trep300/config/missing 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -22751,8 +22751,8 @@ diff -Nur soci-3.0.0_4-pack/config/missi +# time-stamp-end: "$" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2009-05-06 01:32:40.000000000 +0200 -+++ soci-3.0.0_trep300/configure 2009-05-06 01:31:44.000000000 +0200 +--- soci-3.0.0_4-pack/configure 2009-05-06 01:58:28.000000000 +0200 ++++ soci-3.0.0_trep300/configure 2009-05-06 01:57:31.000000000 +0200 @@ -1,72 +1,25713 @@ -#!/bin/sh +#! /bin/sh @@ -25612,7 +25612,7 @@ diff -Nur soci-3.0.0_4-pack/configure so + + +# RPM release number -+RPM_RELEASE="11" ++RPM_RELEASE="12" + + +# Shared library versioning @@ -48531,7 +48531,7 @@ diff -Nur soci-3.0.0_4-pack/configure so +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2009-05-06 01:30:30.000000000 +0200 ++++ soci-3.0.0_trep300/configure.ac 2009-05-06 01:56:09.000000000 +0200 @@ -0,0 +1,400 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- @@ -48546,7 +48546,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x]) + +# RPM release number -+RPM_RELEASE="11" ++RPM_RELEASE="12" +AC_SUBST(RPM_RELEASE) + +# Shared library versioning @@ -48934,7 +48934,7 @@ diff -Nur soci-3.0.0_4-pack/configure.ac +------------------------------------------------------------------------------ +" diff -Nur soci-3.0.0_4-pack/COPYING soci-3.0.0_trep300/COPYING ---- soci-3.0.0_4-pack/COPYING 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/COPYING 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/COPYING 2009-04-16 19:37:10.000000000 +0200 @@ -21,3 +21,4 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, @@ -48963,7 +48963,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 01:31:48.000000000 +0200 ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -49537,7 +49537,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 01:31:47.000000000 +0200 ++++ soci-3.0.0_trep300/doc/Makefile.in 2009-05-06 01:57:34.000000000 +0200 @@ -0,0 +1,547 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -50105,7 +50105,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources. + $(top_srcdir)/doc/structure.html Les fichiers binaires soci-3.0.0_4-pack/doc/structure.png et soci-3.0.0_trep300/doc/structure.png sont diff??rents. diff -Nur soci-3.0.0_4-pack/doc/style.css soci-3.0.0_trep300/doc/style.css ---- soci-3.0.0_4-pack/doc/style.css 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/doc/style.css 2009-05-06 01:58:29.000000000 +0200 +++ soci-3.0.0_trep300/doc/style.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -body @@ -50200,7 +50200,7 @@ diff -Nur soci-3.0.0_4-pack/doc/style.cs -} diff -Nur soci-3.0.0_4-pack/INSTALL soci-3.0.0_trep300/INSTALL --- soci-3.0.0_4-pack/INSTALL 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/INSTALL 2009-05-06 01:31:50.000000000 +0200 ++++ soci-3.0.0_trep300/INSTALL 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,237 @@ +Installation Instructions +************************* @@ -50440,7 +50440,7 @@ diff -Nur soci-3.0.0_4-pack/INSTALL soci +`configure --help' for more details. + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/Makefile 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -50537,7 +50537,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.com +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2009-05-06 01:31:50.000000000 +0200 ++++ soci-3.0.0_trep300/Makefile.in 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,797 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51346,7 +51346,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 01:31:48.000000000 +0200 ++++ soci-3.0.0_trep300/man/Makefile.in 2009-05-06 01:57:35.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -51843,7 +51843,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 01:31:48.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2009-05-06 01:57:35.000000000 +0200 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -52382,7 +52382,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/common.cpp soci-3.0.0_trep300/soci/backends/mysql/common.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/common.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/common.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,7 +6,13 @@ // @@ -52430,7 +52430,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52532,7 +52532,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 01:31:48.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2009-05-06 01:57:35.000000000 +0200 @@ -0,0 +1,796 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53331,7 +53331,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h ---- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/soci-mysql.h 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/soci-mysql.h 2009-04-16 19:37:06.000000000 +0200 @@ -23,12 +23,23 @@ #ifndef SOCI_MYSQL_DECL @@ -53379,7 +53379,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/mysql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/mysql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/standard-into-type.cpp 2009-05-06 01:58:30.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -8,8 +8,14 @@ @@ -53420,7 +53420,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -53447,7 +53447,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 01:31:48.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2009-05-06 01:57:35.000000000 +0200 @@ -0,0 +1,513 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -53969,7 +53969,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +mysql_test_h_sources = +mysql_test_cc_sources = $(top_srcdir)/soci/backends/mysql/test/test-mysql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/test-mysql.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/test-mysql.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -6,9 +6,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -54010,7 +54010,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend using namespace soci; using namespace soci::tests; diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/mysql/vector-into-type.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ #define SOCI_MYSQL_SOURCE @@ -54028,7 +54028,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #ifdef _MSC_VER diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp soci-3.0.0_trep300/soci/backends/oracle/blob.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/blob.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/blob.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,7 +7,13 @@ @@ -54077,7 +54077,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54177,7 +54177,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 01:31:48.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2009-05-06 01:57:35.000000000 +0200 @@ -0,0 +1,800 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -54980,7 +54980,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h ---- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/soci-oracle.h 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/soci-oracle.h 2009-04-16 19:37:06.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_ORACLE_DECL @@ -55019,7 +55019,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/oracle/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/oracle/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-into-type.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55044,7 +55044,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/standard-use-type.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/standard-use-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,10 +7,18 @@ @@ -55069,7 +55069,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp soci-3.0.0_trep300/soci/backends/oracle/statement.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/statement.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/statement.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -9,7 +9,13 @@ @@ -55113,7 +55113,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55141,7 +55141,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 01:31:49.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -55667,7 +55667,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +oracle_test_h_sources = +oracle_test_cc_sources = $(top_srcdir)/soci/backends/oracle/test/test-oracle.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/test-oracle.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/test-oracle.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -55691,7 +55691,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 01:32:40.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/oracle/vector-into-type.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/vector-into-type.cpp 2009-04-16 19:37:06.000000000 +0200 @@ -7,8 +7,14 @@ @@ -55744,7 +55744,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55844,7 +55844,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 01:31:49.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,802 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -56649,7 +56649,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h ---- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/soci-postgresql.h 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/soci-postgresql.h 2009-04-16 19:37:05.000000000 +0200 @@ -22,9 +22,14 @@ #ifndef SOCI_POSTGRESQL_DECL @@ -56688,7 +56688,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + $(top_srcdir)/soci/backends/postgresql/vector-into-type.cpp \ + $(top_srcdir)/soci/backends/postgresql/vector-use-type.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-into-type.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-into-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -8,9 +8,16 @@ #define SOCI_POSTGRESQL_SOURCE @@ -56711,7 +56711,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include #include diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/standard-use-type.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/standard-use-type.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -7,8 +7,14 @@ @@ -56753,7 +56753,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -56780,7 +56780,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 01:31:49.000000000 +0200 ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,514 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -57303,7 +57303,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend +postgresql_test_h_sources = +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/test-postgresql.cpp 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/test-postgresql.cpp 2009-04-16 19:37:05.000000000 +0200 @@ -5,9 +5,17 @@ // http://www.boost.org/LICENSE_1_0.txt) @@ -57328,7 +57328,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backend #include diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 01:31:46.000000000 +0200 ++++ soci-3.0.0_trep300/soci/config.h.in 2009-05-06 01:57:33.000000000 +0200 @@ -0,0 +1,142 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -57506,7 +57506,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma +pkgincludedir = $(soci_include_dir) + diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2009-05-06 01:58:28.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -57587,7 +57587,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Ma - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 01:31:49.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,894 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -58546,7 +58546,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/so + $(top_srcdir)/soci/core/use-type.cpp \ + $(top_srcdir)/soci/core/values.cpp diff -Nur soci-3.0.0_4-pack/soci/core/test/common-tests.h soci-3.0.0_trep300/soci/core/test/common-tests.h ---- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 01:32:41.000000000 +0200 +--- soci-3.0.0_4-pack/soci/core/test/common-tests.h 2009-05-06 01:58:29.000000000 +0200 +++ soci-3.0.0_trep300/soci/core/test/common-tests.h 2009-05-06 00:02:36.000000000 +0200 @@ -8,16 +8,30 @@ #ifndef SOCI_COMMON_TESTS_H_INCLUDED @@ -58616,7 +58616,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/te + diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 01:31:50.000000000 +0200 ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2009-05-06 01:57:36.000000000 +0200 @@ -0,0 +1,505 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59144,7 +59144,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefil +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 01:31:48.000000000 +0200 ++++ soci-3.0.0_trep300/soci/Makefile.in 2009-05-06 01:57:35.000000000 +0200 @@ -0,0 +1,554 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ @@ -59919,8 +59919,8 @@ diff -Nur soci-3.0.0_4-pack/soci.pc.in s +Cflags: -I${includedir} diff -Nur soci-3.0.0_4-pack/soci.spec.in soci-3.0.0_trep300/soci.spec.in --- soci-3.0.0_4-pack/soci.spec.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 01:31:18.000000000 +0200 -@@ -0,0 +1,311 @@ ++++ soci-3.0.0_trep300/soci.spec.in 2009-05-06 01:57:04.000000000 +0200 +@@ -0,0 +1,314 @@ +# +## +# Default values are --with mysql --with postgresql --without oracle @@ -59955,8 +59955,8 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in +Patch1: %{name}-%{version}-fix-gnu-autotools-compatibility.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + -+BuildRequires: boost-devel >= 1.34 -+BuildRequires: cppunit-devel >= 1.10 ++BuildRequires: boost-devel ++#BuildRequires: cppunit-devel >= 1.10 +BuildRequires: libtool +#Requires: + @@ -60200,6 +60200,9 @@ diff -Nur soci-3.0.0_4-pack/soci.spec.in + + +%changelog ++* Tue May 05 2009 Denis Arnaud 3.0.0-12 ++- Removed the dependency on the version of Boost, and on CPPUnit ++ +* Tue May 05 2009 Denis Arnaud 3.0.0-11 +- Removed the dependency on Latex for documentation delivery + Index: soci.spec =================================================================== RCS file: /cvs/pkgs/rpms/soci/EL-5/soci.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- soci.spec 5 May 2009 23:43:32 -0000 1.3 +++ soci.spec 6 May 2009 00:05:44 -0000 1.4 @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: The database access library for C++ programmers @@ -32,8 +32,8 @@ Patch0: %{name}-%{version}-fix-g Patch1: %{name}-%{version}-fix-gnu-autotools-compatibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: boost-devel >= 1.34 -BuildRequires: cppunit-devel >= 1.10 +BuildRequires: boost-devel +#BuildRequires: cppunit-devel >= 1.10 BuildRequires: libtool #Requires: @@ -277,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 05 2009 Denis Arnaud 3.0.0-12 +- Removed the dependency on the version of Boost, and on CPPUnit + * Tue May 05 2009 Denis Arnaud 3.0.0-11 - Removed the dependency on Latex for documentation delivery From cebbert at fedoraproject.org Wed May 6 01:16:44 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Wed, 6 May 2009 01:16:44 +0000 (UTC) Subject: rpms/kerneloops/F-10 kerneloops-0.12-log_result_url.patch, NONE, 1.1 kerneloops.spec, 1.14, 1.15 Message-ID: <20090506011645.0749070108@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8066 Modified Files: kerneloops.spec Added Files: kerneloops-0.12-log_result_url.patch Log Message: Log the URL of the last patch submitted to the system log (#469407) kerneloops-0.12-log_result_url.patch: --- NEW FILE kerneloops-0.12-log_result_url.patch --- Index: kerneloops-0.12/submit.c =================================================================== --- kerneloops-0.12.orig/submit.c +++ kerneloops-0.12/submit.c @@ -175,10 +175,12 @@ static void print_queue(void) } -static void write_logfile(int count) +static void write_logfile(int count, char *result_url) { openlog("kerneloops", 0, LOG_KERN); syslog(LOG_WARNING, "Submitted %i kernel oopses to www.kerneloops.org", count); + if (result_url && strlen(result_url)) + syslog(LOG_WARNING, "URL of last kerneloops report: %s\n", result_url); closelog(); } @@ -255,7 +257,7 @@ void submit_queue(void) } if (count && !testmode) - write_logfile(count); + write_logfile(count, result_url); if (count) dbus_say_thanks(result_url); @@ -284,7 +286,7 @@ void clear_queue(void) free(oops); oops = next; } - write_logfile(0); + write_logfile(0, NULL); } void ask_permission(void) Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/F-10/kerneloops.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- kerneloops.spec 13 Sep 2008 15:38:32 -0000 1.14 +++ kerneloops.spec 6 May 2009 01:16:13 -0000 1.15 @@ -1,12 +1,13 @@ Name: kerneloops Version: 0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base License: GPLv2 URL: http://www.kerneloops.org Source0: http://www.kerneloops.org/download/%{name}-%{version}.tar.gz +Patch0: kerneloops-0.12-log_result_url.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -27,6 +28,7 @@ Linux kernel developers. %prep %setup -q +%patch0 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -67,6 +69,9 @@ fi %doc %{_mandir}/man8/kerneloops.8.gz %changelog +* Tue May 05 2009 Chuck Ebbert 0.12-2 +- Log the URL of the last patch submitted to the system log (#469407) + * Tue Jun 17 2008 Chuck Ebbert 0.12-1 - kerneloops 0.12 From wart at fedoraproject.org Wed May 6 01:53:26 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Wed, 6 May 2009 01:53:26 +0000 (UTC) Subject: rpms/freedroidrpg/F-11 .cvsignore, 1.10, 1.11 freedroidrpg.spec, 1.23, 1.24 sources, 1.10, 1.11 Message-ID: <20090506015326.EA6D870108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/freedroidrpg/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12241 Modified Files: .cvsignore freedroidrpg.spec sources Log Message: Update to 0.12.1; Move data files to a noarch -data subpackage Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/F-11/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 17 Dec 2008 03:11:50 -0000 1.10 +++ .cvsignore 6 May 2009 01:52:55 -0000 1.11 @@ -1 +1 @@ -freedroidrpg-0.11.1.tar.bz2 +freedroidrpg-0.12.1.tar.bz2 Index: freedroidrpg.spec =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/F-11/freedroidrpg.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- freedroidrpg.spec 24 Feb 2009 18:17:56 -0000 1.23 +++ freedroidrpg.spec 6 May 2009 01:52:55 -0000 1.24 @@ -1,6 +1,6 @@ Name: freedroidrpg -Version: 0.11.1 -Release: 3%{?dist} +Version: 0.12.1 +Release: 1%{?dist} Summary: Role playing game with Freedroid theme and Tux as the hero Group: Amusements/Games @@ -21,6 +21,7 @@ BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: libGLU-devel BuildRequires: gettext +Requires: freedroidrpg-data = %{version}-%{release} Requires(post): coreutils Requires(postun): coreutils @@ -29,10 +30,20 @@ Requires(postun): coreutils The Freedroid RPG is an extension/modification of the classical freedroid engine into a role playing game. +%package data +Summary: Data files for the freedroidrpg game +Group: Amusements/Games +BuildArch: noarch +Requires: freedroidrpg = %{version}-%{release} +%description data +Data files for the freedroidrpg game. %prep %setup -q +# Update the timestamp to avoid unnecessarily running configure +touch -r configure.ac aclocal.m4 + %build %configure --disable-dependency-tracking @@ -74,13 +85,20 @@ fi %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/* -%{_datadir}/%{name} %{_mandir}/man6/freedroidRPG.6* %{_datadir}/applications/*freedroidrpg.desktop %{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png +%files data +%defattr(-,root,root,-) +%{_datadir}/%{name} + %changelog +* Mon May 4 2009 Fedora Release Engineering - 0.12.1-1 +- Update to 0.12.1 +- Move data files to a noarch -data subpackage + * Tue Feb 24 2009 Fedora Release Engineering - 0.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/F-11/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 17 Dec 2008 03:11:50 -0000 1.10 +++ sources 6 May 2009 01:52:55 -0000 1.11 @@ -1 +1 @@ -f7bb462f5bf51638f6c71722dbdb041f freedroidrpg-0.11.1.tar.bz2 +77fc8fb5c6080c555d90105da91c671f freedroidrpg-0.12.1.tar.bz2 From wart at fedoraproject.org Wed May 6 02:38:39 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Wed, 6 May 2009 02:38:39 +0000 (UTC) Subject: rpms/freedroidrpg/F-10 .cvsignore, 1.10, 1.11 freedroidrpg.spec, 1.21, 1.22 sources, 1.10, 1.11 Message-ID: <20090506023839.CB10570108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/freedroidrpg/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17108 Modified Files: .cvsignore freedroidrpg.spec sources Log Message: - Update to 0.12.1 - Move data files to a noarch -data subpackage - Add coreutils requirement for rpm post scripts (BZ #476162) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/F-10/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 17 Dec 2008 03:57:51 -0000 1.10 +++ .cvsignore 6 May 2009 02:38:07 -0000 1.11 @@ -1 +1 @@ -freedroidrpg-0.11.1.tar.bz2 +freedroidrpg-0.12.1.tar.bz2 Index: freedroidrpg.spec =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/F-10/freedroidrpg.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- freedroidrpg.spec 17 Dec 2008 03:57:52 -0000 1.21 +++ freedroidrpg.spec 6 May 2009 02:38:07 -0000 1.22 @@ -1,5 +1,5 @@ Name: freedroidrpg -Version: 0.11.1 +Version: 0.12.1 Release: 1%{?dist} Summary: Role playing game with Freedroid theme and Tux as the hero @@ -21,15 +21,29 @@ BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: libGLU-devel BuildRequires: gettext +Requires: freedroidrpg-data = %{version}-%{release} +Requires(post): coreutils +Requires(postun): coreutils + %description The Freedroid RPG is an extension/modification of the classical freedroid engine into a role playing game. +%package data +Summary: Data files for the freedroidrpg game +Group: Amusements/Games +BuildArch: noarch +Requires: freedroidrpg = %{version}-%{release} +%description data +Data files for the freedroidrpg game. %prep %setup -q +# Update the timestamp to avoid unnecessarily running configure +touch -r configure.ac aclocal.m4 + %build %configure --disable-dependency-tracking @@ -71,13 +85,21 @@ fi %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/* -%{_datadir}/%{name} %{_mandir}/man6/freedroidRPG.6* %{_datadir}/applications/*freedroidrpg.desktop %{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png +%files data +%defattr(-,root,root,-) +%{_datadir}/%{name} + %changelog +* Mon May 4 2009 Fedora Release Engineering - 0.12.1-1 +- Update to 0.12.1 +- Move data files to a noarch -data subpackage +- Add coreutils requirement for rpm post scripts (BZ #476162) + * Tue Dec 16 2008 Wart - 0.11.1-1 - Update to 0.11.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freedroidrpg/F-10/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 17 Dec 2008 03:57:52 -0000 1.10 +++ sources 6 May 2009 02:38:07 -0000 1.11 @@ -1 +1 @@ -f7bb462f5bf51638f6c71722dbdb041f freedroidrpg-0.11.1.tar.bz2 +77fc8fb5c6080c555d90105da91c671f freedroidrpg-0.12.1.tar.bz2 From airlied at fedoraproject.org Wed May 6 03:12:07 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Wed, 6 May 2009 03:12:07 +0000 (UTC) Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.81, 1.82 drm-next.patch, 1.16, 1.17 drm-nouveau.patch, 1.47, 1.48 kernel.spec, 1.1590, 1.1591 linux-2.6-drm-r128-ioremap.patch, 1.1, NONE Message-ID: <20090506031207.3F26370108@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20106 Modified Files: drm-modesetting-radeon.patch drm-next.patch drm-nouveau.patch kernel.spec Removed Files: linux-2.6-drm-r128-ioremap.patch Log Message: * Wed May 06 2009 Dave Airlie 2.6.29.2-129 - drm-next: update with latest patch queue for upstream + intel fixes - drm-modesetting-radeon.patch: rebase onto drm-next - drm-nouveau.patch: rebase onto drm-next drm-modesetting-radeon.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -p -N -r 1.81 -r 1.82 drm-modesetting-radeon.patch Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v retrieving revision 1.81 retrieving revision 1.82 diff -u -p -r1.81 -r1.82 --- drm-modesetting-radeon.patch 5 May 2009 10:28:10 -0000 1.81 +++ drm-modesetting-radeon.patch 6 May 2009 03:12:01 -0000 1.82 @@ -1,2152 +1,3 @@ -commit cedd30c80687e2dee226ae3f38cb3411361e7572 -Merge: ef416ea 2b12cba -Author: Dave Airlie -Date: Tue May 5 19:10:23 2009 +1000 - - Merge remote branch 'origin/drm-rawhide' into drm-f11 - -commit 2b12cba747575005e75fe6154a552935484e9a4d -Author: Dave Airlie -Date: Tue May 5 18:17:44 2009 +1000 - - radeon: don't convert colors for 16-bit modes - -commit ed70a54c74f78f426497654676dda7ac53055d13 -Author: Dave Airlie -Date: Fri May 1 11:58:10 2009 +1000 - - radeon: init usec timeout earlier - - we can call idle function before we set this up - -commit b1d531a7b26449e17031c22a1b12d6c5994f1b9a -Author: Dave Airlie -Date: Fri Apr 24 15:18:09 2009 +1000 - - drm: revert change and remove unneeded setmode code - -commit 3d533587bcd2753b47887ed6a927b05f5821f1b7 -Author: Dave Airlie -Date: Fri Apr 24 14:32:36 2009 +1000 - - Revert "radeon: set i2c timeout to 2 jiffies" - - This reverts commit ab1e9cd474798a5c7d15d21c6422c3c9f90e90e0. - - fixed in i2c core - -commit 592b92d0a532c7367164546b513d345b1aae1d46 -Author: Dave Airlie -Date: Fri May 1 02:14:07 2009 +1000 - - r300: add other clip regs - -commit 37136c81b28e45f30c8d45d212315c0b4ce6c6b0 -Author: Dave Airlie -Date: Thu Apr 30 23:09:58 2009 +1000 - - drm: make ttm populate on cache changes - - this is backported from upstream - -commit e2b4a0ba030cf96be943a2d277accc43e0560672 -Author: Dave Airlie -Date: Thu Apr 30 23:09:39 2009 +1000 - - radeon: removed unused legacy cs codepath - -commit abe22355e73be13968fead1a42b9af43790f38e9 -Author: Dave Airlie -Date: Wed Apr 22 17:24:46 2009 +1000 - - radeon: duplicate desired modes so this stuff works properly - -commit ab1e9cd474798a5c7d15d21c6422c3c9f90e90e0 -Author: Dave Airlie -Date: Wed Apr 22 16:58:58 2009 +1000 - - radeon: set i2c timeout to 2 jiffies - -commit c4afb1b5b1cf342f9ab6bd561522c58dbe5733ad -Author: Dave Airlie -Date: Wed Apr 22 16:57:38 2009 +1000 - - radeon: hook up the sub pixel order - -commit ef416eafca3c5ed83b089e90fb50c15062accecd -Merge: fa4687f f891418 -Author: Dave Airlie -Date: Tue Apr 21 15:13:21 2009 +1000 - - Merge remote branch 'origin/drm-rawhide' into drm-f11 - -commit f891418afa0e216bfaba22865ef06a72a6c74474 -Author: Dave Airlie -Date: Tue Apr 21 14:29:32 2009 +1000 - - radeon: legacy fix more desktop layout scenarios - -commit 4b59aa2f4e377fd35bb00462030549eafde0a39c -Author: Dave Airlie -Date: Tue Apr 21 13:34:38 2009 +1000 - - radeon: legacy crtc, set buffer pitch at set base time. - - this deals with the case where the fb resizes but we don't switch modes - -commit cd12e87b4f13f717caf4bd81b46b25072f6d9ed0 -Author: Dave Airlie -Date: Tue Apr 21 11:55:16 2009 +1000 - - radeon: fixup bandwidth calcs for second legacy head - -commit b462b817a8dee1e8b69f8118862e77674a56faa4 -Author: Dave Airlie -Date: Tue Apr 21 11:15:52 2009 +1000 - - radeon: fix bios parsing bug for LCD DDC, also make LCD code use core ddc - -commit 5d9a97d1d81e5d0c0115e01d7a1cf7b3f72b3c0d -Author: Dave Airlie -Date: Fri Apr 17 20:49:35 2009 +1000 - - drm: add missing helper commit - -commit fa4687fdb659e807b8e3b05bf971f79e7aebde62 -Merge: 9283b7e 389363f -Author: Dave Airlie -Date: Fri Apr 17 16:05:30 2009 +1000 - - Merge remote branch 'origin/drm-rawhide' into drm-f11 - -commit 389363fe962f28bfa41eb8d18c6171d9f5e388b3 -Author: Dave Airlie -Date: Fri Apr 17 16:02:47 2009 +1000 - - drm: set full mode when we have a connector change. - - for some reason we have two levels of set base detection, this seems redundant - and most likely is. If we get a userspace mode set and the encoder list - is different we have to set the full mode. - - Add a flag to make sure a full set is done, however I think we can probably - just cleanup inside mode_set properly. - -commit 9283b7e0503c439ccde80b808044e5581a4b3117 -Merge: 4fb1fe8 69c4926 -Author: Dave Airlie -Date: Fri Apr 17 14:08:45 2009 +1000 - - Merge remote branch 'origin/drm-rawhide' into drm-f11 - -commit 69c492681103cd6d5db3434a1646dc71d354bdee -Author: Dave Airlie -Date: Fri Apr 17 14:04:45 2009 +1000 - - radeon: fix agp test hook - -commit 33769d2b889e01e0026ce8980ce4f5803ce14d15 -Author: Dave Airlie -Date: Fri Apr 17 14:04:02 2009 +1000 - - radeon: fixup palette setting and add support for 30-bit. - - The radeon palette can handle 30-bit on all cards. Also - fix oops when setting palette on disconnected crtc - -commit 4fb1fe8e8696cd2fd7485ebf3fa01c0ac491a6ae -Merge: 18efcb5 37267b0 -Author: Dave Airlie -Date: Fri Apr 17 11:05:43 2009 +1000 - - Merge remote branch 'origin/drm-rawhide' into drm-f11 - -commit 37267b0eab798dbdb336470ba3fbe05269665acc -Author: Dave Airlie -Date: Fri Apr 17 10:50:48 2009 +1000 - - radeon: add yet another test hook for agp - -commit 80a878ea6be30bcd9a48d9b825f0bc5f42a6f31f -Author: Dave Airlie -Date: Fri Apr 17 10:45:51 2009 +1000 - - radeon: r3xx/r4xx hw i2c engine ties up lines when in reset - - When the hw offload engine is in reset, it ties up the DDC - lines on certain chips - -commit 19f4dc490ab0417a28c100012bdd8d3633fd42a7 -Author: Adam Jackson -Date: Fri Apr 17 08:41:09 2009 +1000 - - radeon: fix panel mode name - -commit 18efcb54320d301dc356647a8fc2a2d308d8ef46 -Merge: e9777f8 1d8fea4 -Author: Dave Airlie -Date: Wed Apr 15 16:05:37 2009 +1000 - - Merge remote branch 'origin/drm-rawhide' into drm-f11 - [...2613 lines suppressed...] extern int radeon_no_wb; @@ -24022,7 +21536,7 @@ index ed4d27e..009bbcd 100644 extern u32 radeon_get_ring_head(drm_radeon_private_t *dev_priv); extern void radeon_set_ring_head(drm_radeon_private_t *dev_priv, u32 val); -@@ -397,7 +531,7 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi +@@ -398,7 +532,7 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi extern int radeon_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_priv); extern u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv); @@ -24031,7 +21545,7 @@ index ed4d27e..009bbcd 100644 extern void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base); extern u32 RADEON_READ_MM(drm_radeon_private_t *dev_priv, int addr); -@@ -406,12 +540,9 @@ extern struct drm_buf *radeon_freelist_get(struct drm_device * dev); +@@ -407,12 +541,9 @@ extern struct drm_buf *radeon_freelist_get(struct drm_device * dev); extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n); @@ -24045,7 +21559,7 @@ index ed4d27e..009bbcd 100644 extern int radeon_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int radeon_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *file_priv); -@@ -427,6 +558,7 @@ extern void radeon_write_ring_rptr(drm_radeon_private_t *dev_priv, u32 off, u32 +@@ -428,6 +559,7 @@ extern void radeon_write_ring_rptr(drm_radeon_private_t *dev_priv, u32 off, u32 extern void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state); extern int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv); @@ -24053,7 +21567,7 @@ index ed4d27e..009bbcd 100644 extern void radeon_do_release(struct drm_device * dev); extern u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc); -@@ -443,13 +575,13 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value); +@@ -444,13 +576,13 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value); extern int radeon_driver_load(struct drm_device *dev, unsigned long flags); extern int radeon_driver_unload(struct drm_device *dev); extern int radeon_driver_firstopen(struct drm_device *dev); @@ -24071,7 +21585,7 @@ index ed4d27e..009bbcd 100644 extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); -@@ -478,6 +610,12 @@ extern int r600_cp_dispatch_indirect(struct drm_device *dev, +@@ -479,6 +611,12 @@ extern int r600_cp_dispatch_indirect(struct drm_device *dev, extern int r600_page_table_init(struct drm_device *dev); extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info); @@ -24084,7 +21598,7 @@ index ed4d27e..009bbcd 100644 /* Flags for stats.boxes */ #define RADEON_BOX_DMA_IDLE 0x1 -@@ -486,12 +624,17 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga +@@ -487,12 +625,17 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga #define RADEON_BOX_WAIT_IDLE 0x8 #define RADEON_BOX_TEXTURE_LOAD 0x10 @@ -24102,7 +21616,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_AGP_COMMAND 0x0f60 #define RADEON_AGP_COMMAND_PCI_CONFIG 0x0060 /* offset in PCI config */ # define RADEON_AGP_ENABLE (1<<8) -@@ -667,16 +810,6 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga +@@ -668,16 +811,6 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga #define R520_MC_IND_WR_EN (1 << 24) #define R520_MC_IND_DATA 0x74 @@ -24119,7 +21633,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_MPP_TB_CONFIG 0x01c0 #define RADEON_MEM_CNTL 0x0140 #define RADEON_MEM_SDRAM_MODE_REG 0x0158 -@@ -740,6 +873,7 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga +@@ -741,6 +874,7 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga #define RADEON_SCRATCH_REG3 0x15ec #define RADEON_SCRATCH_REG4 0x15f0 #define RADEON_SCRATCH_REG5 0x15f4 @@ -24127,7 +21641,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_SCRATCH_UMSK 0x0770 #define RADEON_SCRATCH_ADDR 0x0774 -@@ -762,6 +896,12 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -763,6 +897,12 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); #define R600_SCRATCHOFF(x) (R600_SCRATCH_REG_OFFSET + 4*(x)) @@ -24140,7 +21654,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_GEN_INT_CNTL 0x0040 # define RADEON_CRTC_VBLANK_MASK (1 << 0) # define RADEON_CRTC2_VBLANK_MASK (1 << 9) -@@ -779,10 +919,13 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -780,10 +920,13 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); # define RADEON_SW_INT_FIRE (1 << 26) # define R500_DISPLAY_INT_STATUS (1 << 0) @@ -24158,7 +21672,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_ISYNC_CNTL 0x1724 # define RADEON_ISYNC_ANY2D_IDLE3D (1 << 0) -@@ -821,12 +964,17 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -822,12 +965,17 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); #define RADEON_PP_TXFILTER_1 0x1c6c #define RADEON_PP_TXFILTER_2 0x1c84 @@ -24182,7 +21696,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_RB3D_CNTL 0x1c3c # define RADEON_ALPHA_BLEND_ENABLE (1 << 0) # define RADEON_PLANE_MASK_ENABLE (1 << 1) -@@ -853,11 +1001,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -854,11 +1002,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); # define R300_ZC_FLUSH (1 << 0) # define R300_ZC_FREE (1 << 1) # define R300_ZC_BUSY (1 << 31) @@ -24194,7 +21708,7 @@ index ed4d27e..009bbcd 100644 #define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c # define R300_RB3D_DC_FLUSH (2 << 0) # define R300_RB3D_DC_FREE (2 << 2) -@@ -865,15 +1008,15 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -866,15 +1009,15 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); #define RADEON_RB3D_ZSTENCILCNTL 0x1c2c # define RADEON_Z_TEST_MASK (7 << 4) # define RADEON_Z_TEST_ALWAYS (7 << 4) @@ -24214,7 +21728,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_RBBM_SOFT_RESET 0x00f0 # define RADEON_SOFT_RESET_CP (1 << 0) # define RADEON_SOFT_RESET_HI (1 << 1) -@@ -1051,6 +1194,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -1052,6 +1195,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); # define RADEON_PRE_WRITE_LIMIT_SHIFT 23 #define RADEON_CP_IB_BASE 0x0738 @@ -24222,7 +21736,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_CP_CSQ_CNTL 0x0740 # define RADEON_CSQ_CNT_PRIMARY_MASK (0xff << 0) -@@ -1061,6 +1205,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -1062,6 +1206,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); # define RADEON_CSQ_PRIBM_INDBM (4 << 28) # define RADEON_CSQ_PRIPIO_INDPIO (15 << 28) @@ -24231,7 +21745,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_AIC_CNTL 0x01d0 # define RADEON_PCIGART_TRANSLATE_EN (1 << 0) # define RS400_MSI_REARM (1 << 3) -@@ -1143,27 +1289,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -1144,27 +1290,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); #define RADEON_NUM_VERTICES_SHIFT 16 #define RADEON_COLOR_FORMAT_CI8 2 @@ -24259,7 +21773,7 @@ index ed4d27e..009bbcd 100644 #define R200_PP_TXCBLEND_0 0x2f00 #define R200_PP_TXCBLEND_1 0x2f10 -@@ -1274,16 +1399,44 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -1275,16 +1400,44 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); #define R200_SE_TCL_POINT_SPRITE_CNTL 0x22c4 @@ -24306,7 +21820,7 @@ index ed4d27e..009bbcd 100644 #define R500_D1CRTC_STATUS 0x609c #define R500_D2CRTC_STATUS 0x689c #define R500_CRTC_V_BLANK (1<<0) -@@ -1745,6 +1898,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); +@@ -1746,6 +1899,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index); #define RADEON_RING_HIGH_MARK 128 #define RADEON_PCIGART_TABLE_SIZE (32*1024) @@ -24315,7 +21829,7 @@ index ed4d27e..009bbcd 100644 #define RADEON_READ(reg) DRM_READ32( dev_priv->mmio, (reg) ) #define RADEON_WRITE(reg, val) \ -@@ -1759,11 +1914,24 @@ do { \ +@@ -1760,11 +1915,24 @@ do { \ #define RADEON_READ8(reg) DRM_READ8( dev_priv->mmio, (reg) ) #define RADEON_WRITE8(reg,val) DRM_WRITE8( dev_priv->mmio, (reg), (val) ) @@ -24345,7 +21859,7 @@ index ed4d27e..009bbcd 100644 } while (0) #define RADEON_WRITE_PCIE(addr, val) \ -@@ -1801,15 +1969,18 @@ do { \ +@@ -1802,15 +1970,18 @@ do { \ RADEON_WRITE(RS600_MC_DATA, val); \ } while (0) @@ -24367,7 +21881,7 @@ index ed4d27e..009bbcd 100644 } while (0) #define CP_PACKET0( reg, n ) \ -@@ -1830,7 +2001,7 @@ do { \ +@@ -1831,7 +2002,7 @@ do { \ #define RADEON_WAIT_UNTIL_2D_IDLE() do { \ OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) ); \ OUT_RING( (RADEON_WAIT_2D_IDLECLEAN | \ @@ -24376,7 +21890,7 @@ index ed4d27e..009bbcd 100644 } while (0) #define RADEON_WAIT_UNTIL_3D_IDLE() do { \ -@@ -2035,4 +2206,159 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv); +@@ -2036,4 +2207,159 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv); write &= mask; \ } while (0) drm-next.patch: Index: drm-next.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-next.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- drm-next.patch 5 May 2009 10:28:11 -0000 1.16 +++ drm-next.patch 6 May 2009 03:12:02 -0000 1.17 @@ -389,7 +389,7 @@ index 809ec0f..7d1e53c 100644 mutex_lock(&dev->struct_mutex); diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c -index 1c3a8c5..a04639d 100644 +index 1c3a8c5..4589044 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -42,6 +42,26 @@ static struct drm_display_mode std_modes[] = { @@ -441,7 +441,47 @@ index 1c3a8c5..a04639d 100644 list_for_each_entry_safe(mode, t, &connector->modes, head) { if (mode->status == MODE_OK) mode->status = connector_funcs->mode_valid(connector, -@@ -885,7 +913,6 @@ bool drm_helper_plugged_event(struct drm_device *dev) +@@ -533,7 +561,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, + int saved_x, saved_y; + struct drm_encoder *encoder; + bool ret = true; +- bool depth_changed, bpp_changed; + + adjusted_mode = drm_mode_duplicate(dev, mode); + +@@ -542,15 +569,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, + if (!crtc->enabled) + return true; + +- if (old_fb && crtc->fb) { +- depth_changed = (old_fb->depth != crtc->fb->depth); +- bpp_changed = (old_fb->bits_per_pixel != +- crtc->fb->bits_per_pixel); +- } else { +- depth_changed = true; +- bpp_changed = true; +- } +- + saved_mode = crtc->mode; + saved_x = crtc->x; + saved_y = crtc->y; +@@ -562,15 +580,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, + crtc->x = x; + crtc->y = y; + +- if (drm_mode_equal(&saved_mode, &crtc->mode)) { +- if (saved_x != crtc->x || saved_y != crtc->y || +- depth_changed || bpp_changed) { +- ret = !crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y, +- old_fb); +- goto done; +- } +- } +- + /* Pass our mode to the connectors and the CRTC to give them a chance to + * adjust it according to limitations or connector properties, and also + * a chance to reject the mode entirely. +@@ -885,7 +894,6 @@ bool drm_helper_plugged_event(struct drm_device *dev) /** * drm_initial_config - setup a sane initial connector configuration * @dev: DRM device @@ -449,7 +489,7 @@ index 1c3a8c5..a04639d 100644 * * LOCKING: * Called at init time, must take mode config lock. -@@ -897,7 +924,7 @@ bool drm_helper_plugged_event(struct drm_device *dev) +@@ -897,7 +905,7 @@ bool drm_helper_plugged_event(struct drm_device *dev) * RETURNS: * Zero if everything went ok, nonzero otherwise. */ @@ -700,7 +740,7 @@ index 0000000..c77c6c6 +#endif /* CONFIG_DEBUG_FS */ + diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c -index 14c7a23..c4ada8b 100644 +index 14c7a23..f01def1 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -46,9 +46,11 @@ @@ -851,7 +891,13 @@ index 14c7a23..c4ada8b 100644 char *kdata = NULL; atomic_inc(&dev->ioctl_count); -@@ -496,10 +460,14 @@ int drm_ioctl(struct inode *inode, struct file *filp, +@@ -492,14 +456,19 @@ int drm_ioctl(struct inode *inode, struct file *filp, + retcode = -EINVAL; + } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || + ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || +- ((ioctl->flags & DRM_MASTER) && !file_priv->is_master)) { ++ ((ioctl->flags & DRM_MASTER) && !file_priv->is_master) || ++ (!(ioctl->flags & DRM_CONTROL_ALLOW) && (file_priv->minor->type == DRM_MINOR_CONTROL))) { retcode = -EACCES; } else { if (cmd & (IOC_IN | IOC_OUT)) { @@ -870,7 +916,7 @@ index 14c7a23..c4ada8b 100644 } } -@@ -520,7 +488,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, +@@ -520,7 +489,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, } err_i1: @@ -879,7 +925,7 @@ index 14c7a23..c4ada8b 100644 kfree(kdata); atomic_dec(&dev->ioctl_count); if (retcode) -@@ -530,7 +498,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, +@@ -530,7 +499,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, EXPORT_SYMBOL(drm_ioctl); @@ -2415,7 +2461,7 @@ index 8df849f..bae5391 100644 -} -#endif diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 7c8b15b..d009661 100644 +index 7c8b15b..b9631e3 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -50,6 +50,7 @@ struct idr drm_minors_idr; @@ -2426,7 +2472,42 @@ index 7c8b15b..d009661 100644 static int drm_minor_get_id(struct drm_device *dev, int type) { -@@ -313,7 +314,15 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int t +@@ -158,6 +159,9 @@ void drm_master_put(struct drm_master **master) + int drm_setmaster_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv) + { ++ if (file_priv->is_master) ++ return 0; ++ + if (file_priv->minor->master && file_priv->minor->master != file_priv->master) + return -EINVAL; + +@@ -168,6 +172,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, + file_priv->minor->master != file_priv->master) { + mutex_lock(&dev->struct_mutex); + file_priv->minor->master = drm_master_get(file_priv->master); ++ file_priv->is_master = 1; + mutex_unlock(&dev->struct_mutex); + } + +@@ -177,10 +182,15 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, + int drm_dropmaster_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv) + { +- if (!file_priv->master) ++ if (!file_priv->is_master) ++ return -EINVAL; ++ ++ if (!file_priv->minor->master) + return -EINVAL; ++ + mutex_lock(&dev->struct_mutex); + drm_master_put(&file_priv->minor->master); ++ file_priv->is_master = 0; + mutex_unlock(&dev->struct_mutex); + return 0; + } +@@ -313,7 +323,15 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int t goto err_mem; } } else @@ -2443,7 +2524,7 @@ index 7c8b15b..d009661 100644 ret = drm_sysfs_device_add(new_minor); if (ret) { -@@ -372,6 +381,7 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, +@@ -372,6 +390,7 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, } if (drm_core_check_feature(dev, DRIVER_MODESET)) { @@ -2451,7 +2532,21 @@ index 7c8b15b..d009661 100644 ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL); if (ret) goto err_g2; -@@ -395,9 +405,9 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, +@@ -383,55 +402,36 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, + if (dev->driver->load) { + ret = dev->driver->load(dev, ent->driver_data); + if (ret) +- goto err_g3; ++ goto err_g4; + } + + /* setup the grouping for the legacy output */ + if (drm_core_check_feature(dev, DRIVER_MODESET)) { + ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); + if (ret) +- goto err_g3; ++ goto err_g4; + } list_add_tail(&dev->driver_item, &driver->device_list); @@ -2463,7 +2558,15 @@ index 7c8b15b..d009661 100644 return 0; -@@ -409,29 +419,7 @@ err_g1: +-err_g3: ++err_g4: + drm_put_minor(&dev->primary); ++err_g3: ++ if (drm_core_check_feature(dev, DRIVER_MODESET)) ++ drm_put_minor(&dev->control); + err_g2: + pci_disable_device(pdev); + err_g1: drm_free(dev, sizeof(*dev), DRM_MEM_STUB); return ret; } @@ -2494,7 +2597,7 @@ index 7c8b15b..d009661 100644 /** * Put a secondary minor number. -@@ -451,6 +439,10 @@ int drm_put_minor(struct drm_minor **minor_p) +@@ -451,6 +451,10 @@ int drm_put_minor(struct drm_minor **minor_p) if (minor->type == DRM_MINOR_LEGACY) drm_proc_cleanup(minor, drm_proc_root); @@ -2505,7 +2608,7 @@ index 7c8b15b..d009661 100644 drm_sysfs_device_remove(minor); idr_remove(&drm_minors_idr, minor->index); -@@ -459,3 +451,67 @@ int drm_put_minor(struct drm_minor **minor_p) +@@ -459,3 +463,67 @@ int drm_put_minor(struct drm_minor **minor_p) *minor_p = NULL; return 0; } @@ -2551,11 +2654,11 @@ index 7c8b15b..d009661 100644 + dev->agp = NULL; + } + -+ drm_ht_remove(&dev->map_hash); -+ drm_ctxbitmap_cleanup(dev); -+ + list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) + drm_rmmap(dev, r_list->map); ++ drm_ht_remove(&dev->map_hash); ++ ++ drm_ctxbitmap_cleanup(dev); + + if (drm_core_check_feature(dev, DRIVER_MODESET)) + drm_put_minor(&dev->control); @@ -2574,7 +2677,7 @@ index 7c8b15b..d009661 100644 +} +EXPORT_SYMBOL(drm_put_dev); diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c -index 5aa6780..bc0c684 100644 +index 5aa6780..8f93729 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -35,7 +35,9 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state) @@ -2620,7 +2723,15 @@ index 5aa6780..bc0c684 100644 /** * drm_sysfs_device_release - do nothing * @dev: Linux device -@@ -359,8 +349,8 @@ int drm_sysfs_connector_add(struct drm_connector *connector) +@@ -142,6 +132,7 @@ static struct device_attribute device_attrs[] = { + */ + static void drm_sysfs_device_release(struct device *dev) + { ++ memset(dev, 0, sizeof(struct device)); + return; + } + +@@ -359,8 +350,8 @@ int drm_sysfs_connector_add(struct drm_connector *connector) DRM_DEBUG("adding \"%s\" to sysfs\n", drm_get_connector_name(connector)); @@ -2631,7 +2742,7 @@ index 5aa6780..bc0c684 100644 ret = device_register(&connector->kdev); if (ret) { -@@ -461,6 +451,7 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) +@@ -461,6 +452,7 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, envp); } @@ -2639,7 +2750,7 @@ index 5aa6780..bc0c684 100644 /** * drm_sysfs_device_add - adds a class device to sysfs for a character driver -@@ -474,7 +465,6 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) +@@ -474,7 +466,6 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) int drm_sysfs_device_add(struct drm_minor *minor) { int err; @@ -2647,7 +2758,7 @@ index 5aa6780..bc0c684 100644 char *minor_str; minor->kdev.parent = &minor->dev->pdev->dev; -@@ -496,18 +486,8 @@ int drm_sysfs_device_add(struct drm_minor *minor) +@@ -496,21 +487,9 @@ int drm_sysfs_device_add(struct drm_minor *minor) goto err_out; } @@ -2663,10 +2774,13 @@ index 5aa6780..bc0c684 100644 - if (i > 0) - for (j = 0; j < i; j++) - device_remove_file(&minor->kdev, &device_attrs[j]); - device_unregister(&minor->kdev); +- device_unregister(&minor->kdev); err_out: +- + return err; + } -@@ -523,9 +503,5 @@ err_out: +@@ -523,9 +502,5 @@ err_out: */ void drm_sysfs_device_remove(struct drm_minor *minor) { @@ -6685,7 +6799,7 @@ index 1117b9c..193938b 100644 /* I2C registers for SDVO */ diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c -index b05cb67..0ab2d3a 100644 +index b05cb67..d2c3298 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -217,8 +217,8 @@ static const u32 filter_table[] = { @@ -7197,9 +7311,22 @@ index 88257c2..3d264f2 100644 if ( !test_bit( 0, &dev_priv->prim.wrapped ) ) { \ if ( dev_priv->prim.space < \ diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c -index c31afbd..32de4ce 100644 +index c31afbd..077c045 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c +@@ -511,9 +511,9 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init) + + #if __OS_HAS_AGP + if (!dev_priv->is_pci) { +- drm_core_ioremap(dev_priv->cce_ring, dev); +- drm_core_ioremap(dev_priv->ring_rptr, dev); +- drm_core_ioremap(dev->agp_buffer_map, dev); ++ drm_core_ioremap_wc(dev_priv->cce_ring, dev); ++ drm_core_ioremap_wc(dev_priv->ring_rptr, dev); ++ drm_core_ioremap_wc(dev->agp_buffer_map, dev); + if (!dev_priv->cce_ring->handle || + !dev_priv->ring_rptr->handle || + !dev->agp_buffer_map->handle) { @@ -525,11 +525,12 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init) } else #endif @@ -33731,10 +33858,22 @@ index fef2078..13a60f4 100644 .master_destroy = radeon_master_destroy, .irq_preinstall = radeon_driver_irq_preinstall, diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h -index 490bc7c..ed4d27e 100644 +index 490bc7c..8071d96 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h -@@ -126,6 +126,7 @@ enum radeon_family { +@@ -99,9 +99,10 @@ + * 1.27- Add support for IGP GART + * 1.28- Add support for VBL on CRTC2 + * 1.29- R500 3D cmd buffer support ++ * 1.30- Add support for occlusion queries + */ + #define DRIVER_MAJOR 1 +-#define DRIVER_MINOR 29 ++#define DRIVER_MINOR 30 + #define DRIVER_PATCHLEVEL 0 + + /* +@@ -126,6 +127,7 @@ enum radeon_family { CHIP_RV410, CHIP_RS400, CHIP_RS480, @@ -33742,7 +33881,7 @@ index 490bc7c..ed4d27e 100644 CHIP_RS690, CHIP_RS740, CHIP_RV515, -@@ -134,6 +135,16 @@ enum radeon_family { +@@ -134,6 +136,16 @@ enum radeon_family { CHIP_RV560, CHIP_RV570, CHIP_R580, @@ -33759,7 +33898,7 @@ index 490bc7c..ed4d27e 100644 CHIP_LAST, }; -@@ -160,10 +171,6 @@ enum radeon_chip_flags { +@@ -160,10 +172,6 @@ enum radeon_chip_flags { RADEON_IS_IGPGART = 0x01000000UL, }; @@ -33770,7 +33909,7 @@ index 490bc7c..ed4d27e 100644 typedef struct drm_radeon_freelist { unsigned int age; struct drm_buf *buf; -@@ -221,10 +228,11 @@ struct radeon_virt_surface { +@@ -221,10 +229,11 @@ struct radeon_virt_surface { u32 upper; u32 flags; struct drm_file *file_priv; @@ -33784,7 +33923,7 @@ index 490bc7c..ed4d27e 100644 struct drm_radeon_master_private { drm_local_map_t *sarea; -@@ -248,7 +256,6 @@ typedef struct drm_radeon_private { +@@ -248,7 +257,6 @@ typedef struct drm_radeon_private { drm_radeon_freelist_t *head; drm_radeon_freelist_t *tail; int last_buf; @@ -33792,7 +33931,7 @@ index 490bc7c..ed4d27e 100644 int writeback_works; int usec_timeout; -@@ -316,11 +323,31 @@ typedef struct drm_radeon_private { +@@ -316,11 +324,31 @@ typedef struct drm_radeon_private { /* starting from here on, data is preserved accross an open */ uint32_t flags; /* see radeon_chip_flags */ @@ -33825,7 +33964,7 @@ index 490bc7c..ed4d27e 100644 } drm_radeon_private_t; typedef struct drm_radeon_buf_priv { -@@ -338,6 +365,12 @@ extern int radeon_no_wb; +@@ -338,6 +366,12 @@ extern int radeon_no_wb; extern struct drm_ioctl_desc radeon_ioctls[]; extern int radeon_max_ioctl; @@ -33838,7 +33977,7 @@ index 490bc7c..ed4d27e 100644 /* Check whether the given hardware address is inside the framebuffer or the * GART area. */ -@@ -364,6 +397,9 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi +@@ -364,6 +398,9 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi extern int radeon_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_priv); extern u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv); @@ -33848,7 +33987,7 @@ index 490bc7c..ed4d27e 100644 extern void radeon_freelist_reset(struct drm_device * dev); extern struct drm_buf *radeon_freelist_get(struct drm_device * dev); -@@ -383,6 +419,10 @@ extern void radeon_mem_takedown(struct mem_block **heap); +@@ -383,6 +420,10 @@ extern void radeon_mem_takedown(struct mem_block **heap); extern void radeon_mem_release(struct drm_file *file_priv, struct mem_block *heap); @@ -33859,7 +33998,7 @@ index 490bc7c..ed4d27e 100644 /* radeon_irq.c */ extern void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state); extern int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv); -@@ -423,6 +463,21 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -423,6 +464,21 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, struct drm_file *file_priv, drm_radeon_kcmd_buffer_t *cmdbuf); @@ -33881,7 +34020,7 @@ index 490bc7c..ed4d27e 100644 /* Flags for stats.boxes */ #define RADEON_BOX_DMA_IDLE 0x1 -@@ -434,6 +489,8 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -434,6 +490,8 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, /* Register definitions, register access macros and drmAddMap constants * for Radeon kernel driver. */ @@ -33890,7 +34029,7 @@ index 490bc7c..ed4d27e 100644 #define RADEON_AGP_COMMAND 0x0f60 #define RADEON_AGP_COMMAND_PCI_CONFIG 0x0060 /* offset in PCI config */ -@@ -556,6 +613,56 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -556,6 +614,56 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, #define RS690_MC_AGP_BASE 0x102 #define RS690_MC_AGP_BASE_2 0x103 @@ -33947,7 +34086,7 @@ index 490bc7c..ed4d27e 100644 #define R520_MC_IND_INDEX 0x70 #define R520_MC_IND_WR_EN (1 << 24) #define R520_MC_IND_DATA 0x74 -@@ -580,7 +687,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -580,7 +688,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, /* pipe config regs */ #define R400_GB_PIPE_SELECT 0x402c #define R500_DYN_SCLK_PWMEM_PIPE 0x000d /* PLL */ @@ -33955,7 +34094,7 @@ index 490bc7c..ed4d27e 100644 #define R300_GB_TILE_CONFIG 0x4018 # define R300_ENABLE_TILING (1 << 0) # define R300_PIPE_COUNT_RV350 (0 << 1) -@@ -639,9 +745,22 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -639,9 +746,22 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, #define RADEON_SCRATCHOFF( x ) (RADEON_SCRATCH_REG_OFFSET + 4*(x)) @@ -33981,7 +34120,7 @@ index 490bc7c..ed4d27e 100644 #define RADEON_GEN_INT_CNTL 0x0040 # define RADEON_CRTC_VBLANK_MASK (1 << 0) -@@ -922,6 +1041,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -922,6 +1042,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, #define RADEON_CP_RB_CNTL 0x0704 # define RADEON_BUF_SWAP_32BIT (2 << 16) # define RADEON_RB_NO_UPDATE (1 << 27) @@ -33989,7 +34128,7 @@ index 490bc7c..ed4d27e 100644 #define RADEON_CP_RB_RPTR_ADDR 0x070c #define RADEON_CP_RB_RPTR 0x0710 #define RADEON_CP_RB_WPTR 0x0714 -@@ -983,6 +1103,14 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -983,6 +1104,14 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, # define RADEON_CNTL_BITBLT_MULTI 0x00009B00 # define RADEON_CNTL_SET_SCISSORS 0xC0001E00 @@ -34004,7 +34143,7 @@ index 490bc7c..ed4d27e 100644 #define RADEON_CP_PACKET_MASK 0xC0000000 #define RADEON_CP_PACKET_COUNT_MASK 0x3fff0000 #define RADEON_CP_PACKET0_REG_MASK 0x000007ff -@@ -1181,6 +1309,422 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -1181,6 +1310,422 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, #define R500_D1_VBLANK_INTERRUPT (1 << 4) #define R500_D2_VBLANK_INTERRUPT (1 << 5) @@ -34427,7 +34566,7 @@ index 490bc7c..ed4d27e 100644 /* Constants */ #define RADEON_MAX_USEC_TIMEOUT 100000 /* 100 ms */ -@@ -1190,6 +1734,11 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -1190,6 +1735,11 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, #define RADEON_LAST_SWI_REG RADEON_SCRATCH_REG3 #define RADEON_LAST_DISPATCH 1 @@ -34439,7 +34578,7 @@ index 490bc7c..ed4d27e 100644 #define RADEON_MAX_VB_AGE 0x7fffffff #define RADEON_MAX_VB_VERTS (0xffff) -@@ -1198,7 +1747,15 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, +@@ -1198,7 +1748,15 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev, #define RADEON_PCIGART_TABLE_SIZE (32*1024) #define RADEON_READ(reg) DRM_READ32( dev_priv->mmio, (reg) ) @@ -34456,7 +34595,7 @@ index 490bc7c..ed4d27e 100644 #define RADEON_READ8(reg) DRM_READ8( dev_priv->mmio, (reg) ) #define RADEON_WRITE8(reg,val) DRM_WRITE8( dev_priv->mmio, (reg), (val) ) -@@ -1238,11 +1795,19 @@ do { \ +@@ -1238,11 +1796,19 @@ do { \ RADEON_WRITE(RS690_MC_INDEX, RS690_MC_INDEX_WR_ACK); \ } while (0) @@ -34476,7 +34615,7 @@ index 490bc7c..ed4d27e 100644 else \ RS480_WRITE_MCIND(addr, val); \ } while (0) -@@ -1346,7 +1911,11 @@ do { \ +@@ -1346,7 +1912,11 @@ do { \ struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv; \ drm_radeon_sarea_t *sarea_priv = master_priv->sarea_priv; \ if ( sarea_priv->last_dispatch >= RADEON_MAX_VB_AGE ) { \ @@ -34489,7 +34628,7 @@ index 490bc7c..ed4d27e 100644 if ( __ret ) return __ret; \ sarea_priv->last_dispatch = 0; \ radeon_freelist_reset( dev ); \ -@@ -1368,21 +1937,40 @@ do { \ +@@ -1368,21 +1938,40 @@ do { \ OUT_RING( age ); \ } while (0) @@ -34533,7 +34672,7 @@ index 490bc7c..ed4d27e 100644 } \ _nr = n; dev_priv->ring.space -= (n) * sizeof(u32); \ ring = dev_priv->ring.start; \ -@@ -1399,19 +1987,16 @@ do { \ +@@ -1399,19 +1988,16 @@ do { \ DRM_ERROR( \ "ADVANCE_RING(): mismatch: nr: %x write: %x line: %d\n", \ ((dev_priv->ring.tail + _nr) & mask), \ @@ -34759,6 +34898,45 @@ index d465b2f..456cd04 100644 } } else { mmio_base = drm_get_resource_start(dev, 0); +diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c +index 7a339db..bfb92d2 100644 +--- a/drivers/gpu/drm/via/via_dma.c ++++ b/drivers/gpu/drm/via/via_dma.c +@@ -481,11 +481,13 @@ static int via_wait_idle(drm_via_private_t * dev_priv) + { + int count = 10000000; + +- while (!(VIA_READ(VIA_REG_STATUS) & VIA_VR_QUEUE_BUSY) && count--); ++ while (!(VIA_READ(VIA_REG_STATUS) & VIA_VR_QUEUE_BUSY) && --count) ++ ; + +- while (count-- && (VIA_READ(VIA_REG_STATUS) & ++ while (count && (VIA_READ(VIA_REG_STATUS) & + (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | +- VIA_3D_ENG_BUSY))) ; ++ VIA_3D_ENG_BUSY))) ++ --count; + return count; + } + +@@ -705,7 +707,7 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file * + switch (d_siz->func) { + case VIA_CMDBUF_SPACE: + while (((tmp_size = via_cmdbuf_space(dev_priv)) < d_siz->size) +- && count--) { ++ && --count) { + if (!d_siz->wait) { + break; + } +@@ -717,7 +719,7 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file * + break; + case VIA_CMDBUF_LAG: + while (((tmp_size = via_cmdbuf_lag(dev_priv)) > d_siz->size) +- && count--) { ++ && --count) { + if (!d_siz->wait) { + break; + } diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c index 0993b44..bc2f518 100644 --- a/drivers/gpu/drm/via/via_drv.c drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -r1.47 -r1.48 --- drm-nouveau.patch 5 May 2009 10:28:11 -0000 1.47 +++ drm-nouveau.patch 6 May 2009 03:12:03 -0000 1.48 @@ -185,55 +185,6 @@ index c1173d8..2e4e667 100644 mutex_lock(&dev->struct_mutex); drm_gem_object_unreference(obj); mutex_unlock(&dev->struct_mutex); -diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 5f7e431..a84acdb 100644 ---- a/drivers/gpu/drm/drm_stub.c -+++ b/drivers/gpu/drm/drm_stub.c -@@ -406,14 +406,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, - if (dev->driver->load) { - ret = dev->driver->load(dev, ent->driver_data); - if (ret) -- goto err_g3; -+ goto err_g4; - } - - /* setup the grouping for the legacy output */ - if (drm_core_check_feature(dev, DRIVER_MODESET)) { - ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); - if (ret) -- goto err_g3; -+ goto err_g4; - } - - list_add_tail(&dev->driver_item, &driver->device_list); -@@ -424,8 +424,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, - - return 0; - --err_g3: -+err_g4: - drm_put_minor(&dev->primary); -+err_g3: -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ drm_put_minor(&dev->control); - err_g2: - pci_disable_device(pdev); - err_g1: -@@ -507,11 +510,11 @@ void drm_put_dev(struct drm_device *dev) - dev->agp = NULL; - } - -- drm_ht_remove(&dev->map_hash); -- drm_ctxbitmap_cleanup(dev); -- - list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) - drm_rmmap(dev, r_list->map); -+ drm_ht_remove(&dev->map_hash); -+ -+ drm_ctxbitmap_cleanup(dev); - - if (drm_core_check_feature(dev, DRIVER_MODESET)) - drm_put_minor(&dev->control); diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile new file mode 100644 index 0000000..06483d0 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1590 retrieving revision 1.1591 diff -u -p -r1.1590 -r1.1591 --- kernel.spec 5 May 2009 10:28:13 -0000 1.1590 +++ kernel.spec 6 May 2009 03:12:04 -0000 1.1591 @@ -691,7 +691,6 @@ Patch1822: drm-intel-gen3-fb-hack.patch Patch1823: drm-intel-tiled-front.patch Patch1824: drm-intel-hdmi-edid-fix.patch Patch1825: drm-intel-tiling-transition.patch -Patch1826: linux-2.6-drm-r128-ioremap.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -1342,7 +1341,6 @@ ApplyPatch drm-intel-gen3-fb-hack.patch ApplyPatch drm-intel-tiled-front.patch ApplyPatch drm-intel-hdmi-edid-fix.patch ApplyPatch drm-intel-tiling-transition.patch -ApplyPatch linux-2.6-drm-r128-ioremap.patch # linux1394 git patches ApplyPatch linux-2.6-firewire-git-update.patch @@ -1965,6 +1963,11 @@ fi # and build. %changelog +* Wed May 06 2009 Dave Airlie 2.6.29.2-129 +- drm-next: update with latest patch queue for upstream + intel fixes +- drm-modesetting-radeon.patch: rebase onto drm-next +- drm-nouveau.patch: rebase onto drm-next + * Tue May 05 2009 Dave Airlie 2.6.29.2-128 - radeon kms: backport some fixes - put back old internal interface --- linux-2.6-drm-r128-ioremap.patch DELETED --- From wart at fedoraproject.org Wed May 6 03:53:21 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Wed, 6 May 2009 03:53:21 +0000 (UTC) Subject: rpms/prboom/F-10 .cvsignore, 1.9, 1.10 prboom.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <20090506035321.A86AC70108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/prboom/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24681 Modified Files: .cvsignore prboom.spec sources Log Message: Update to 2.5.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/prboom/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 21 Nov 2006 16:07:18 -0000 1.9 +++ .cvsignore 6 May 2009 03:52:51 -0000 1.10 @@ -1 +1 @@ -prboom-2.4.7.tar.gz +prboom-2.5.0.tar.gz Index: prboom.spec =================================================================== RCS file: /cvs/pkgs/rpms/prboom/F-10/prboom.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- prboom.spec 9 Feb 2008 06:37:26 -0000 1.15 +++ prboom.spec 6 May 2009 03:52:51 -0000 1.16 @@ -1,14 +1,14 @@ %define waddir %{_datadir}/doom Name: prboom -Version: 2.4.7 -Release: 3%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: Open source port of the DOOM game engine Group: Amusements/Games License: GPLv2+ URL: http://prboom.sourceforge.net/ -Source0: http://downloads.sourceforge.net/prboom/prboom-2.4.7.tar.gz +Source0: http://downloads.sourceforge.net/prboom/prboom-2.5.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog +* Tue May 5 2009 Wart 2.5.0-1 +- Update to 2.5.0 + * Fri Feb 8 2008 Wart 2.4.7-3 - Rebuild for gcc 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/prboom/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 21 Nov 2006 16:07:18 -0000 1.9 +++ sources 6 May 2009 03:52:51 -0000 1.10 @@ -1 +1 @@ -9942f521764d7f89df2218a456da4f02 prboom-2.4.7.tar.gz +a8a15f61fa2626ab98051ab2703378c4 prboom-2.5.0.tar.gz From airlied at fedoraproject.org Wed May 6 04:59:08 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Wed, 6 May 2009 04:59:08 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-rs690-hack.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.187, 1.188 Message-ID: <20090506045908.50BB970108@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31814 Modified Files: xorg-x11-drv-ati.spec Added Files: radeon-6.12.2-rs690-hack.patch Log Message: * Wed May 06 2009 Dave Airlie 6.12.2-12 - radeon-6.12.2-rs690-hack.patch - workaround rs690 hangs with firefox safely radeon-6.12.2-rs690-hack.patch: --- NEW FILE radeon-6.12.2-rs690-hack.patch --- diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c index b49c2fb..f9fe707 100644 --- a/src/radeon_exa_render.c +++ b/src/radeon_exa_render.c @@ -1265,6 +1265,11 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix, txfilter = (unit << R300_TX_ID_SHIFT); + /* workaround strange firefox chip hang on rs690 */ + if (info->ChipFamily == CHIP_FAMILY_RS600 || + info->ChipFamily == CHIP_FAMILY_RS690) + txfilter |= R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER); + if (pPict->repeat) { switch (pPict->repeatType) { case RepeatNormal: Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v retrieving revision 1.187 retrieving revision 1.188 diff -u -p -r1.187 -r1.188 --- xorg-x11-drv-ati.spec 5 May 2009 05:53:55 -0000 1.187 +++ xorg-x11-drv-ati.spec 6 May 2009 04:58:37 -0000 1.188 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.12.2 -Release: 11%{?dist} +Release: 12%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -19,6 +19,7 @@ Patch2: radeon-modeset-fixes.patch Patch6: radeon-6.9.0-bgnr-enable.patch Patch7: radeon-6.12.1-r600-fb-size.patch Patch8: radeon-src-readback-cpu.patch +Patch9: radeon-6.12.2-rs690-hack.patch ExcludeArch: s390 s390x @@ -45,6 +46,7 @@ X.Org X11 ati video driver. %patch6 -p1 -b .bgnr %patch7 -p1 -b .r600-fb-size %patch8 -p1 -b .srcrb +%patch9 -p1 -b .rs690 %build autoreconf -iv @@ -76,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Wed May 06 2009 Dave Airlie 6.12.2-12 +- radeon-6.12.2-rs690-hack.patch - workaround rs690 hangs with firefox safely + * Tue May 05 2009 Dave Airlie 6.12.2-11 - make src/mask prepare access force to GTT. From jnovy at fedoraproject.org Wed May 6 06:02:15 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Wed, 6 May 2009 06:02:15 +0000 (UTC) Subject: rpms/db4/devel patch.4.7.25.4,NONE,1.1 db4.spec,1.74,1.75 Message-ID: <20090506060216.1CC7D70108@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/db4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6759 Modified Files: db4.spec Added Files: patch.4.7.25.4 Log Message: * Wed May 6 2009 Jindrich Novy 4.7.25-12 - fix for Java API __repmgr_send crash where eid=SELF_EID, don't update master_id so soon after election (upstream bz#16299) --- NEW FILE patch.4.7.25.4 --- *** cvotn/dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 --- cvotn/dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 *************** *** 374,379 **** --- 374,380 ---- #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) #define IS_VALID_EID(e) ((e) >= 0) + #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) #define SELF_EID INT_MAX #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ *** cvotn/rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 --- cvotn/rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 *************** *** 33,39 **** static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); static void __rep_elect_master __P((ENV *, REP *)); static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); ! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); /* * __rep_elect -- --- 33,39 ---- static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); static void __rep_elect_master __P((ENV *, REP *)); static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); ! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); /* * __rep_elect -- *************** *** 55,61 **** ENV *env; LOG *lp; REP *rep; ! int done, eid, elected, full_elect, locked, in_progress, need_req; int ret, send_vote, t_ret; u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; u_int32_t tiebreaker; --- 55,61 ---- ENV *env; LOG *lp; REP *rep; ! int done, elected, full_elect, locked, in_progress, need_req; int ret, send_vote, t_ret; u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; u_int32_t tiebreaker; *************** *** 181,188 **** REP_SYSTEM_UNLOCK(env); (void)__rep_send_message(env, DB_EID_BROADCAST, REP_MASTER_REQ, NULL, NULL, 0, 0); ! ret = __rep_wait(env, &to, &eid, ! 0, REP_F_EPHASE0); REP_SYSTEM_LOCK(env); F_CLR(rep, REP_F_EPHASE0); switch (ret) { --- 181,187 ---- REP_SYSTEM_UNLOCK(env); (void)__rep_send_message(env, DB_EID_BROADCAST, REP_MASTER_REQ, NULL, NULL, 0, 0); ! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); REP_SYSTEM_LOCK(env); F_CLR(rep, REP_F_EPHASE0); switch (ret) { *************** *** 286,296 **** REP_SYSTEM_LOCK(env); goto vote; } ! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); switch (ret) { case 0: /* Check if election complete or phase complete. */ ! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { RPRINT(env, DB_VERB_REP_ELECT, (env, "Ended election phase 1")); goto edone; --- 285,295 ---- REP_SYSTEM_LOCK(env); goto vote; } ! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); switch (ret) { case 0: /* Check if election complete or phase complete. */ ! if (!IN_ELECTION(rep)) { RPRINT(env, DB_VERB_REP_ELECT, (env, "Ended election phase 1")); goto edone; *************** *** 398,412 **** REP_SYSTEM_LOCK(env); goto i_won; } ! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); RPRINT(env, DB_VERB_REP_ELECT, (env, "Ended election phase 2 %d", ret)); switch (ret) { case 0: ! if (eid != DB_EID_INVALID) ! goto edone; ! ret = DB_REP_UNAVAIL; ! break; case DB_REP_EGENCHG: if (to > timeout) to = timeout; --- 397,408 ---- REP_SYSTEM_LOCK(env); goto i_won; } ! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); RPRINT(env, DB_VERB_REP_ELECT, (env, "Ended election phase 2 %d", ret)); switch (ret) { case 0: ! goto edone; case DB_REP_EGENCHG: if (to > timeout) to = timeout; *************** *** 1050,1062 **** ENV *env; REP *rep; { - /* - * We often come through here twice, sometimes even more. We mustn't - * let the redundant calls affect stats counting. But rep_elect relies - * on this first part for setting eidp. - */ - rep->master_id = rep->eid; - if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { /* We've been through here already; avoid double counting. */ return; --- 1046,1051 ---- *************** *** 1093,1102 **** (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); static int ! __rep_wait(env, timeoutp, eidp, full_elect, flags) ENV *env; db_timeout_t *timeoutp; ! int *eidp, full_elect; u_int32_t flags; { DB_REP *db_rep; --- 1082,1091 ---- (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); static int ! __rep_wait(env, timeoutp, full_elect, flags) ENV *env; db_timeout_t *timeoutp; ! int full_elect; u_int32_t flags; { DB_REP *db_rep; *************** *** 1174,1180 **** F_CLR(rep, REP_F_EGENUPDATE); ret = DB_REP_EGENCHG; } else if (phase_over) { - *eidp = rep->master_id; done = 1; ret = 0; } --- 1163,1168 ---- *** cvotn/repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 --- cvotn/repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 *************** *** 100,105 **** --- 100,107 ---- control, rec, &nsites_sent, &npeers_sent)) != 0) goto out; } else { + DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); + /* * If this is a request that can be sent anywhere, then see if * we can send it to our peer (to save load on the master), but Index: db4.spec =================================================================== RCS file: /cvs/pkgs/rpms/db4/devel/db4.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- db4.spec 5 May 2009 21:17:40 -0000 1.74 +++ db4.spec 6 May 2009 06:01:43 -0000 1.75 @@ -9,13 +9,14 @@ Summary: The Berkeley DB database library (version 4) for C Name: db4 Version: 4.7.25 -Release: 11%{?dist}.1 +Release: 12%{?dist} Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz # db-4.7.25 upstream patches Patch0: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 Patch2: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3 +Patch3: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.4 # db-1.85 upstream patches 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 @@ -129,6 +130,7 @@ for building programs which use the Berk %patch0 -p0 -b .sequence %patch1 -p0 -b .deadlock %patch2 -p0 -b .dd-segfaults +%patch3 -p1 -b .java-api pushd db.1.85/PORT/linux %patch10 -p0 -b .1.1 @@ -378,6 +380,10 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Wed May 6 2009 Jindrich Novy 4.7.25-12 +- fix for Java API __repmgr_send crash where eid=SELF_EID, + don't update master_id so soon after election (upstream bz#16299) + * Tue May 05 2009 Karsten Hopp 4.7.25-11.1 - add s390 and s390x to java_arches From markmc at fedoraproject.org Wed May 6 08:12:16 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 6 May 2009 08:12:16 +0000 (UTC) Subject: rpms/kernel/F-11 TODO,1.68,1.69 Message-ID: <20090506081216.B05C070131@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20140 Modified Files: TODO Log Message: Merged in 2.6.29.2: linux-2.6-net-fix-another-gro-bug.patch linux-2.6-kvm-kconfig-irqchip.patch linux-2.6-kvm-mask-notifiers.patch linux-2.6-kvm-reset-pit-irq-on-unmask.patch Index: TODO =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v retrieving revision 1.68 retrieving revision 1.69 diff -u -p -r1.68 -r1.69 --- TODO 24 Apr 2009 04:34:34 -0000 1.68 +++ TODO 6 May 2009 08:11:44 -0000 1.69 @@ -97,18 +97,6 @@ Need for KVM PCI device assignment https://bugzilla.redhat.com/487103 -* linux-2.6-net-fix-another-gro-bug.patch: - virtio_net guest->remote GSO busted with 2.6.29 host - https://bugzilla.redhat.com/490266 - Should be in 2.6.29.1 - -* linux-2.6-kvm-kconfig-irqchip.patch - linux-2.6-kvm-mask-notifiers.patch - linux-2.6-kvm-reset-pit-irq-on-unmask.patch - Unable to run RHEL-5 Xen within KVM guest - https://bugzilla.redhat.com/show_bug.cgi?id=491625 - Should be in 2.6.29.2 - * linux-2.6-kvm-skip-pit-check.patch: Waiting to be pushed upstream from kvm git. From pghmcfc at fedoraproject.org Wed May 6 08:13:06 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Wed, 6 May 2009 08:13:06 +0000 (UTC) Subject: rpms/gnome-libs/F-11 gnome-libs-1.4.2-cleanlibs.patch, NONE, 1.1 gnome-libs-1.4.2-ppc64-config.patch, NONE, 1.1 gnome-libs.spec, 1.14, 1.15 Message-ID: <20090506081306.36BCA70108@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/gnome-libs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20672 Modified Files: gnome-libs.spec Added Files: gnome-libs-1.4.2-cleanlibs.patch gnome-libs-1.4.2-ppc64-config.patch Log Message: * Thu Apr 9 2009 Paul Howarth 1:1.4.2-14 - Use an alternative approach to rpath-fixing - hacking the supplied libtool rather than trying to use the system one - Additional %{?_isa} devel package dependencies now available - Clean up library linkage, linking libraries with the libs they need and only those libs - Fix config.guess and config.sub to support build on ppc64 gnome-libs-1.4.2-cleanlibs.patch: --- NEW FILE gnome-libs-1.4.2-cleanlibs.patch --- --- gnome-libs-1.4.2/support/Makefile.am 2009-04-17 10:45:31.000000000 +0100 +++ gnome-libs-1.4.2/support/Makefile.am 2009-04-17 10:44:49.000000000 +0100 @@ -3,6 +3,7 @@ supportexecincludedir = $(pkglibdir)/include INCLUDES = -D_GNU_SOURCE +LIBS = lib_LTLIBRARIES = libgnomesupport.la --- gnome-libs-1.4.2/libgnome/Makefile.am 2009-04-15 20:53:02.000000000 +0100 +++ gnome-libs-1.4.2/libgnome/Makefile.am 2009-04-17 11:01:32.000000000 +0100 @@ -22,6 +22,8 @@ -DVERSION=\""$(VERSION)"\" \ -DG_LOG_DOMAIN=\"Gnome\" +LIBS = + libgnome_la_SOURCES = \ gnome-config.c \ gnome-dentry.c \ @@ -87,7 +89,7 @@ gnome-config.o: parse-path.cP libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir) -libgnome_la_LIBADD = $(GLIB_LIBS) -lm -ldb1 +libgnome_la_LIBADD = $(LIBSUPPORT) $(LIBGNOME_LIBS) -ldb1 bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \ gconfigger gnome-gen-mimedb --- gnome-libs-1.4.2/libgnomeui/Makefile.am 2009-04-15 20:25:39.000000000 +0100 +++ gnome-libs-1.4.2/libgnomeui/Makefile.am 2009-04-17 13:00:27.000000000 +0100 @@ -26,6 +26,8 @@ -DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" \ -DG_LOG_DOMAIN=\"GnomeUI\" +LIBS = + EXTRA_HEADERS = libgnomeui_la_SOURCES = \ @@ -269,7 +271,14 @@ $(man_MANS) libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir) -libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) +libgnomeui_la_BOGUSLIBS = -lesd -laudiofile -ldb1 -lgmodule -ldl -lXi -lXext -lz +libgnomeui_la_LIBADD = \ + $(top_builddir)/libgnome/libgnome.la \ + $(top_builddir)/libart_lgpl/libart_lgpl.la \ + $(filter-out $(libgnomeui_la_BOGUSLIBS), $(LIBGNOMEUI_LIBS)) +libgnomeui_la_DEPENDENCIES = \ + $(top_builddir)/libgnome/libgnome.la \ + $(top_builddir)/libart_lgpl/libart_lgpl.la gnome_segv_LDADD = \ libgnomeui.la \ --- gnome-libs-1.4.2/libgnorba/Makefile.am 2009-04-15 20:57:57.000000000 +0100 +++ gnome-libs-1.4.2/libgnorba/Makefile.am 2009-04-17 12:15:49.000000000 +0100 @@ -27,6 +27,8 @@ -DGNOMESYSCONFDIR=\"$(sysconfdir)\" \ -DVERSION=\""$(VERSION)"\" +LIBS = + gnome_factory_built=\ gnome-factory.h \ gnome-factory-skels.c \ @@ -80,7 +82,17 @@ Table.h libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm +libgnorba_la_LIBADD = \ + $(filter-out -lORBitutil -lm, $(ORBIT_LIBS)) \ + $(top_builddir)/libgnomeui/libgnomeui.la \ + $(top_builddir)/libgnome/libgnome.la \ + $(filter-out -lesd -laudiofile -ldb1 -lgdk_imlib -lXi -lXext -lSM -lICE -lm, $(LIBGNOMEUI_LIBS)) +libgnorba_la_DEPENDENCIES = \ + $(top_builddir)/libgnomeui/libgnomeui.la \ + $(top_builddir)/libgnome/libgnome.la + +libgnorbagtk_la_LIBADD = $(filter-out -lORBitCosNaming -lORBitutil -lm, $(ORBIT_LIBS) $(X_LIBS) -lX11) +libgnorbagtk_la_DEPENDENCIES = loadshlib_SOURCES = loadshlib.c --- gnome-libs-1.4.2/zvt/Makefile.am 2002-03-18 21:18:10.000000000 +0000 +++ gnome-libs-1.4.2/zvt/Makefile.am 2009-04-17 13:04:20.000000000 +0100 @@ -10,6 +10,8 @@ $(GDK_IMLIB_CFLAGS) \ -DGNOMESBINDIR=\""$(sbindir)"\" +LIBS = + libzvt_la_SOURCES = \ gnome-login-support.h \ gnome-login-support.c \ @@ -22,6 +24,8 @@ zvtterm.c libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir) +libzvt_la_LIBADD = $(filter-out -lSM -lICE -lgmodule -ldl -lXi -lXext -lm, $(UTIL_LIBS) $(GTK_LIBS) $(GDK_IMLIB_LIBS)) +libzvt_la_DEPENDENCIES = libzvtinclude_HEADERS = \ lists.h \ --- gnome-libs-1.4.2/gtk-xmhtml/Makefile.am 2009-04-15 21:20:41.000000000 +0100 +++ gnome-libs-1.4.2/gtk-xmhtml/Makefile.am 2009-04-17 13:18:04.000000000 +0100 @@ -54,7 +54,8 @@ toolkit.h libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir) -libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS) +libgtkxmhtml_la_LIBADD = $(filter-out -lSM -lICE -lgmodule -ldl -lXi -lXext, $(LIBGTKXMHTML_LIBS)) +libgtkxmhtml_la_DEPENDENCIES = noinst_PROGRAMS = htmltest --- gnome-libs-1.4.2/ltmain.sh 2002-08-01 15:30:57.000000000 +0100 +++ gnome-libs-1.4.2/ltmain.sh 2002-06-06 12:27:06.000000000 +0100 @@ -615,6 +623,10 @@ # Now arrange that obj and lo_libobj become the same file $show "(cd $xdir && $LN_S $baseobj $libobj)" if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + $run $rm "$lockfile" + fi exit 0 else error=$? @@ -745,6 +757,7 @@ linker_flags= dllsearchpath= lib_search_path=`pwd` + inst_prefix_dir= avoid_version=no dlfiles= @@ -875,6 +888,11 @@ prev= continue ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; release) release="-$arg" prev= @@ -976,6 +994,11 @@ continue ;; + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) @@ -1530,8 +1564,6 @@ convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" tmp_libs= - #PKGW - dependency_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" case "$tmp_libs " in @@ -1647,8 +1679,6 @@ fi tmp_libs= - #PKGW - dependency_libs= for deplib in $dependency_libs; do case $deplib in -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test @@ -1855,7 +1885,16 @@ if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + add_dir= + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + add_dir="$add_dir -L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in @@ -1865,7 +1904,17 @@ add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + add_dir= + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + add_dir="$add_dir -L$libdir" + add="-l$name" fi @@ -3622,8 +3682,9 @@ # relink executable if necessary if test -n \"\$relink_command\"; then - if (eval \$relink_command); then : + if relink_command_output=\`eval \$relink_command 2>&1\`; then : else + $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" exit 1 fi @@ -3827,7 +3888,7 @@ fi done # Quote the link command for shipping. - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" + relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. @@ -4128,12 +4189,30 @@ dir="$dir$objdir" if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + if test "$inst_prefix_dir" = "$destdir"; then + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 + exit 1 + fi + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` + fi + $echo "$modename: warning: relinking \`$file'" 1>&2 $show "$relink_command" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue + exit 1 fi fi gnome-libs-1.4.2-ppc64-config.patch: --- NEW FILE gnome-libs-1.4.2-ppc64-config.patch --- --- gnome-libs-1.4.2/config.guess 2002-08-01 15:30:57.000000000 +0100 +++ gnome-libs-1.4.2/config.guess 2009-04-21 15:07:58.000000000 +0100 @@ -811,6 +811,9 @@ rm -f $dummy.c $dummy echo powerpc-unknown-linux-gnu${LIBC} exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; alpha:Linux:*:*) cat <$dummy.s .data --- gnome-libs-1.4.2/config.sub 2002-08-01 15:30:57.000000000 +0100 +++ gnome-libs-1.4.2/config.sub 2009-04-21 15:09:15.000000000 +0100 @@ -721,6 +721,10 @@ ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ;; Index: gnome-libs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-libs/F-11/gnome-libs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- gnome-libs.spec 5 Mar 2009 16:19:51 -0000 1.14 +++ gnome-libs.spec 6 May 2009 08:12:35 -0000 1.15 @@ -5,7 +5,7 @@ Name: gnome-libs Epoch: 1 Version: 1.4.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: The main GNOME1 libraries License: LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising) Group: System Environment/Libraries @@ -30,9 +30,9 @@ Requires: utempter BuildRequires: zlib-devel BuildRequires: imlib-devel%{?_isa} BuildRequires: esound-devel%{?_isa} -BuildRequires: ORBit-devel +BuildRequires: ORBit-devel%{?_isa} BuildRequires: glib-devel%{?_isa} -BuildRequires: gtk+-devel +BuildRequires: gtk+-devel%{?_isa} BuildRequires: /usr/bin/automake-1.4 BuildRequires: libpng10-devel%{?_isa} >= 1.0.13 BuildRequires: libtool @@ -75,6 +75,8 @@ Patch104: gnome-libs-1.4.2-xdg-ope Patch105: gnome-libs-1.4.2-popthelp-format.patch Patch106: gnome-libs-1.4.2-norecurse.patch Patch107: gnome-libs-1.4.2-gnome-config-no-Llibdir.patch +Patch108: gnome-libs-1.4.2-cleanlibs.patch +Patch109: gnome-libs-1.4.2-ppc64-config.patch %description GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI @@ -88,14 +90,14 @@ Group: Development/Libraries License: LGPLv2+ and (LGPLv2+ and BSD with advertising) Requires: gnome-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: glib-devel%{?_isa} -Requires: gtk+-devel -Requires: ORBit-devel +Requires: gtk+-devel%{?_isa} +Requires: ORBit-devel%{?_isa} Requires: imlib-devel%{?_isa} Requires: esound-devel%{?_isa} Requires: libSM-devel%{?_isa} Requires: pkgconfig -# pkg-config knows to use gnome-config when asked about libgnomeui +# pkg-config knows to use gnome-config when asked about gnomeui Provides: pkgconfig(gnomeui) = %{version} # For ownership of %{_datadir}/aclocal @@ -156,10 +158,16 @@ cd - %patch105 -p1 -b .popthelp-format %patch106 -p1 -b .norecurse %patch107 -p1 -b .nolibdir +%patch108 -p1 -b .cleanlibs +%patch109 -p1 -b .ppc64-config /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8 %{__mv} -f ChangeLog.utf-8 ChangeLog +# Hack to remove redundant "-lm" from the output of audiofile-config --libs +%{__mkdir} pkgconfig +%{__sed} -e 's/ -lm//' %{_libdir}/pkgconfig/audiofile.pc > pkgconfig/audiofile.pc + %build # db1 @@ -190,9 +198,12 @@ echo 'dbinclude is: %{dbinclude}' CFLAGS="%{optflags} $(pkg-config --cflags libpng10)" export CPPFLAGS="$(pkg-config --cflags libpng10)" +export PKG_CONFIG_PATH=$(pwd)/pkgconfig %configure --with-kde-datadir=%{_datadir} --enable-prefer-db1 --disable-gtk-doc %{__perl} -pi -e 's/-ldb1//g; s/-ldb//g;' gnome-config -%{__make} LIBTOOL=/usr/bin/libtool +# Kill bogus RPATHs +%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool +%{__make} %install %{__rm} -rf %{buildroot} @@ -310,6 +321,14 @@ export LD_LIBRARY_PATH=${SAVE_LLP} %{_libdir}/libgnomeui.so %changelog +* Thu Apr 9 2009 Paul Howarth 1:1.4.2-14 +- Use an alternative approach to rpath-fixing - hacking the supplied libtool + rather than trying to use the system one +- Additional %%{?_isa} devel package dependencies now available +- Clean up library linkage, linking libraries with the libs they need and only + those libs +- Fix config.guess and config.sub to support build on ppc64 + * Thu Mar 5 2009 Paul Howarth 1:1.4.2-13 - Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in libglade and possibly other packages built on gnome-libs; an actual .pc file From markmc at fedoraproject.org Wed May 6 08:24:00 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 6 May 2009 08:24:00 +0000 (UTC) Subject: rpms/kernel/F-11 TODO,1.69,1.70 Message-ID: <20090506082400.D832E70108@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22129 Modified Files: TODO Log Message: Update status of linux-2.6-pci-sysfs-remove-id.patch Index: TODO =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- TODO 6 May 2009 08:11:44 -0000 1.69 +++ TODO 6 May 2009 08:23:30 -0000 1.70 @@ -93,8 +93,7 @@ Queued by DaveM for next release. * linux-2.6-pci-sysfs-remove-id.patch - In jbarnes linux-next tree for 2.6.30 - Need for KVM PCI device assignment + In 2.6.30-rc1. Needed for KVM PCI device assignment https://bugzilla.redhat.com/487103 * linux-2.6-kvm-skip-pit-check.patch: From perex at fedoraproject.org Wed May 6 08:28:13 2009 From: perex at fedoraproject.org (Jaroslav Kysela) Date: Wed, 6 May 2009 08:28:13 +0000 (UTC) Subject: rpms/alsa-lib/F-10 .cvsignore, 1.36, 1.37 alsa-lib.spec, 1.81, 1.82 sources, 1.40, 1.41 Message-ID: <20090506082813.9478970108@cvs1.fedora.phx.redhat.com> Author: perex Update of /cvs/pkgs/rpms/alsa-lib/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22783 Modified Files: .cvsignore alsa-lib.spec sources Log Message: updated to 1.0.20 final Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- .cvsignore 20 Jan 2009 10:21:13 -0000 1.36 +++ .cvsignore 6 May 2009 08:27:43 -0000 1.37 @@ -23,3 +23,4 @@ alsa-lib-1.0.17a.tar.bz2 alsa-lib-1.0.18rc3.tar.bz2 alsa-lib-1.0.18.tar.bz2 alsa-lib-1.0.19.tar.bz2 +alsa-lib-1.0.20.tar.bz2 Index: alsa-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/alsa-lib.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -p -r1.81 -r1.82 --- alsa-lib.spec 4 Feb 2009 10:19:44 -0000 1.81 +++ alsa-lib.spec 6 May 2009 08:27:43 -0000 1.82 @@ -4,8 +4,8 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib -Version: 1.0.19 -Release: 2%{?prever_dot}%{?dist} +Version: 1.0.20 +Release: 1%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 @@ -93,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/alsa.m4 %changelog +* Wed May 6 2009 Jaroslav Kysela - 1.0.20-1 +- Updated to 1.0.20 final + * Wed Feb 4 2009 Jaroslav Kysela - 1.0.19-2 - Make doxygen documentation same for all architectures (bz#465205) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- sources 20 Jan 2009 10:21:14 -0000 1.40 +++ sources 6 May 2009 08:27:43 -0000 1.41 @@ -1 +1 @@ -73db3666c211e5fb023bb77450cf430d alsa-lib-1.0.19.tar.bz2 +6e9080ba1faa5d3739d14dd76c62d8dc alsa-lib-1.0.20.tar.bz2 From pghmcfc at fedoraproject.org Wed May 6 08:29:56 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Wed, 6 May 2009 08:29:56 +0000 (UTC) Subject: rpms/gnome-libs/F-10 gnome-libs-1.4.2-cleanlibs.patch, NONE, 1.1 gnome-libs-1.4.2-gnome-config-no-Llibdir.patch, NONE, 1.1 gnome-libs-1.4.2-ppc64-config.patch, NONE, 1.1 gnome-libs.spec, 1.11, 1.12 Message-ID: <20090506082956.B2C5270108@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/gnome-libs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22850 Modified Files: gnome-libs.spec Added Files: gnome-libs-1.4.2-cleanlibs.patch gnome-libs-1.4.2-gnome-config-no-Llibdir.patch gnome-libs-1.4.2-ppc64-config.patch Log Message: * Thu Apr 9 2009 Paul Howarth 1:1.4.2-14 - Use an alternative approach to rpath-fixing - hacking the supplied libtool rather than trying to use the system one - Clean up library linkage, linking libraries with the libs they need and only those libs - Fix config.guess and config.sub to support build on ppc64 - Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in libglade and possibly other packages built on gnome-libs; an actual .pc file isn't needed because pkg-config knows to use gnome-config for this - Weed out redundant -L%{_libdir} options from gnome-config output - Specify Instruction Set Architecture (%{?_isa}) in devel package requires (where available) - BerkeleyDB source moved to download.oracle.com gnome-libs-1.4.2-cleanlibs.patch: --- NEW FILE gnome-libs-1.4.2-cleanlibs.patch --- --- gnome-libs-1.4.2/support/Makefile.am 2009-04-17 10:45:31.000000000 +0100 +++ gnome-libs-1.4.2/support/Makefile.am 2009-04-17 10:44:49.000000000 +0100 @@ -3,6 +3,7 @@ supportexecincludedir = $(pkglibdir)/include INCLUDES = -D_GNU_SOURCE +LIBS = lib_LTLIBRARIES = libgnomesupport.la --- gnome-libs-1.4.2/libgnome/Makefile.am 2009-04-15 20:53:02.000000000 +0100 +++ gnome-libs-1.4.2/libgnome/Makefile.am 2009-04-17 11:01:32.000000000 +0100 @@ -22,6 +22,8 @@ -DVERSION=\""$(VERSION)"\" \ -DG_LOG_DOMAIN=\"Gnome\" +LIBS = + libgnome_la_SOURCES = \ gnome-config.c \ gnome-dentry.c \ @@ -87,7 +89,7 @@ gnome-config.o: parse-path.cP libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir) -libgnome_la_LIBADD = $(GLIB_LIBS) -lm -ldb1 +libgnome_la_LIBADD = $(LIBSUPPORT) $(LIBGNOME_LIBS) -ldb1 bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \ gconfigger gnome-gen-mimedb --- gnome-libs-1.4.2/libgnomeui/Makefile.am 2009-04-15 20:25:39.000000000 +0100 +++ gnome-libs-1.4.2/libgnomeui/Makefile.am 2009-04-17 13:00:27.000000000 +0100 @@ -26,6 +26,8 @@ -DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" \ -DG_LOG_DOMAIN=\"GnomeUI\" +LIBS = + EXTRA_HEADERS = libgnomeui_la_SOURCES = \ @@ -269,7 +271,14 @@ $(man_MANS) libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir) -libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) +libgnomeui_la_BOGUSLIBS = -lesd -laudiofile -ldb1 -lgmodule -ldl -lXi -lXext -lz +libgnomeui_la_LIBADD = \ + $(top_builddir)/libgnome/libgnome.la \ + $(top_builddir)/libart_lgpl/libart_lgpl.la \ + $(filter-out $(libgnomeui_la_BOGUSLIBS), $(LIBGNOMEUI_LIBS)) +libgnomeui_la_DEPENDENCIES = \ + $(top_builddir)/libgnome/libgnome.la \ + $(top_builddir)/libart_lgpl/libart_lgpl.la gnome_segv_LDADD = \ libgnomeui.la \ --- gnome-libs-1.4.2/libgnorba/Makefile.am 2009-04-15 20:57:57.000000000 +0100 +++ gnome-libs-1.4.2/libgnorba/Makefile.am 2009-04-17 12:15:49.000000000 +0100 @@ -27,6 +27,8 @@ -DGNOMESYSCONFDIR=\"$(sysconfdir)\" \ -DVERSION=\""$(VERSION)"\" +LIBS = + gnome_factory_built=\ gnome-factory.h \ gnome-factory-skels.c \ @@ -80,7 +82,17 @@ Table.h libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm +libgnorba_la_LIBADD = \ + $(filter-out -lORBitutil -lm, $(ORBIT_LIBS)) \ + $(top_builddir)/libgnomeui/libgnomeui.la \ + $(top_builddir)/libgnome/libgnome.la \ + $(filter-out -lesd -laudiofile -ldb1 -lgdk_imlib -lXi -lXext -lSM -lICE -lm, $(LIBGNOMEUI_LIBS)) +libgnorba_la_DEPENDENCIES = \ + $(top_builddir)/libgnomeui/libgnomeui.la \ + $(top_builddir)/libgnome/libgnome.la + +libgnorbagtk_la_LIBADD = $(filter-out -lORBitCosNaming -lORBitutil -lm, $(ORBIT_LIBS) $(X_LIBS) -lX11) +libgnorbagtk_la_DEPENDENCIES = loadshlib_SOURCES = loadshlib.c --- gnome-libs-1.4.2/zvt/Makefile.am 2002-03-18 21:18:10.000000000 +0000 +++ gnome-libs-1.4.2/zvt/Makefile.am 2009-04-17 13:04:20.000000000 +0100 @@ -10,6 +10,8 @@ $(GDK_IMLIB_CFLAGS) \ -DGNOMESBINDIR=\""$(sbindir)"\" +LIBS = + libzvt_la_SOURCES = \ gnome-login-support.h \ gnome-login-support.c \ @@ -22,6 +24,8 @@ zvtterm.c libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir) +libzvt_la_LIBADD = $(filter-out -lSM -lICE -lgmodule -ldl -lXi -lXext -lm, $(UTIL_LIBS) $(GTK_LIBS) $(GDK_IMLIB_LIBS)) +libzvt_la_DEPENDENCIES = libzvtinclude_HEADERS = \ lists.h \ --- gnome-libs-1.4.2/gtk-xmhtml/Makefile.am 2009-04-15 21:20:41.000000000 +0100 +++ gnome-libs-1.4.2/gtk-xmhtml/Makefile.am 2009-04-17 13:18:04.000000000 +0100 @@ -54,7 +54,8 @@ toolkit.h libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir) -libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS) +libgtkxmhtml_la_LIBADD = $(filter-out -lSM -lICE -lgmodule -ldl -lXi -lXext, $(LIBGTKXMHTML_LIBS)) +libgtkxmhtml_la_DEPENDENCIES = noinst_PROGRAMS = htmltest --- gnome-libs-1.4.2/ltmain.sh 2002-08-01 15:30:57.000000000 +0100 +++ gnome-libs-1.4.2/ltmain.sh 2002-06-06 12:27:06.000000000 +0100 @@ -615,6 +623,10 @@ # Now arrange that obj and lo_libobj become the same file $show "(cd $xdir && $LN_S $baseobj $libobj)" if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + $run $rm "$lockfile" + fi exit 0 else error=$? @@ -745,6 +757,7 @@ linker_flags= dllsearchpath= lib_search_path=`pwd` + inst_prefix_dir= avoid_version=no dlfiles= @@ -875,6 +888,11 @@ prev= continue ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; release) release="-$arg" prev= @@ -976,6 +994,11 @@ continue ;; + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) @@ -1530,8 +1564,6 @@ convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" tmp_libs= - #PKGW - dependency_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" case "$tmp_libs " in @@ -1647,8 +1679,6 @@ fi tmp_libs= - #PKGW - dependency_libs= for deplib in $dependency_libs; do case $deplib in -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test @@ -1855,7 +1885,16 @@ if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + add_dir= + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + add_dir="$add_dir -L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in @@ -1865,7 +1904,17 @@ add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + add_dir= + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + add_dir="$add_dir -L$libdir" + add="-l$name" fi @@ -3622,8 +3682,9 @@ # relink executable if necessary if test -n \"\$relink_command\"; then - if (eval \$relink_command); then : + if relink_command_output=\`eval \$relink_command 2>&1\`; then : else + $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" exit 1 fi @@ -3827,7 +3888,7 @@ fi done # Quote the link command for shipping. - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" + relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. @@ -4128,12 +4189,30 @@ dir="$dir$objdir" if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + if test "$inst_prefix_dir" = "$destdir"; then + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 + exit 1 + fi + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` + fi + $echo "$modename: warning: relinking \`$file'" 1>&2 $show "$relink_command" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue + exit 1 fi fi gnome-libs-1.4.2-gnome-config-no-Llibdir.patch: --- NEW FILE gnome-libs-1.4.2-gnome-config-no-Llibdir.patch --- --- gnome-libs-1.4.2/gnome-config.in 2009-03-05 13:31:05.000000000 +0000 +++ gnome-libs-1.4.2/gnome-config.in 2009-03-05 13:34:09.000000000 +0000 @@ -274,6 +274,7 @@ case "$i" in # a library, save it for later, in reverse order -l*) rev_libs="$i $rev_libs" ;; + -L${libdir}) ;; # redundant -L*|-R*) if $libs_L; then case " $lib_L_flags " in gnome-libs-1.4.2-ppc64-config.patch: --- NEW FILE gnome-libs-1.4.2-ppc64-config.patch --- --- gnome-libs-1.4.2/config.guess 2002-08-01 15:30:57.000000000 +0100 +++ gnome-libs-1.4.2/config.guess 2009-04-21 15:07:58.000000000 +0100 @@ -811,6 +811,9 @@ rm -f $dummy.c $dummy echo powerpc-unknown-linux-gnu${LIBC} exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; alpha:Linux:*:*) cat <$dummy.s .data --- gnome-libs-1.4.2/config.sub 2002-08-01 15:30:57.000000000 +0100 +++ gnome-libs-1.4.2/config.sub 2009-04-21 15:09:15.000000000 +0100 @@ -721,6 +721,10 @@ ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ;; Index: gnome-libs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-libs/F-10/gnome-libs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- gnome-libs.spec 30 Aug 2008 08:06:16 -0000 1.11 +++ gnome-libs.spec 6 May 2009 08:29:26 -0000 1.12 @@ -5,7 +5,7 @@ Name: gnome-libs Epoch: 1 Version: 1.4.2 -Release: 10%{?dist} +Release: 14%{?dist} Summary: The main GNOME1 libraries License: LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising) Group: System Environment/Libraries @@ -15,7 +15,7 @@ URL: http://www.gnome.org/ # http://cvs.fedora.redhat.com/viewcvs/devel/gnome-libs/ Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-libs/1.4/gnome-libs-%{version}.tar.bz2 Source2: gnome-libs-pofiles.tar.gz -Source3: http://downloads.sleepycat.com/db.1.85.tar.gz +Source3: http://download.oracle.com/berkeley-db/db.1.85.tar.gz Source4: utf8-ta.po BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} >= 7 @@ -28,17 +28,17 @@ Requires: htmlview Requires: utempter BuildRequires: zlib-devel -BuildRequires: imlib-devel -BuildRequires: esound-devel -BuildRequires: ORBit-devel -BuildRequires: glib-devel -BuildRequires: gtk+-devel +BuildRequires: imlib-devel%{?_isa} +BuildRequires: esound-devel%{?_isa} +BuildRequires: ORBit-devel%{?_isa} +BuildRequires: glib-devel%{?_isa} +BuildRequires: gtk+-devel%{?_isa} BuildRequires: /usr/bin/automake-1.4 -BuildRequires: libpng10-devel >= 1.0.13 +BuildRequires: libpng10-devel%{?_isa} >= 1.0.13 BuildRequires: libtool BuildRequires: gettext BuildRequires: libXpm-devel -BuildRequires: libXt-devel +BuildRequires: libXt-devel%{?_isa} BuildRequires: gtk-doc # Red Hat patches @@ -74,6 +74,9 @@ Patch103: gnome-libs-1.4.2-umode_t Patch104: gnome-libs-1.4.2-xdg-open.patch Patch105: gnome-libs-1.4.2-popthelp-format.patch Patch106: gnome-libs-1.4.2-norecurse.patch +Patch107: gnome-libs-1.4.2-gnome-config-no-Llibdir.patch +Patch108: gnome-libs-1.4.2-cleanlibs.patch +Patch109: gnome-libs-1.4.2-ppc64-config.patch %description GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI @@ -85,19 +88,26 @@ needed to run GNOME 1 applications. Summary: Libraries and headers for GNOME 1 application development Group: Development/Libraries License: LGPLv2+ and (LGPLv2+ and BSD with advertising) -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: gtk+-devel -Requires: ORBit-devel -Requires: imlib-devel -Requires: esound-devel -Requires: libSM-devel +Requires: gnome-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: glib-devel%{?_isa} +Requires: gtk+-devel%{?_isa} +Requires: ORBit-devel%{?_isa} +Requires: imlib-devel%{?_isa} +Requires: esound-devel%{?_isa} +Requires: libSM-devel%{?_isa} Requires: pkgconfig +# pkg-config knows to use gnome-config when asked about gnomeui +Provides: pkgconfig(gnomeui) = %{version} + # For ownership of %{_datadir}/aclocal Requires: automake # Make sure we have the same-arch glib-devel package (#445981) +# Needed where %{_isa} isn't yet supported +%if "%{?_isa}" == "" Requires: %{_libdir}/pkgconfig/glib.pc +%endif %description devel GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI @@ -147,10 +157,17 @@ cd - %endif %patch105 -p1 -b .popthelp-format %patch106 -p1 -b .norecurse +%patch107 -p1 -b .nolibdir +%patch108 -p1 -b .cleanlibs +%patch109 -p1 -b .ppc64-config /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8 %{__mv} -f ChangeLog.utf-8 ChangeLog +# Hack to remove redundant "-lm" from the output of audiofile-config --libs +%{__mkdir} pkgconfig +%{__sed} -e 's/ -lm//' %{_libdir}/pkgconfig/audiofile.pc > pkgconfig/audiofile.pc + %build # db1 @@ -181,9 +198,12 @@ echo 'dbinclude is: %{dbinclude}' CFLAGS="%{optflags} $(pkg-config --cflags libpng10)" export CPPFLAGS="$(pkg-config --cflags libpng10)" +export PKG_CONFIG_PATH=$(pwd)/pkgconfig %configure --with-kde-datadir=%{_datadir} --enable-prefer-db1 --disable-gtk-doc %{__perl} -pi -e 's/-ldb1//g; s/-ldb//g;' gnome-config -%{__make} LIBTOOL=/usr/bin/libtool +# Kill bogus RPATHs +%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool +%{__make} %install %{__rm} -rf %{buildroot} @@ -301,6 +321,28 @@ export LD_LIBRARY_PATH=${SAVE_LLP} %{_libdir}/libgnomeui.so %changelog +* Thu Apr 9 2009 Paul Howarth 1:1.4.2-14 +- Use an alternative approach to rpath-fixing - hacking the supplied libtool + rather than trying to use the system one +- Additional %%{?_isa} devel package dependencies now available +- Clean up library linkage, linking libraries with the libs they need and only + those libs +- Fix config.guess and config.sub to support build on ppc64 + +* Thu Mar 5 2009 Paul Howarth 1:1.4.2-13 +- Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in + libglade and possibly other packages built on gnome-libs; an actual .pc file + isn't needed because pkg-config knows to use gnome-config for this +- Weed out redundant -L%%{_libdir} options from gnome-config output + +* Tue Feb 24 2009 Fedora Release Engineering 1:1.4.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Nov 20 2008 Paul Howarth 1:1.4.2-11 +- Specify Instruction Set Architecture (%%{?_isa}) in devel package requires + (where available) +- BerkeleyDB source moved to download.oracle.com + * Fri Aug 29 2008 Paul Howarth 1:1.4.2-10 - Use %%patch0 rather than %%patch in %%prep - Fix patches to work without fuzz From perex at fedoraproject.org Wed May 6 08:36:23 2009 From: perex at fedoraproject.org (Jaroslav Kysela) Date: Wed, 6 May 2009 08:36:23 +0000 (UTC) Subject: rpms/alsa-lib/F-11 .cvsignore, 1.36, 1.37 alsa-lib.spec, 1.82, 1.83 sources, 1.40, 1.41 Message-ID: <20090506083623.405EB70108@cvs1.fedora.phx.redhat.com> Author: perex Update of /cvs/pkgs/rpms/alsa-lib/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23645 Modified Files: .cvsignore alsa-lib.spec sources Log Message: updated to 1.0.20 final Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- .cvsignore 20 Jan 2009 10:16:50 -0000 1.36 +++ .cvsignore 6 May 2009 08:35:52 -0000 1.37 @@ -23,3 +23,4 @@ alsa-lib-1.0.17a.tar.bz2 alsa-lib-1.0.18rc3.tar.bz2 alsa-lib-1.0.18.tar.bz2 alsa-lib-1.0.19.tar.bz2 +alsa-lib-1.0.20.tar.bz2 Index: alsa-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/alsa-lib.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -p -r1.82 -r1.83 --- alsa-lib.spec 24 Feb 2009 00:45:01 -0000 1.82 +++ alsa-lib.spec 6 May 2009 08:35:52 -0000 1.83 @@ -4,8 +4,8 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib -Version: 1.0.19 -Release: 3%{?prever_dot}%{?dist} +Version: 1.0.20 +Release: 1%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 @@ -93,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/alsa.m4 %changelog +* Wed May 6 2009 Jaroslav Kysela - 1.0.20-1 +- Updated to 1.0.20 final + * Mon Feb 23 2009 Fedora Release Engineering - 1.0.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- sources 20 Jan 2009 10:16:50 -0000 1.40 +++ sources 6 May 2009 08:35:52 -0000 1.41 @@ -1 +1 @@ -73db3666c211e5fb023bb77450cf430d alsa-lib-1.0.19.tar.bz2 +6e9080ba1faa5d3739d14dd76c62d8dc alsa-lib-1.0.20.tar.bz2 From pnemade at fedoraproject.org Wed May 6 08:44:28 2009 From: pnemade at fedoraproject.org (Parag Nemade) Date: Wed, 6 May 2009 08:44:28 +0000 (UTC) Subject: rpms/scim-m17n/F-11 scim-m17n.spec,1.19,1.20 sources,1.5,1.6 Message-ID: <20090506084428.1313970108@cvs1.fedora.phx.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/scim-m17n/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24287 Modified Files: scim-m17n.spec sources Log Message: * Wed May 6 2009 Parag Nemade - 0.2.3-1 - update to 0.2.3 - scim-m17n-0.2.2-gcc43.patch upstream Index: scim-m17n.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-m17n/F-11/scim-m17n.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- scim-m17n.spec 25 Feb 2009 23:11:50 -0000 1.19 +++ scim-m17n.spec 6 May 2009 08:43:57 -0000 1.20 @@ -1,13 +1,12 @@ Name: scim-m17n -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: SCIM IMEngine for m17n-lib Group: System Environment/Libraries License: GPLv2+ URL: http://www.scim-im.org/projects/imengines Source0: %{name}-%{version}.tar.gz -Patch0: scim-m17n-0.2.2-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: scim-devel, m17n-lib-devel Obsoletes: iiimf-le-unit <= 1:12.2 @@ -21,7 +20,6 @@ input of many languages using the input %prep %setup -q -%patch0 -p1 %patch1 -p1 -b .1-name-prefix @@ -49,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 2 2009 Jens Petersen - 0.2.3-1 +- update to 0.2.3 +- scim-m17n-0.2.2-gcc43.patch upstream + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-m17n/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 21 May 2007 04:57:37 -0000 1.5 +++ sources 6 May 2009 08:43:57 -0000 1.6 @@ -1 +1 @@ -17d43799d0df9838c1cd5886ea376105 scim-m17n-0.2.2.tar.gz +179a009b262e0aa0aba786f37e4345ed scim-m17n-0.2.3.tar.gz From pnemade at fedoraproject.org Wed May 6 09:01:18 2009 From: pnemade at fedoraproject.org (Parag Nemade) Date: Wed, 6 May 2009 09:01:18 +0000 (UTC) Subject: rpms/m17n-contrib/F-11 m17n-contrib.spec,1.28,1.29 Message-ID: <20090506090118.2DDBE70108@cvs1.fedora.phx.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-contrib/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26539 Modified Files: m17n-contrib.spec Log Message: Added Kashmiri keymap. Index: m17n-contrib.spec =================================================================== RCS file: /cvs/pkgs/rpms/m17n-contrib/F-11/m17n-contrib.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- m17n-contrib.spec 8 Apr 2009 09:23:29 -0000 1.28 +++ m17n-contrib.spec 6 May 2009 09:00:47 -0000 1.29 @@ -1,12 +1,13 @@ Name: m17n-contrib Summary: Contributed multilingualization datafiles for m17n-lib Version: 1.1.9 -Release: 4%{?dist} +Release: 5%{?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: mai-inscript.mim +Source2: ks-kbd.mim Patch0: bug433416-bn-probhat.patch Patch1: as-inscript-keysummary-440201.patch Patch2: ml-inscript-keysummary-435259.patch @@ -72,6 +73,7 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\ %mk_pkg_uses_db gujarati gu 1 %mk_pkg_uses_db hindi hi 1 %mk_pkg_uses_db kannada kn 1 +%mk_pkg kashmiri ks 0 %mk_pkg maithili mai 0 %mk_pkg_uses_db malayalam ml 1 %mk_pkg marathi mr 1 @@ -104,7 +106,7 @@ make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p" -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/ +cp -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/m17n/ rm -rf $RPM_BUILD_ROOT/%{_bindir} @@ -119,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/m17n/scripts %changelog +* Wed May 06 2009 Parag Nemade -1.1.9-5 +- Resolves: rh#485182 + * Wed Apr 08 2009 Parag Nemade -1.1.9-4 - Resolves: rh#494810-[indic][m17n-db][m17n-contrib] ibus .engine files no longer needed for new ibus From pnemade at fedoraproject.org Wed May 6 09:01:55 2009 From: pnemade at fedoraproject.org (Parag Nemade) Date: Wed, 6 May 2009 09:01:55 +0000 (UTC) Subject: rpms/m17n-contrib/F-11 ks-kbd.mim,NONE,1.1 Message-ID: <20090506090155.859F570108@cvs1.fedora.phx.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-contrib/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26759 Added Files: ks-kbd.mim Log Message: - Added missing ks-kbd.mim file to cvs --- NEW FILE ks-kbd.mim --- ;; kashmiri.mim -- Kashmiri input method with Kashmiri keyboard layout ;; Copyright (c) 2009 Mohammad Nayeem Teli ;; 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 ks kbd) (description "Kashmiri input method simulating Kahsmiri keyboard. This input method simulates the Kashmiri keyboard shown in this text book: ???????? ???????? ???????? ?? ???? ???????? ?? ?????????? ???????? ???????? ???? ???????? ???????????????? Author: Mohammad Nayeem Teli with help from Mohammad Yehya Teli and Shafaat Ahmed for providing me the alphabet with inputs from Shamima Akhtar.") (title "????????") (map (trans ("~" "??") ("!" "!") ("1" "??") ("@" "@") ("2" "??") ("#" "#") ("3" "??") ("$" "$") ("4" "??") ("5" "??") ("6" "??") ("7" "??") ("8" "??") ("(" ")") ("9" "??") (")" "(") ("0" "??") ("_" "??") ("-" "-") ("+" "+") ("=" "=") ("Q" "???") ("q" "??") ("W" "??") ("w" "??") ("E" "??") ("e" "??") ("R" "??") ("r" "??") ("T" "??") ("t" "??") ("Y" "??") ("y" "??") ("U" "??") ("u" "??") ("I" "??") ("i" "??") ("O" "??") ("o" "??") ("P" "??") ("p" "??") ("{" "??") ("[" "]") ("}" "??") ("]" "[") ("A" "??") ("a" "??") ("S" "??") ("s" "??") ("D" "??") ("d" "??") ("F" "??") ("f" "??") ("G" "??") ("g" "??") ("H" "??") ("h" "??") ("J" "??") ("j" "??") ("K" "??") ("k" "??") ("L" "??") ("l" "??") (":" ":") (";" "??") ("\" "\") ("'" "??") ("|" "??") ("\\" "??") ("~" "??") ("`" "??") ("Z" "??") ("z" "??") ("X" "??") ("x" "??") ("C" "??") ("c" "??") ("V" "??") ("v" "??") ("B" "??") ("b" "??") ("N" "??") ("n" "??") ("M" "??") ("m" "??") (">" "??") ("," "??") ("<" "??") ("." "??") ("?" "??") ("/" "/") ("%" "%") ("^" "^") ("&" "&") ("*" "*") )) (state (init (trans))) From dnovotny at fedoraproject.org Wed May 6 09:10:40 2009 From: dnovotny at fedoraproject.org (Daniel Novotny) Date: Wed, 6 May 2009 09:10:40 +0000 (UTC) Subject: rpms/file/F-11 .cvsignore, 1.24, 1.25 file.spec, 1.92, 1.93 sources, 1.24, 1.25 Message-ID: <20090506091040.393DC70108@cvs1.fedora.phx.redhat.com> Author: dnovotny Update of /cvs/extras/rpms/file/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27461 Modified Files: .cvsignore file.spec sources Log Message: new upstream version 5.02; fixes security vulnerability Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/file/F-11/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- .cvsignore 9 Feb 2009 14:03:14 -0000 1.24 +++ .cvsignore 6 May 2009 09:10:09 -0000 1.25 @@ -1 +1 @@ -file-5.00.tar.gz +file-5.02.tar.gz Index: file.spec =================================================================== RCS file: /cvs/extras/rpms/file/F-11/file.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -p -r1.92 -r1.93 --- file.spec 23 Mar 2009 14:21:37 -0000 1.92 +++ file.spec 6 May 2009 09:10:09 -0000 1.93 @@ -4,18 +4,14 @@ Summary: A utility for determining file types Name: file -Version: 5.00 -Release: 5%{?dist} +Version: 5.02 +Release: 1%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ Patch0: file-4.21-pybuild.patch Patch1: file-5.00-devdrv.patch -Patch2: file-5.00-non-english-word.patch -Patch3: file-5.00-thumbs-db.patch -Patch4: file-5.00-fonts-ttc-pfa.patch -Patch5: file-5.00-fdleak.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,14 +60,6 @@ file(1) command. %patch0 -p1 #fixes #463809 %patch1 -p1 -#fixes #485141 -%patch2 -p1 -#fixes #486105 -%patch3 -p1 -#fixes #491594,#491595 -%patch4 -p1 -#fixes #491596 -%patch5 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -94,6 +82,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/misc +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/file make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la @@ -145,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed May 06 2009 Daniel Novotny 5.02-1 +- new upstream version; drop upstreamed patches; this fixes #497913 + * Mon Mar 23 2009 Daniel Novotny 5.00-5 - added two font definitions (#491594, #491595) and a fix for file descriptor leak when MAGIC_COMPRESS used (#491596) Index: sources =================================================================== RCS file: /cvs/extras/rpms/file/F-11/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- sources 9 Feb 2009 14:03:14 -0000 1.24 +++ sources 6 May 2009 09:10:09 -0000 1.25 @@ -1 +1 @@ -fd0b4ce55a756151629e06eaa3411e0c file-5.00.tar.gz +003c56bd1a130390522b45ebcd5ac179 file-5.02.tar.gz From perex at fedoraproject.org Wed May 6 09:12:17 2009 From: perex at fedoraproject.org (Jaroslav Kysela) Date: Wed, 6 May 2009 09:12:17 +0000 (UTC) Subject: rpms/alsa-lib/devel .cvsignore, 1.36, 1.37 alsa-lib.spec, 1.82, 1.83 sources, 1.40, 1.41 Message-ID: <20090506091217.190D370108@cvs1.fedora.phx.redhat.com> Author: perex Update of /cvs/pkgs/rpms/alsa-lib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27740 Modified Files: .cvsignore alsa-lib.spec sources Log Message: updated to 1.0.20 final Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- .cvsignore 20 Jan 2009 10:16:50 -0000 1.36 +++ .cvsignore 6 May 2009 09:11:46 -0000 1.37 @@ -23,3 +23,4 @@ alsa-lib-1.0.17a.tar.bz2 alsa-lib-1.0.18rc3.tar.bz2 alsa-lib-1.0.18.tar.bz2 alsa-lib-1.0.19.tar.bz2 +alsa-lib-1.0.20.tar.bz2 Index: alsa-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -p -r1.82 -r1.83 --- alsa-lib.spec 24 Feb 2009 00:45:01 -0000 1.82 +++ alsa-lib.spec 6 May 2009 09:11:46 -0000 1.83 @@ -4,8 +4,8 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib -Version: 1.0.19 -Release: 3%{?prever_dot}%{?dist} +Version: 1.0.20 +Release: 1%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 @@ -93,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/alsa.m4 %changelog +* Wed May 6 2009 Jaroslav Kysela - 1.0.20-1 +- Updated to 1.0.20 final + * Mon Feb 23 2009 Fedora Release Engineering - 1.0.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alsa-lib/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- sources 20 Jan 2009 10:16:50 -0000 1.40 +++ sources 6 May 2009 09:11:46 -0000 1.41 @@ -1 +1 @@ -73db3666c211e5fb023bb77450cf430d alsa-lib-1.0.19.tar.bz2 +6e9080ba1faa5d3739d14dd76c62d8dc alsa-lib-1.0.20.tar.bz2 From akurtakov at fedoraproject.org Wed May 6 09:17:57 2009 From: akurtakov at fedoraproject.org (Alexander Kurtakov) Date: Wed, 6 May 2009 09:17:57 +0000 (UTC) Subject: rpms/eclipse-moreunit/devel sources, 1.3, 1.4 eclipse-moreunit.spec, 1.4, 1.5 .cvsignore, 1.3, 1.4 Message-ID: <20090506091757.C032D70108@cvs1.fedora.phx.redhat.com> Author: akurtakov Update of /cvs/pkgs/rpms/eclipse-moreunit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29060/devel Modified Files: sources eclipse-moreunit.spec .cvsignore Log Message: Update to new upstream version 1.3.3. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-moreunit/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 24 Mar 2009 15:54:37 -0000 1.3 +++ sources 6 May 2009 09:17:27 -0000 1.4 @@ -1 +1 @@ -ea7afc14c79999fa5d762f1b9bd5c47e eclipse-moreunit-fetched-src-V_1_3_2.tar.bz2 +76262250dd600b6b29bfb89386896423 eclipse-moreunit-fetched-src-V_1_3_3.tar.bz2 Index: eclipse-moreunit.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-moreunit/devel/eclipse-moreunit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- eclipse-moreunit.spec 24 Mar 2009 15:54:37 -0000 1.4 +++ eclipse-moreunit.spec 6 May 2009 09:17:27 -0000 1.5 @@ -1,16 +1,16 @@ -%define src_repo_tag V_1_3_2 +%define src_repo_tag V_1_3_3 %define eclipse_base %{_libdir}/eclipse %define install_loc %{_datadir}/eclipse/dropins/moreunit Name: eclipse-moreunit -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: An Eclipse plugin that assists with writing more unit tests Group: Development/Tools License: EPL URL: http://moreunit.sourceforge.net -## sh %{name}-fetch-src.sh V_1_3_2 +## sh %{name}-fetch-src.sh V_1_3_3 Source0: %{name}-fetched-src-%{src_repo_tag}.tar.bz2 Source1: %{name}-fetch-src.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,6 +51,9 @@ install -d -m 755 %{buildroot}%{install_ %changelog +* Wed May 6 2009 Alexander Kurtakov 1.3.3-1 +- Update to new upstream version 1.3.3. + * Tue Mar 24 2009 Alexander Kurtakov 1.3.2-1 - Update to new upstream version 1.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-moreunit/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 24 Mar 2009 15:54:37 -0000 1.3 +++ .cvsignore 6 May 2009 09:17:27 -0000 1.4 @@ -1 +1,2 @@ eclipse-moreunit-fetched-src-V_1_3_2.tar.bz2 +eclipse-moreunit-fetched-src-V_1_3_3.tar.bz2 From perex at fedoraproject.org Wed May 6 09:25:05 2009 From: perex at fedoraproject.org (Jaroslav Kysela) Date: Wed, 6 May 2009 09:25:05 +0000 (UTC) Subject: rpms/alsa-utils/devel .cvsignore, 1.27, 1.28 alsa-info.sh, 1.5, 1.6 alsa-utils.spec, 1.82, 1.83 sources, 1.32, 1.33 alsa-utils-1.0.18-alsaconf.patch, 1.1, NONE Message-ID: <20090506092505.252D570108@cvs1.fedora.phx.redhat.com> Author: perex Update of /cvs/pkgs/rpms/alsa-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29764 Modified Files: .cvsignore alsa-info.sh alsa-utils.spec sources Removed Files: alsa-utils-1.0.18-alsaconf.patch Log Message: updated to 1.0.20 final Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alsa-utils/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- .cvsignore 20 Jan 2009 11:08:32 -0000 1.27 +++ .cvsignore 6 May 2009 09:24:34 -0000 1.28 @@ -20,3 +20,4 @@ alsa-utils-1.0.17.tar.bz2 alsa-utils-1.0.18rc3.tar.bz2 alsa-utils-1.0.18.tar.bz2 alsa-utils-1.0.19.tar.bz2 +alsa-utils-1.0.20.tar.bz2 Index: alsa-info.sh =================================================================== RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-info.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- alsa-info.sh 9 Feb 2009 13:44:38 -0000 1.5 +++ alsa-info.sh 6 May 2009 09:24:34 -0000 1.6 @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.54 +SCRIPT_VERSION=0.4.56 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog" ################################################################################# @@ -102,7 +102,9 @@ update() { } cleanup() { - rm -r $TEMPDIR 2>/dev/null + if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then + rm -r "$TEMPDIR" 2>/dev/null + fi } @@ -212,6 +214,67 @@ then fi } +withsysfs() { + local i f + local printed="" + for i in /sys/class/sound/*; do + case "$i" in + */hwC?D?) + if [ -f $i/init_pin_configs ]; then + if [ -z "$printed" ]; then + echo "!!Sysfs Files" >> $FILE + echo "!!-----------" >> $FILE + echo "" >> $FILE + fi + for f in init_pin_configs driver_pin_configs user_pin_configs init_verbs; do + echo "$i/$f:" >> $FILE + cat $i/$f >> $FILE + echo >> $FILE + done + printed=yes + fi + ;; + esac + done + if [ -n "$printed" ]; then + echo "" >> $FILE + fi +} + +get_alsa_library_version() { + ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'` + + if [ -z "$ALSA_LIB_VERSION" ]; then + if [ -f /etc/lsb-release ]; then + . /etc/lsb-release + case "$DISTRIB_ID" in + Ubuntu) + if which dpkg > /dev/null ; then + ALSA_LIB_VERSION=`dpkg -l libasound2 | tail -1 | awk '{print $3}' | cut -f 1 -d -` + fi + + if [ "$ALSA_LIB_VERSION" = "" ]; then + ALSA_LIB_VERSION="" + fi + return + ;; + *) + return + ;; + esac + elif [ -f /etc/debian_version ]; then + if which dpkg > /dev/null ; then + ALSA_LIB_VERSION=`dpkg -l libasound2 | tail -1 | awk '{print $3}' | cut -f 1 -d -` + fi + + if [ "$ALSA_LIB_VERSION" = "" ]; then + ALSA_LIB_VERSION="" + fi + return + fi + fi +} + #Run checks to make sure the programs we need are installed. LSPCI=$(which lspci 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null); @@ -248,6 +311,12 @@ case "$1" in REPEAT="" shift ;; + --stdout) + DIALOG="" + NOUPLOAD="yes" + QUESTION="no" + TOSTDOUT="yes" + ;; esac done @@ -300,12 +369,14 @@ TEMPDIR=`mktemp -p /tmp -d alsa-info.XXX FILE="$TEMPDIR/alsa-info.txt" NFILE="/tmp/alsa-info.txt" +trap cleanup 0 + if [ "$PROCEED" = "yes" ]; then if [[ -z "$LSPCI" ]] - then +then echo "This script requires lspci. Please install it, and re-run this script." -exit 0 + exit 0 fi #Create the temporary work dir. @@ -319,7 +390,7 @@ KERNEL_MACHINE=`uname -m` KERNEL_OS=`uname -o` [[ `uname -v |grep SMP` ]] && KERNEL_SMP="Yes" || KERNEL_SMP="No" ALSA_DRIVER_VERSION=`cat /proc/asound/version |head -n1|awk {'print $7'} |sed 's/\.$//'` -ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'` +get_alsa_library_version ALSA_UTILS_VERSION=`amixer -v |awk {'print $3'}` VENDOR_ID=`lspci -vn |grep 040[1-3] | awk -F':' '{print $3}'|awk {'print substr($0, 2);}' >$TEMPDIR/vendor_id.tmp` DEVICE_ID=`lspci -vn |grep 040[1-3] | awk -F':' '{print $4}'|awk {'print $1'} >$TEMPDIR/device_id.tmp` @@ -328,6 +399,7 @@ LAST_CARD=$((`grep "]: " /proc/asound/ca ESDINST=$(which esd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) +JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp cat /proc/asound/cards >$TEMPDIR/alsacards.tmp @@ -387,27 +459,34 @@ echo "!!Sound Servers on this system" >> echo "!!----------------------------" >> $FILE echo "" >> $FILE if [[ -n $PAINST ]];then -[[ `pgrep $PAINST` ]] && PARUNNING="Yes" || PARUNNING="No" +[[ `pgrep '^(.*/)?pulseaudio$'` ]] && PARUNNING="Yes" || PARUNNING="No" echo "Pulseaudio:" >> $FILE echo " Installed - Yes ($PAINST)" >> $FILE echo " Running - $PARUNNING" >> $FILE echo "" >> $FILE fi if [[ -n $ESDINST ]];then -[[ `pgrep $ESDINST` ]] && ESDRUNNING="Yes" || ESDRUNNING="No" +[[ `pgrep '^(.*/)?esd$'` ]] && ESDRUNNING="Yes" || ESDRUNNING="No" echo "ESound Daemon:" >> $FILE echo " Installed - Yes ($ESDINST)" >> $FILE echo " Running - $ESDRUNNING" >> $FILE echo "" >> $FILE fi if [[ -n $ARTSINST ]];then -[[ `pgrep $ARTSINST` ]] && ARTSRUNNING="Yes" || ARTSRUNNING="No" +[[ `pgrep '^(.*/)?artsd$'` ]] && ARTSRUNNING="Yes" || ARTSRUNNING="No" echo "aRts:" >> $FILE echo " Installed - Yes ($ARTSINST)" >> $FILE echo " Running - $ARTSRUNNING" >> $FILE echo "" >> $FILE fi -if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" ]];then +if [[ -n $JACKINST ]];then +[[ `pgrep '^(.*/)?jackd$'` ]] && JACKRUNNING="Yes" || JACKRUNNING="No" +echo "Jack:" >> $FILE +echo " Installed - Yes ($JACKINST)" >> $FILE +echo " Running - $JACKRUNNING" >> $FILE +echo "" >> $FILE +fi +if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" ]];then echo "No sound servers found." >> $FILE echo "" >> $FILE fi @@ -510,6 +589,7 @@ then withamixer withalsactl withlsmod + withsysfs pbcheck ;; --update) @@ -518,13 +598,13 @@ then ;; --no-upload) NOUPLOAD="yes" - KEEP_FILES="yes" withdevices withconfigs withaplay withamixer withalsactl withlsmod + withsysfs ;; --debug) echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted" @@ -536,6 +616,7 @@ then withamixer withalsactl withlsmod + withsysfs ;; --with-all) withdevices @@ -544,6 +625,7 @@ then withamixer withalsactl withlsmod + withsysfs ;; --with-aplay) withaplay @@ -585,6 +667,17 @@ then fi fi ;; + --stdout) + NOUPLOAD="yes" + withdevices + withconfigs + withaplay + withamixer + withalsactl + withlsmod + cat $FILE + rm $FILE + ;; --about) echo "Written/Tested by the following users of #alsa on irc.freenode.net:" echo "" @@ -593,7 +686,7 @@ then echo " gnubien - Various script ideas / Testing" echo " GrueMaster - HDA Intel specific items / Testing" echo " olegfink - Script update function" - cleanup + echo " TheMuso - display to stdout functionality" exit 0 ;; *) @@ -611,10 +704,11 @@ then echo " --no-upload (do not upload contents to remote server)" echo " --pastebin (use http://pastebin.ca) as remote server" echo " instead www.alsa-project.org" + echo " --stdout (print alsa information to standard output" + echo " instead of a file)" echo " --about (show some information about the script)" echo " --debug (will run the script as normal, but will not" echo " delete $FILE)" - cleanup exit 0 ;; esac @@ -622,126 +716,123 @@ then done fi -if [ "$PROCEED" = "yes" ]; then +if [ "$PROCEED" = "no" ]; then + exit 1 +fi + +if [ -n "$NOUPLOAD" ]; then + + if [ -z "$TOSTDOUT" ]; then + mv $FILE $NFILE || exit 1 + fi + + if [[ -n $DIALOG ]] + then + if [[ -n $PBERROR ]]; then + dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occurred while contacting the $WWWSERVICE. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $NFILE" 10 100 + else + dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the $WWWSERVICE\n\nYour ALSA information can be seen by looking in $NFILE" 10 100 + fi + else + echo + + if [[ -n $PBERROR ]]; then + echo "An error occurred while contacting the $WWWSERVICE. Your information was NOT automatically uploaded." + echo "" + echo "Your ALSA information can be seen by looking in $NFILE" + echo "" + else + if [ -z "$TOSTDOUT" ]; then + echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE" + echo "" + echo "Your ALSA information can be seen by looking in $NFILE" + echo "" + fi + fi + fi + + exit + +fi # noupload #Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt. if WGET=$(which wget 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null); [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ `wget --help |grep post-file` ]] then -if [[ -n "$DIALOG" ]] + +if [[ -n $DIALOG ]] then - if [[ -z $NOUPLOAD ]]; then - if [[ -z $PASTEBIN ]]; then + +if [[ -z $PASTEBIN ]]; then wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://www.alsa-project.org/cardinfo-db/" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit" { for i in 10 20 30 40 50 60 70 80 90; do echo $i sleep 0.2 done echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.alsa-project.org ..." 6 70 0 - else +else wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY&encrypt=t&encryptpw=blahblah" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit" { for i in 10 20 30 40 50 60 70 80 90; do echo $i sleep 0.2 done echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.pastebin.ca ..." 6 70 0 - fi - fi +fi + +dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100 +DIALOG_EXIT_CODE=$? +if [ $DIALOG_EXIT_CODE = 0 ]; then + grep -v "alsa-info.txt" $FILE >$TEMPDIR/uploaded.txt + dialog --backtitle "$BGTITLE" --textbox $TEMPDIR/uploaded.txt 0 0 +fi + +clear + +# no dialog else - if [[ -z $NOUPLOAD ]]; then - if [[ -z $PASTEBIN ]]; then +if [[ -z $PASTEBIN ]]; then echo -n "Uploading information to www.alsa-project.org ... " wget -O - --tries=5 --timeout=60 --post-file=$FILE http://www.alsa-project.org/cardinfo-db/ &>$TEMPDIR/wget.tmp & - else +else echo -n "Uploading information to www.pastebin.ca ... " wget -O - --tries=5 --timeout=60 --post-file=$FILE http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY &>$TEMPDIR/wget.tmp & - fi - fi fi + #Progess spinner for wget transfer. -if [[ -z "$DIALOG" ]] -then - i=1 - sp="/-\|" - echo -n ' ' - while pgrep wget &>/dev/null - do +i=1 +sp="/-\|" +echo -n ' ' +while pgrep wget &>/dev/null +do echo -en "\b${sp:i++%${#sp}:1}" - done -fi +done + +echo -e "\b Done!" +echo "" + +fi #dialog #See if tput is available, and use it if it is. -if [[ -z $NOUPLOAD ]]; then - if [[ -n "$TPUT" ]] - then - if [[ -z $PASTEBIN ]]; then - FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2 ; tput sgr0` - else - FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p';tput sgr0` - fi - else - if [[ -z $PASTEBIN ]]; then - FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2` - else - FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'` - fi - fi -fi -#Output the URL of the uploaded file. -if [[ -z $DIALOG ]] +if [[ -n "$TPUT" ]] then - echo -e "\b Done!" - echo "" - if [[ -z $NOUPLOAD ]]; then - echo "Your ALSA information is located at $FINAL_URL" - echo "Please inform the person helping you." - echo "" - fi -fi -if [[ -n $DIALOG ]] -then - if [[ -n $NOUPLOAD ]]; then - mv $FILE $NFILE || exit 1 - if [[ -n $PBERROR ]]; then - dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occured while contacting the $WWWSERVICE. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $NFILE" 10 100 - else - dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the $WWWSERVICE\n\nYour ALSA information can be seen by looking in $NFILE" 10 100 - fi + if [[ -z $PASTEBIN ]]; then + FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2 ; tput sgr0` else - dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100 - DIALOG_EXIT_CODE=$? - if [ $DIALOG_EXIT_CODE = 0 ]; then - grep -v "alsa-info.txt" $FILE >$TEMPDIR/uploaded.txt - dialog --backtitle "$BGTITLE" --textbox $TEMPDIR/uploaded.txt 0 0 - fi + FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p';tput sgr0` fi -fi -clear -if [[ -n $NOUPLOAD ]]; then - mv $FILE $NFILE || exit 1 - if [[ -n $PBERROR ]]; then - echo "An error occured while contacting the $WWWSERVICE. Your information was NOT automatically uploaded." - echo "" - echo "Your ALSA information can be seen by looking in $NFILE" - echo "" +else + if [[ -z $PASTEBIN ]]; then + FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2` else - echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE" - echo "" - echo "Your ALSA information can be seen by looking in $NFILE" - echo "" + FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'` fi fi -if [[ -z $NOUPLOAD ]]; then + +#Output the URL of the uploaded file. echo "Your ALSA information is located at $FINAL_URL" echo "Please inform the person helping you." echo "" -fi - #We posted the file , so we dont need it anymore. delete it. - if [ -z $KEEP_FILES ] - then - rm $FILE - fi #We couldnt find a suitable wget, so tell the user to upload manually. else @@ -767,9 +858,7 @@ else echo "Please manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post." echo "" fi - fi - if [[ -n $DIALOG ]] - then + else if [[ -z $PASTEBIN ]]; then dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.alsa-project,org/cardinfo-db/ and submit your post." 25 100 else @@ -777,10 +866,5 @@ else fi fi fi -#Clean up the temp files -if [ -z $KEEP_FILES ] -then - cleanup -fi -fi # proceed + Index: alsa-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -p -r1.82 -r1.83 --- alsa-utils.spec 24 Feb 2009 00:48:39 -0000 1.82 +++ alsa-utils.spec 6 May 2009 09:24:34 -0000 1.83 @@ -3,8 +3,8 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: 1.0.19 -Release: 4%{?prever_dot}%{?dist} +Version: 1.0.20 +Release: 1%{?prever_dot}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -13,7 +13,6 @@ Source4: alsaunmute Source6: alsa-info.sh Source10: alsa.rules Source11: alsactl.conf -Patch1: alsa-utils-1.0.19-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} BuildRequires: ncurses-devel @@ -27,7 +26,6 @@ Architecture (ALSA). %prep %setup -q -n %{name}-%{version}%{?prever} -%patch1 -p1 -b .init %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin --disable-alsaconf @@ -94,6 +92,10 @@ if [ -s /etc/alsa/asound.state -a ! -s / fi %changelog +* Wed May 06 2009 Jaroslav Kysela 1.0.20-1 +- updated to 1.0.20 final +- updated alsa-info.sh script to 0.4.56 + * Mon Feb 23 2009 Fedora Release Engineering - 1.0.19-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alsa-utils/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- sources 9 Feb 2009 13:44:38 -0000 1.32 +++ sources 6 May 2009 09:24:34 -0000 1.33 @@ -1 +1 @@ -5ff0379c707c1a29083233edc9ab4e06 alsa-utils-1.0.19.tar.bz2 +6837e673ef19da96d8bd2f9e18cd9574 alsa-utils-1.0.20.tar.bz2 --- alsa-utils-1.0.18-alsaconf.patch DELETED --- From jwrdegoede at fedoraproject.org Wed May 6 09:51:58 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Wed, 6 May 2009 09:51:58 +0000 (UTC) Subject: rpms/freecol/devel .cvsignore, 1.7, 1.8 freecol.spec, 1.13, 1.14 sources, 1.7, 1.8 Message-ID: <20090506095158.2239570108@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/freecol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv374 Modified Files: .cvsignore freecol.spec sources Log Message: * Mon May 4 2009 Hans de Goede 0.8.2-1 - New upstream release 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freecol/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 22 Feb 2009 11:26:21 -0000 1.7 +++ .cvsignore 6 May 2009 09:51:27 -0000 1.8 @@ -1 +1 @@ -freecol-0.8.1-src-clean.tar.gz +freecol-0.8.2-src-clean.tar.gz Index: freecol.spec =================================================================== RCS file: /cvs/extras/rpms/freecol/devel/freecol.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- freecol.spec 24 Feb 2009 18:11:34 -0000 1.13 +++ freecol.spec 6 May 2009 09:51:27 -0000 1.14 @@ -6,8 +6,8 @@ # Please submit bugfixes or comments to us at the above email addresses Name: freecol -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Turn-based multi-player strategy game Group: Amusements/Games License: GPL+ @@ -158,6 +158,9 @@ fi %dir %{_fontdir} %changelog +* Mon May 4 2009 Hans de Goede 0.8.2-1 +- New upstream release 0.8.2 + * Tue Feb 24 2009 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/freecol/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 22 Feb 2009 11:26:23 -0000 1.7 +++ sources 6 May 2009 09:51:27 -0000 1.8 @@ -1 +1 @@ -6fd533d146c7a4ba7ae3ed9849939445 freecol-0.8.1-src-clean.tar.gz +fda4574eec03ac93cc37c7717533a4fd freecol-0.8.2-src-clean.tar.gz From stransky at fedoraproject.org Wed May 6 10:12:22 2009 From: stransky at fedoraproject.org (Martin Stransky) Date: Wed, 6 May 2009 10:12:22 +0000 (UTC) Subject: rpms/seamonkey/devel seamonkey.spec,1.51,1.52 Message-ID: <20090506101222.6096270108@cvs1.fedora.phx.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/seamonkey/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2317 Modified Files: seamonkey.spec Log Message: build with -fno-strict-aliasing (#468415) Index: seamonkey.spec =================================================================== RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- seamonkey.spec 28 Mar 2009 07:24:40 -0000 1.51 +++ seamonkey.spec 6 May 2009 10:11:51 -0000 1.52 @@ -11,7 +11,7 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor Version: 1.1.15 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPLv1.1 Group: Applications/Internet @@ -156,6 +156,10 @@ CXXFLAGS="-fno-inline -g" \ %else CXXFLAGS=-g \ %endif + +#Set up build flags (#468415) +RPM_OPT_FLAGS+=" -fno-strict-aliasing" + BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \ ./configure --prefix=%{_prefix} --libdir=%{_libdir} \ --with-default-mozilla-five-home=%{mozdir} \ @@ -438,6 +442,9 @@ update-desktop-database %{_datadir}/appl %changelog +* Wed May 6 2009 Martin Stransky 1.1.15-4 +- build with -fno-strict-aliasing (#468415) + * Fri Mar 27 2009 Christopher Aillon - 1.15.1-3 - Add patches for MFSA-2009-12, MFSA-2009-13 From stransky at fedoraproject.org Wed May 6 10:14:26 2009 From: stransky at fedoraproject.org (Martin Stransky) Date: Wed, 6 May 2009 10:14:26 +0000 (UTC) Subject: rpms/seamonkey/F-11 seamonkey.spec,1.51,1.52 Message-ID: <20090506101426.5B2D170108@cvs1.fedora.phx.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/seamonkey/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2584 Modified Files: seamonkey.spec Log Message: build with -fno-strict-aliasing (#468415) Index: seamonkey.spec =================================================================== RCS file: /cvs/pkgs/rpms/seamonkey/F-11/seamonkey.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- seamonkey.spec 28 Mar 2009 07:24:40 -0000 1.51 +++ seamonkey.spec 6 May 2009 10:13:55 -0000 1.52 @@ -11,7 +11,7 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor Version: 1.1.15 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPLv1.1 Group: Applications/Internet @@ -156,6 +156,10 @@ CXXFLAGS="-fno-inline -g" \ %else CXXFLAGS=-g \ %endif + +#Set up build flags (#468415) +RPM_OPT_FLAGS+=" -fno-strict-aliasing" + BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \ ./configure --prefix=%{_prefix} --libdir=%{_libdir} \ --with-default-mozilla-five-home=%{mozdir} \ @@ -438,6 +442,9 @@ update-desktop-database %{_datadir}/appl %changelog +* Wed May 6 2009 Martin Stransky 1.1.15-4 +- build with -fno-strict-aliasing (#468415) + * Fri Mar 27 2009 Christopher Aillon - 1.15.1-3 - Add patches for MFSA-2009-12, MFSA-2009-13 From rrakus at fedoraproject.org Wed May 6 10:49:45 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Wed, 6 May 2009 10:49:45 +0000 (UTC) Subject: rpms/python-docs/devel python-docs.spec,1.18,1.19 Message-ID: <20090506104945.B8EF270108@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/python-docs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6357 Modified Files: python-docs.spec Log Message: Spec file cleanup (#226341) Index: python-docs.spec =================================================================== RCS file: /cvs/extras/rpms/python-docs/devel/python-docs.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- python-docs.spec 26 Feb 2009 21:14:56 -0000 1.18 +++ python-docs.spec 6 May 2009 10:49:15 -0000 1.19 @@ -10,17 +10,16 @@ %define pybasever 2.6 -Summary: Documentation for the Python programming language. +Summary: Documentation for the Python programming language Name: %{python}-docs Version: %{pybasever} -Release: 2%{?dist} +Release: 3%{?dist} License: Python Group: Documentation Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 BuildArch: noarch Patch4: python-2.6-nowhatsnew.patch -#Patch17: python-2.4-tex-fix.patch Patch18: python-2.6-extdocmodules.patch Requires: %{python} = %{version} @@ -29,7 +28,8 @@ Obsoletes: python2-docs Provides: python2-docs = %{version} %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + BuildRequires: %{python} python-sphinx python-docutils python-jinja BuildRequires: python-pygments URL: http://www.python.org/ @@ -46,19 +46,16 @@ for the Python language. %setup -q -n Python-%{version} %patch4 -p1 -b .nowhatsnew -#%%patch17 -p1 -b .tex-fix %patch18 -p1 -b .extdocmodules %build topdir=`pwd` -pushd Doc -make html +make -C Doc html #rm html/index.html.in Makefile* info/Makefile tools/sgmlconv/Makefile -popd %install -[ -d $RPM_BUILD_ROOT ] && rm -fr $RPM_BUILD_ROOT +rm -fr $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT @@ -66,11 +63,14 @@ mkdir $RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT %files -%defattr(-,root,root,755) +%defattr(-,root,root,-) %doc Misc/NEWS Misc/README Misc/cheatsheet %doc Misc/HISTORY Doc/build/html %changelog +* Wed May 06 2009 Roman Rakus - 2.6-3 +- Spec file cleanup (#226341) + * Thu Feb 26 2009 Fedora Release Engineering - 2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From transif at fedoraproject.org Wed May 6 10:57:39 2009 From: transif at fedoraproject.org (Transifex System User) Date: Wed, 6 May 2009 10:57:39 +0000 (UTC) Subject: comps/po da.po,1.18,1.19 Message-ID: <20090506105739.7A16870108@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6946/po Modified Files: da.po Log Message: Sending translation for Danish Index: da.po =================================================================== RCS file: /cvs/pkgs/comps/po/da.po,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- da.po 5 May 2009 20:53:18 -0000 1.18 +++ da.po 6 May 2009 10:57:09 -0000 1.19 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: comps\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-05-05 19:09+0000\n" -"PO-Revision-Date: 2009-05-06 22:26+0200\n" +"PO-Revision-Date: 2009-05-06 12:54+0200\n" "Last-Translator: Kris Thomsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -1354,7 +1354,7 @@ msgstr "Underst??ttelse af kinyarwanda" #: ../comps-f11.xml.in.h:118 msgid "Latin Support" -msgstr "Underst??ttelse af latinsk" +msgstr "Underst??ttelse af latin" #: ../comps-f11.xml.in.h:126 msgid "Luxembourgish Support" From plautrba at fedoraproject.org Wed May 6 11:25:22 2009 From: plautrba at fedoraproject.org (Petr Lautrbach) Date: Wed, 6 May 2009 11:25:22 +0000 (UTC) Subject: rpms/bluez/devel 97-bluetooth-ondemand.rules, NONE, 1.1 bluetooth.conf, 1.1, 1.2 bluetooth.init, 1.2, 1.3 bluez.spec, 1.63, 1.64 Message-ID: <20090506112523.37CEC70108@cvs1.fedora.phx.redhat.com> Author: plautrba Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10511 Modified Files: bluetooth.conf bluetooth.init bluez.spec Added Files: 97-bluetooth-ondemand.rules Log Message: * Tue May 05 2009 Petr Lautrbach 4.38-3 - Start/stop the bluetooth service via udev (#484345) --- NEW FILE 97-bluetooth-ondemand.rules --- #bluetooth on demand rules SUBSYSTEM=="bluetooth", ACTION=="add", RUN+="/sbin/service bluetooth condstart" SUBSYSTEM=="bluetooth", ACTION=="remove", RUN+="/sbin/service bluetooth condstop" Index: bluetooth.conf =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluetooth.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- bluetooth.conf 11 Sep 2008 02:10:23 -0000 1.1 +++ bluetooth.conf 6 May 2009 11:24:51 -0000 1.2 @@ -4,3 +4,7 @@ # Enable this to switch capable devices back to HID mode on Bluetooth shutdown #HID2HCI_UNDO=true +# +#Enable this to allow automatic start or stop when bluetooth +#inserted or removed +#BLUETOOTH_ONDEMAND=true Index: bluetooth.init =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluetooth.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- bluetooth.init 12 Sep 2008 09:34:05 -0000 1.2 +++ bluetooth.init 6 May 2009 11:24:51 -0000 1.3 @@ -16,8 +16,49 @@ [ -e /etc/sysconfig/bluetooth ] && . /etc/sysconfig/bluetooth +is_enabled_in_runlevel() +{ + level=`runlevel | awk '{print $2;}'` + + #check file in runlevel + [ -f /etc/rc$level.d/S??bluetooth ] + return $? +} + +has_bt_devices() +{ + #Look for Bluetooth adapters: + udevadm info --export-db | grep -q -e '/devices/.*/bluetooth/.*' + + return $? +} + +check_condstart() +{ + is_enabled_in_runlevel || return $? + + /sbin/service bluetooth status && return 1 + + #Look for Bluetooth adapters: + has_bt_devices && return 0 + return 1 +} + +condstart() +{ + if [ "$BLUETOOTH_ONDEMAND" = "true" ]; then + start + return $? + fi + return 1 +} + start() { + if [ "$BLUETOOTH_ONDEMAND" = "true" ]; then + check_condstart || return 1 + fi + echo -n $"Starting Bluetooth services:" daemon /usr/sbin/bluetoothd RETVAL=$? @@ -40,27 +81,57 @@ stop() return $RETVAL } +check_condstop() +{ + is_enabled_in_runlevel || return $? + + /sbin/service bluetooth status || return $? + + #Look for Bluetooth adapters: + has_bt_devices && return 1 + return 0 +} + +condstop() +{ + if [ "$BLUETOOTH_ONDEMAND" = "true" ]; then + check_condstop || return 1 + else + return 2 + fi + + stop + return $? +} + + case "$1" in start) start ;; + condstart) + condstart + ;; stop) stop ;; + condstop) + condstop + ;; force-reload|restart|reload) - stop - start - ;; + stop + start + ;; try-restart|condrestart) - [ -e /var/lock/subsys/bluetooth ] && (stop; start) - ;; + [ -e /var/lock/subsys/bluetooth ] && (stop; start) + ;; status) - status bluetoothd + status bluetoothd RETVAL=$? - ;; + ;; *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 3 + echo $"Usage: $0 {start|stop|status|restart|reload|condrestart|condstart|condstop}" + exit 3 ;; esac Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- bluez.spec 5 May 2009 13:53:20 -0000 1.63 +++ bluez.spec 6 May 2009 11:24:51 -0000 1.64 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.38 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -13,6 +13,7 @@ Source5: pand.init Source6: pand.conf Source7: rfcomm.init Source8: bluez-uinput.modules +Source9: 97-bluetooth-ondemand.rules Patch1: bluez-utils-oui-usage.patch # https://bugzilla.redhat.com/show_bug.cgi?id=450081 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687 @@ -36,6 +37,7 @@ Requires: initscripts, bluez-libs = %{ve Requires: dbus >= 0.60 Requires: hwdata >= 0.215 Requires: dbus-bluez-pin-helper +Requires: udev >= 130 Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig, /sbin/service @@ -148,6 +150,7 @@ if test -d ${RPM_BUILD_ROOT}/usr/lib64/c fi install -D -m0644 scripts/bluetooth.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules +install -D -m0644 %{SOURCE9} ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-ondemand.rules install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial install -D -m0755 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules @@ -214,6 +217,7 @@ fi %{_libdir}/bluetooth/ /lib/udev/bluetooth_serial %{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules +%{_sysconfdir}/udev/rules.d/97-bluetooth-ondemand.rules %{_sysconfdir}/rc.d/init.d/bluetooth %{_localstatedir}/lib/bluetooth @@ -254,6 +258,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/pand %changelog +* Tue May 05 2009 Petr Lautrbach 4.38-3 +- Start/stop the bluetooth service via udev (#484345) + * Tue May 05 2009 Bastien Nocera 4.38-2 - Add patch to activate the Socket Mobile CF kit (#498756) From pkgdb at fedoraproject.org Wed May 6 11:28:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:28:55 +0000 Subject: [pkgdb] kdesdk: ltinkl has requested watchbugzilla Message-ID: <20090506112856.2AECF10F893@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdesdk (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk From pkgdb at fedoraproject.org Wed May 6 11:28:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:28:58 +0000 Subject: [pkgdb] kdesdk: ltinkl has requested watchcommits Message-ID: <20090506112858.B2CDF10F8A0@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdesdk (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk From pkgdb at fedoraproject.org Wed May 6 11:29:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:29:00 +0000 Subject: [pkgdb] kdesdk: ltinkl has requested commit Message-ID: <20090506112900.681AA10F8A4@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdesdk (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk From pkgdb at fedoraproject.org Wed May 6 11:31:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:31:29 +0000 Subject: [pkgdb] kdeutils: ltinkl has requested watchbugzilla Message-ID: <20090506113129.806EB10F893@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdeutils (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils From pkgdb at fedoraproject.org Wed May 6 11:31:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:31:31 +0000 Subject: [pkgdb] kdeutils: ltinkl has requested watchcommits Message-ID: <20090506113131.5E59310F8A0@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdeutils (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils From pkgdb at fedoraproject.org Wed May 6 11:31:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:31:33 +0000 Subject: [pkgdb] kdeutils: ltinkl has requested commit Message-ID: <20090506113133.47D0F10F8A3@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdeutils (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils From ltinkl at fedoraproject.org Wed May 6 11:33:41 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 11:33:41 +0000 (UTC) Subject: rpms/kdeaccessibility/F-10 kdeaccessibility.spec, 1.65, 1.66 sources, 1.38, 1.39 Message-ID: <20090506113341.7887F70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeaccessibility/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11680/F-10 Modified Files: kdeaccessibility.spec sources Log Message: KDE 4.2.3 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/kdeaccessibility.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -p -r1.65 -r1.66 --- kdeaccessibility.spec 2 Apr 2009 14:49:07 -0000 1.65 +++ kdeaccessibility.spec 6 May 2009 11:33:10 -0000 1.66 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Accessibility Name: kdeaccessibility Epoch: 1 -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} Group: User Interface/Desktops @@ -111,6 +111,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Mar 30 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- sources 2 Apr 2009 14:49:07 -0000 1.38 +++ sources 6 May 2009 11:33:10 -0000 1.39 @@ -1 +1 @@ -7fd255ecf2274f868d4634b0f44e41af kdeaccessibility-4.2.2.tar.bz2 +d371973283e3b7843c9f8489e05269b2 kdeaccessibility-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 11:33:41 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 11:33:41 +0000 (UTC) Subject: rpms/kdeaccessibility/F-9 kdeaccessibility.spec, 1.60, 1.61 sources, 1.33, 1.34 Message-ID: <20090506113341.A361C70131@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeaccessibility/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11680/F-9 Modified Files: kdeaccessibility.spec sources Log Message: KDE 4.2.3 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/F-9/kdeaccessibility.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- kdeaccessibility.spec 2 Apr 2009 14:43:24 -0000 1.60 +++ kdeaccessibility.spec 6 May 2009 11:33:11 -0000 1.61 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Accessibility Name: kdeaccessibility Epoch: 1 -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} Group: User Interface/Desktops @@ -111,6 +111,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Mar 30 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/F-9/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- sources 2 Apr 2009 14:43:24 -0000 1.33 +++ sources 6 May 2009 11:33:11 -0000 1.34 @@ -1 +1 @@ -7fd255ecf2274f868d4634b0f44e41af kdeaccessibility-4.2.2.tar.bz2 +d371973283e3b7843c9f8489e05269b2 kdeaccessibility-4.2.3.tar.bz2 From pkgdb at fedoraproject.org Wed May 6 11:33:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:33:59 +0000 Subject: [pkgdb] kdesdk had acl change status Message-ID: <20090506113359.1975710F893@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdesdk (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk From pkgdb at fedoraproject.org Wed May 6 11:33:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:33:59 +0000 Subject: [pkgdb] kdesdk had acl change status Message-ID: <20090506113359.5A4FD10F8A0@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdesdk (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk From pkgdb at fedoraproject.org Wed May 6 11:34:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:34:00 +0000 Subject: [pkgdb] kdesdk had acl change status Message-ID: <20090506113400.B575C10F8A3@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdesdk (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk From pkgdb at fedoraproject.org Wed May 6 11:34:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:34:28 +0000 Subject: [pkgdb] kdeutils had acl change status Message-ID: <20090506113428.5389C10F89C@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdeutils (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils From pkgdb at fedoraproject.org Wed May 6 11:34:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:34:28 +0000 Subject: [pkgdb] kdeutils had acl change status Message-ID: <20090506113428.EFC8A10F8A1@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdeutils (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils From pkgdb at fedoraproject.org Wed May 6 11:34:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 11:34:29 +0000 Subject: [pkgdb] kdeutils had acl change status Message-ID: <20090506113429.8511910F8AA@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdeutils (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils From ltinkl at fedoraproject.org Wed May 6 11:36:08 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 11:36:08 +0000 (UTC) Subject: rpms/kdeadmin/F-10 sources,1.60,1.61 Message-ID: <20090506113608.5E9D770108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeadmin/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12048/F-10 Modified Files: sources Log Message: KDE 4.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/F-10/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- sources 3 Apr 2009 02:14:32 -0000 1.60 +++ sources 6 May 2009 11:35:37 -0000 1.61 @@ -1 +1 @@ -b9104de38fa36962a2812aa9cae8fc5f kdeadmin-4.2.2.tar.bz2 +dc352ccb03c285a87fcc68d7d18e9d43 kdeadmin-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 11:36:08 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 11:36:08 +0000 (UTC) Subject: rpms/kdeadmin/F-9 kdeadmin.spec,1.104,1.105 sources,1.55,1.56 Message-ID: <20090506113608.8801E70131@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeadmin/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12048/F-9 Modified Files: kdeadmin.spec sources Log Message: KDE 4.2.3 Index: kdeadmin.spec =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/F-9/kdeadmin.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -p -r1.104 -r1.105 --- kdeadmin.spec 21 Apr 2009 15:24:55 -0000 1.104 +++ kdeadmin.spec 6 May 2009 11:35:38 -0000 1.105 @@ -1,7 +1,7 @@ Name: kdeadmin Epoch: 7 -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment - Administrative tools Group: User Interface/Desktops @@ -143,6 +143,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 21 2009 Than Ngo - 4.2.2-4 - get rid of the dependency of system-config-printer - drop the BR on PyKDE4, system-config-printer-libs Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/F-9/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -p -r1.55 -r1.56 --- sources 3 Apr 2009 02:14:32 -0000 1.55 +++ sources 6 May 2009 11:35:38 -0000 1.56 @@ -1 +1 @@ -b9104de38fa36962a2812aa9cae8fc5f kdeadmin-4.2.2.tar.bz2 +dc352ccb03c285a87fcc68d7d18e9d43 kdeadmin-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 11:37:09 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 11:37:09 +0000 (UTC) Subject: rpms/kdeartwork/F-9 kdeartwork.spec,1.91,1.92 sources,1.52,1.53 Message-ID: <20090506113709.08B3870108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeartwork/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12228/F-9 Modified Files: kdeartwork.spec sources Log Message: KDE 4.2.3 Index: kdeartwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/F-9/kdeartwork.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -p -r1.91 -r1.92 --- kdeartwork.spec 2 Apr 2009 14:50:56 -0000 1.91 +++ kdeartwork.spec 6 May 2009 11:36:38 -0000 1.92 @@ -1,6 +1,6 @@ Name: kdeartwork -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: Additional artwork for KDE License: GPLv2 @@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-3 - optimize scriptlets - omit (unused) noarch hacks, use f10+ support Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/F-9/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -r1.52 -r1.53 --- sources 2 Apr 2009 14:50:56 -0000 1.52 +++ sources 6 May 2009 11:36:38 -0000 1.53 @@ -1 +1 @@ -2315d64bb543decdb602b01376f5fc1e kdeartwork-4.2.2.tar.bz2 +6867919e82d111b0a2c0fe4067f41591 kdeartwork-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 11:37:08 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 11:37:08 +0000 (UTC) Subject: rpms/kdeartwork/F-10 kdeartwork.spec,1.97,1.98 sources,1.57,1.58 Message-ID: <20090506113708.9C9C770108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeartwork/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12228/F-10 Modified Files: kdeartwork.spec sources Log Message: KDE 4.2.3 Index: kdeartwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/F-10/kdeartwork.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -p -r1.97 -r1.98 --- kdeartwork.spec 2 Apr 2009 14:50:57 -0000 1.97 +++ kdeartwork.spec 6 May 2009 11:36:38 -0000 1.98 @@ -1,6 +1,6 @@ Name: kdeartwork -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: Additional artwork for KDE License: GPLv2 @@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-3 - optimize scriptlets - omit (unused) noarch hacks, use f10+ support Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/F-10/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- sources 2 Apr 2009 14:50:57 -0000 1.57 +++ sources 6 May 2009 11:36:38 -0000 1.58 @@ -1 +1 @@ -2315d64bb543decdb602b01376f5fc1e kdeartwork-4.2.2.tar.bz2 +6867919e82d111b0a2c0fe4067f41591 kdeartwork-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 11:57:40 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 11:57:40 +0000 (UTC) Subject: rpms/kdebase/F-10 sources, 1.108, 1.109 kdebase-4.2.2-konsole-flowcontrol.patch, 1.1, NONE Message-ID: <20090506115740.AED3D70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15781/F-10 Modified Files: sources Removed Files: kdebase-4.2.2-konsole-flowcontrol.patch Log Message: KDE 4.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -p -r1.108 -r1.109 --- sources 3 Apr 2009 12:25:46 -0000 1.108 +++ sources 6 May 2009 11:57:07 -0000 1.109 @@ -1 +1 @@ -7f6b0d5051f251d0f34ee797a8e2b54a kdebase-4.2.2.tar.bz2 +8779d4bd85d356300e22dc34bbeb06f9 kdebase-4.2.3.tar.bz2 --- kdebase-4.2.2-konsole-flowcontrol.patch DELETED --- From ltinkl at fedoraproject.org Wed May 6 11:57:40 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 11:57:40 +0000 (UTC) Subject: rpms/kdebase/F-9 kdebase.spec, 1.354, 1.355 sources, 1.103, 1.104 kdebase-4.2.2-konsole-flowcontrol.patch, 1.1, NONE Message-ID: <20090506115740.B60FD70135@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15781/F-9 Modified Files: kdebase.spec sources Removed Files: kdebase-4.2.2-konsole-flowcontrol.patch Log Message: KDE 4.2.3 Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.354 retrieving revision 1.355 diff -u -p -r1.354 -r1.355 --- kdebase.spec 4 May 2009 20:24:15 -0000 1.354 +++ kdebase.spec 6 May 2009 11:57:09 -0000 1.355 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -29,7 +29,6 @@ Patch1: kdebase-4.1.70-konsole-session Patch2: kdebase-4.2.1-home-icon.patch # upstream patches -Patch100: kdebase-4.2.2-konsole-flowcontrol.patch %ifnarch s390 s390x Requires: eject @@ -125,7 +124,6 @@ Requires: kdelibs4-devel kdepimlibs4-dev %patch0 -p1 -b .nsplugins-paths %patch1 -p1 -b .konsole-session %patch2 -p1 -b .home-icon -%patch100 -p1 -b .konsole-flowcontrol # 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 @@ -317,6 +315,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 21 2009 Luk???? Tinkl - 4.2.2-3 - #496447 - fix disabling konsole's flow control Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-9/sources,v retrieving revision 1.103 retrieving revision 1.104 diff -u -p -r1.103 -r1.104 --- sources 3 Apr 2009 12:25:47 -0000 1.103 +++ sources 6 May 2009 11:57:10 -0000 1.104 @@ -1 +1 @@ -7f6b0d5051f251d0f34ee797a8e2b54a kdebase-4.2.2.tar.bz2 +8779d4bd85d356300e22dc34bbeb06f9 kdebase-4.2.3.tar.bz2 --- kdebase-4.2.2-konsole-flowcontrol.patch DELETED --- From twaugh at fedoraproject.org Wed May 6 12:09:10 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Wed, 6 May 2009 12:09:10 +0000 (UTC) Subject: rpms/cups/F-10 cups.spec,1.462,1.463 Message-ID: <20090506120910.E8BD870108@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28313 Modified Files: cups.spec Log Message: * Wed May 6 2009 Tim Waugh 1:1.3.10-5 - Restart cupsd if "ServerAlias *" is added to cupsd.conf (bug #497354). - Ship "ServerAlias *" in cupsd.conf.default configuration file as well (bug #498884). Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v retrieving revision 1.462 retrieving revision 1.463 diff -u -p -r1.462 -r1.463 --- cups.spec 27 Apr 2009 15:57:42 -0000 1.462 +++ cups.spec 6 May 2009 12:08:40 -0000 1.463 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.10 -Release: 4%{?svn:.svn%{svn}}%{?dist} +Release: 5%{?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 @@ -294,13 +294,15 @@ ln -s ipp $RPM_BUILD_ROOT%{cups_serverbi # Disable Host: checking by default for compatibility. The # ServerAlias directive was added in 1.3.10. -cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd.conf +for suffix in conf conf.default; do + cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd."$suffix" # You should list each hostname alias used for this server so that it # can verify the correct name is used for it. Using "ServerAlias *" # disables checking. ServerAlias * EOF +done # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? @@ -375,6 +377,7 @@ if [ "$1" -gt 0 ]; then # disables checking. ServerAlias * EOF + /sbin/service cups condrestart > /dev/null 2>&1 || : fi fi @@ -505,6 +508,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/php/modules/*.so %changelog +* Wed May 6 2009 Tim Waugh 1:1.3.10-5 +- Restart cupsd if "ServerAlias *" is added to cupsd.conf + (bug #497354). +- Ship "ServerAlias *" in cupsd.conf.default configuration file as + well (bug #498884). + * Mon Apr 27 2009 Tim Waugh 1:1.3.10-4 - Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade (part of bug #497301). The default cupsd.conf now includes this From rrakus at fedoraproject.org Wed May 6 12:10:51 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Wed, 6 May 2009 12:10:51 +0000 (UTC) Subject: rpms/python-docs/devel python-docs.spec,1.19,1.20 Message-ID: <20090506121051.91EBA70108@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/python-docs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4254 Modified Files: python-docs.spec Log Message: Another cleanup Index: python-docs.spec =================================================================== RCS file: /cvs/extras/rpms/python-docs/devel/python-docs.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- python-docs.spec 6 May 2009 10:49:15 -0000 1.19 +++ python-docs.spec 6 May 2009 12:10:21 -0000 1.20 @@ -49,15 +49,13 @@ for the Python language. %patch18 -p1 -b .extdocmodules %build -topdir=`pwd` - make -C Doc html #rm html/index.html.in Makefile* info/Makefile tools/sgmlconv/Makefile %install rm -fr $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT %clean rm -fr $RPM_BUILD_ROOT From davidz at fedoraproject.org Wed May 6 12:14:37 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Wed, 6 May 2009 12:14:37 +0000 (UTC) Subject: rpms/DeviceKit-disks/F-11 DeviceKit-disks.spec, 1.23, 1.24 sources, 1.8, 1.9 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch, 1.1, NONE Message-ID: <20090506121437.BAE7770108@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit-disks/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4844 Modified Files: DeviceKit-disks.spec sources Removed Files: 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch Log Message: * Fri May 01 2009 David Zeuthen - 004-2%{?dist} - Rebuild Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/DeviceKit-disks.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- DeviceKit-disks.spec 16 Apr 2009 17:10:51 -0000 1.23 +++ DeviceKit-disks.spec 6 May 2009 12:14:07 -0000 1.24 @@ -7,16 +7,16 @@ %define udev_version 139 %define mdadm_version 2.6.7 %define device_mapper_version 1.02 -%define libatasmart_version 0.8 +%define libatasmart_version 0.12 Summary: Disk Management Service Name: DeviceKit-disks Version: 004 -Release: 0.10.20090415git%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary -Source0: %{name}-%{version}.20090415git.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -59,8 +59,6 @@ Requires: ntfsprogs # for /proc/self/mountinfo, only available in 2.6.26 or higher Conflicts: kernel < 2.6.26 -Patch0: 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch - %description DeviceKit-disks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. @@ -77,7 +75,6 @@ D-Bus interface definitions for DeviceKi %prep %setup -q -%patch0 -p1 -b .vfat-whole-disk %build %configure @@ -135,6 +132,12 @@ rm -rf $RPM_BUILD_ROOT # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Fri May 01 2009 David Zeuthen - 004-2%{?dist} +- Rebuild + +* Fri May 01 2009 David Zeuthen - 004-1%{?dist} +- Upstream release 004 + * Thu Apr 16 2009 David Zeuthen - 004-0.10.20090415git%{?dist} - Properly detect vfat on whole disk devices (#495876) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 15 Apr 2009 18:58:38 -0000 1.8 +++ sources 6 May 2009 12:14:07 -0000 1.9 @@ -1 +1 @@ -7585b97cd3236b10f078b4078c34ee5a DeviceKit-disks-004.20090415git.tar.gz +1ed8e1931f56ad3fc53ba485391434b5 DeviceKit-disks-004.tar.gz --- 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch DELETED --- From ltinkl at fedoraproject.org Wed May 6 12:26:14 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:26:14 +0000 (UTC) Subject: rpms/kdebase-runtime/F-9 kdebase-runtime.spec, 1.69, 1.70 sources, 1.23, 1.24 Message-ID: <20090506122614.DAB9070108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-runtime/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6789/F-9 Modified Files: kdebase-runtime.spec sources Log Message: KDE 4.2.3 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- kdebase-runtime.spec 17 Apr 2009 00:33:32 -0000 1.69 +++ kdebase-runtime.spec 6 May 2009 12:25:44 -0000 1.70 @@ -7,8 +7,8 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -23,7 +23,6 @@ Patch2: kdebase-runtime-4.1.1-kne Patch3: kdebase-runtime-4.1.1-iconthemes-inherit.patch ## Upstream patches -Patch100: kdebase-runtime-4.2.2-persistent_notify.patch #ifarch noarch ## icons now provided by standalone oxygen-icon-theme @@ -128,7 +127,6 @@ BuildArch: noarch %patch3 -p1 -b .iconthemes-inherit # upstream patches -%patch100 -p2 -b .persistent_knotify %build @@ -389,6 +387,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Thu Apr 16 2009 Rex Dieter - 4.2.2-4 - fix persistent systray notifications Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- sources 1 Apr 2009 23:17:00 -0000 1.23 +++ sources 6 May 2009 12:25:44 -0000 1.24 @@ -1 +1 @@ -cff3fbdb98faeec0ae65d8caea7a5b0f kdebase-runtime-4.2.2.tar.bz2 +7ca748e533e3d19f933f9b45f1b1a547 kdebase-runtime-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:26:14 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:26:14 +0000 (UTC) Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec, 1.87, 1.88 sources, 1.29, 1.30 Message-ID: <20090506122614.BC8F470108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-runtime/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6789/F-10 Modified Files: kdebase-runtime.spec sources Log Message: KDE 4.2.3 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -p -r1.87 -r1.88 --- kdebase-runtime.spec 17 Apr 2009 00:29:43 -0000 1.87 +++ kdebase-runtime.spec 6 May 2009 12:25:44 -0000 1.88 @@ -7,8 +7,8 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -23,7 +23,6 @@ Patch2: kdebase-runtime-4.1.1-kne Patch3: kdebase-runtime-4.1.1-iconthemes-inherit.patch ## Upstream patches -Patch100: kdebase-runtime-4.2.2-persistent_notify.patch #ifarch noarch ## icons now provided by standalone oxygen-icon-theme @@ -128,7 +127,6 @@ BuildArch: noarch %patch3 -p1 -b .iconthemes-inherit # upstream patches -%patch100 -p2 -b .persistent_knotify %build @@ -389,6 +387,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Thu Apr 16 2009 Rex Dieter - 4.2.2-4 - fix persistent systray notifications Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- sources 1 Apr 2009 23:15:53 -0000 1.29 +++ sources 6 May 2009 12:25:44 -0000 1.30 @@ -1 +1 @@ -cff3fbdb98faeec0ae65d8caea7a5b0f kdebase-runtime-4.2.2.tar.bz2 +7ca748e533e3d19f933f9b45f1b1a547 kdebase-runtime-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:27:28 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:27:28 +0000 (UTC) Subject: rpms/kdebase-workspace/F-10 sources, 1.29, 1.30 kdebase-workspace-4.2.3-plasma-notifications.patch, 1.1, NONE Message-ID: <20090506122728.2533C70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-workspace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6988/F-10 Modified Files: sources Removed Files: kdebase-workspace-4.2.3-plasma-notifications.patch Log Message: KDE 4.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- sources 1 Apr 2009 23:08:30 -0000 1.29 +++ sources 6 May 2009 12:26:57 -0000 1.30 @@ -1 +1 @@ -ac494815044eefc3a181488871225eda kdebase-workspace-4.2.2.tar.bz2 +f58d388883d73c69a0a719819625b171 kdebase-workspace-4.2.3.tar.bz2 --- kdebase-workspace-4.2.3-plasma-notifications.patch DELETED --- From ltinkl at fedoraproject.org Wed May 6 12:27:28 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:27:28 +0000 (UTC) Subject: rpms/kdebase-workspace/F-9 sources, 1.23, 1.24 kdebase-workspace-4.2.3-plasma-notifications.patch, 1.1, NONE Message-ID: <20090506122728.94AB170108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-workspace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6988/F-9 Modified Files: sources Removed Files: kdebase-workspace-4.2.3-plasma-notifications.patch Log Message: KDE 4.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- sources 1 Apr 2009 23:09:25 -0000 1.23 +++ sources 6 May 2009 12:26:58 -0000 1.24 @@ -1 +1 @@ -ac494815044eefc3a181488871225eda kdebase-workspace-4.2.2.tar.bz2 +f58d388883d73c69a0a719819625b171 kdebase-workspace-4.2.3.tar.bz2 --- kdebase-workspace-4.2.3-plasma-notifications.patch DELETED --- From caolanm at fedoraproject.org Wed May 6 12:28:42 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 6 May 2009 12:28:42 +0000 (UTC) Subject: rpms/hunspell-ar/devel hunspell-ar.spec,1.4,1.5 Message-ID: <20090506122842.84C1270108@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-ar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7175 Modified Files: hunspell-ar.spec Log Message: extend aliases Index: hunspell-ar.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ar/devel/hunspell-ar.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- hunspell-ar.spec 25 Feb 2009 04:24:34 -0000 1.4 +++ hunspell-ar.spec 6 May 2009 12:28:12 -0000 1.5 @@ -2,7 +2,7 @@ Name: hunspell-ar Summary: Arabic hunspell dictionaries %define upstreamid 20080110 Version: 0.%{upstreamid} -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/ayaspell/hunspell-ar_%{upstreamid}.tar.gz Group: Applications/Text URL: http://ayaspell.sourceforge.net/ @@ -27,7 +27,7 @@ cp -p ar.dic $RPM_BUILD_ROOT/%{_datadir} cp -p ar.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/ar_TN.aff pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ -ar_TN_aliases="ar_AE ar_BH ar_DZ ar_EG ar_IN ar_IQ ar_JO ar_LB ar_KW ar_LY ar_MA ar_OM ar_QA ar_SA ar_SD ar_SY ar_YE" +ar_TN_aliases="ar_AE ar_BH ar_DJ ar_DZ ar_EG ar_ER ar_IL ar_IN ar_IQ ar_JO ar_KM ar_KW ar_LB ar_LY ar_MA ar_MR ar_OM ar_PS ar_QA ar_SA ar_SD ar_SO ar_SY ar_TD ar_YE" for lang in $ar_TN_aliases; do ln -s ar_TN.aff $lang.aff ln -s ar_TN.dic $lang.dic @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/myspell/* %changelog +* Wed May 06 2009 Caolan McNamara - 0.20080110-3 +- extend aliases + * Tue Feb 24 2009 Fedora Release Engineering - 0.20080110-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ltinkl at fedoraproject.org Wed May 6 12:28:52 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:28:52 +0000 (UTC) Subject: rpms/kdebindings/F-10 kdebindings.spec, 1.154, 1.155 sources, 1.60, 1.61 kdebindings-qyoto-includes.patch, 1.1, NONE Message-ID: <20090506122852.4294E70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebindings/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7156/F-10 Modified Files: kdebindings.spec sources Removed Files: kdebindings-qyoto-includes.patch Log Message: KDE 4.2.3 Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/F-10/kdebindings.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -p -r1.154 -r1.155 --- kdebindings.spec 2 Apr 2009 14:11:33 -0000 1.154 +++ kdebindings.spec 6 May 2009 12:28:21 -0000 1.155 @@ -1,7 +1,13 @@ # define to enable these optional bits -%ifnarch ppc64 +## arch'es matching mono's ExclusiveArch set +%ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x %define csharp 1 %endif +%if 0%{?fedora} > 10 +%ifarch ppc64 +%define csharp 1 +%endif +%endif %define falcon 1 %define php 1 %define ruby 1 @@ -22,8 +28,8 @@ %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") Name: kdebindings -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -35,7 +41,6 @@ Source1: http://websvn.kde.org/*checkout # patch to disable examples (trouble with them installing to the buildroot) Patch0: kdebindings-qyoto-examples.patch # upstream patches -Patch99: kdebindings-qyoto-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -236,7 +241,6 @@ Falcon plugin for the Kross archtecture %prep %setup -q %patch0 -%patch99 %build @@ -474,6 +478,18 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + +* Tue Apr 21 2009 Kevin Kofler - 4.2.2-5 +- F11+: enable csharp on ppc64 + +* Wed Apr 15 2009 Kevin Kofler - 4.2.2-4 +- reenable csharp on ppc + +* Wed Apr 08 2009 Rex Dieter - 4.2.2-3 +- enable csharp only on archs supported by mono (ie, drop ppc) + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - relax dep on kdepimlibs-akonadi Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebindings/F-10/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- sources 2 Apr 2009 14:11:33 -0000 1.60 +++ sources 6 May 2009 12:28:21 -0000 1.61 @@ -1 +1 @@ -56adf7d276957d87102457165739f764 kdebindings-4.2.2.tar.bz2 +1c0e2a30461fb64654d0cc4e104f4dde kdebindings-4.2.3.tar.bz2 --- kdebindings-qyoto-includes.patch DELETED --- From ltinkl at fedoraproject.org Wed May 6 12:28:52 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:28:52 +0000 (UTC) Subject: rpms/kdebindings/F-9 kdebindings.spec, 1.114, 1.115 sources, 1.55, 1.56 kdebindings-qyoto-includes.patch, 1.1, NONE Message-ID: <20090506122852.A0ED370108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebindings/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7156/F-9 Modified Files: kdebindings.spec sources Removed Files: kdebindings-qyoto-includes.patch Log Message: KDE 4.2.3 Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/F-9/kdebindings.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -p -r1.114 -r1.115 --- kdebindings.spec 2 Apr 2009 14:09:58 -0000 1.114 +++ kdebindings.spec 6 May 2009 12:28:22 -0000 1.115 @@ -1,7 +1,13 @@ # define to enable these optional bits -%ifnarch ppc64 +## arch'es matching mono's ExclusiveArch set +%ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x %define csharp 1 %endif +%if 0%{?fedora} > 10 +%ifarch ppc64 +%define csharp 1 +%endif +%endif %define falcon 1 %define php 1 %define ruby 1 @@ -22,8 +28,8 @@ %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") Name: kdebindings -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -35,7 +41,6 @@ Source1: http://websvn.kde.org/*checkout # patch to disable examples (trouble with them installing to the buildroot) Patch0: kdebindings-qyoto-examples.patch # upstream patches -Patch99: kdebindings-qyoto-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -236,7 +241,6 @@ Falcon plugin for the Kross archtecture %prep %setup -q %patch0 -%patch99 %build @@ -474,6 +478,18 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + +* Tue Apr 21 2009 Kevin Kofler - 4.2.2-5 +- F11+: enable csharp on ppc64 + +* Wed Apr 15 2009 Kevin Kofler - 4.2.2-4 +- reenable csharp on ppc + +* Wed Apr 08 2009 Rex Dieter - 4.2.2-3 +- enable csharp only on archs supported by mono (ie, drop ppc) + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - relax dep on kdepimlibs-akonadi Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebindings/F-9/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -p -r1.55 -r1.56 --- sources 2 Apr 2009 14:09:58 -0000 1.55 +++ sources 6 May 2009 12:28:22 -0000 1.56 @@ -1 +1 @@ -56adf7d276957d87102457165739f764 kdebindings-4.2.2.tar.bz2 +1c0e2a30461fb64654d0cc4e104f4dde kdebindings-4.2.3.tar.bz2 --- kdebindings-qyoto-includes.patch DELETED --- From ltinkl at fedoraproject.org Wed May 6 12:30:18 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:30:18 +0000 (UTC) Subject: rpms/kdeedu/F-10 kdeedu.spec,1.149,1.150 sources,1.62,1.63 Message-ID: <20090506123018.0F81670108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeedu/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7502/F-10 Modified Files: kdeedu.spec sources Log Message: KDE 4.2.3 Index: kdeedu.spec =================================================================== RCS file: /cvs/extras/rpms/kdeedu/F-10/kdeedu.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -p -r1.149 -r1.150 --- kdeedu.spec 2 Apr 2009 15:12:55 -0000 1.149 +++ kdeedu.spec 6 May 2009 12:29:47 -0000 1.150 @@ -13,7 +13,7 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} License: GPLv2 @@ -452,6 +452,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Mar 31 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeedu/F-10/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- sources 2 Apr 2009 14:59:14 -0000 1.62 +++ sources 6 May 2009 12:29:47 -0000 1.63 @@ -1 +1 @@ -132724e6d8d874372c218ed138cb2091 kdeedu-4.2.2.tar.bz2 +c71070469471fc8283c582b8285c44b8 kdeedu-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:30:18 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:30:18 +0000 (UTC) Subject: rpms/kdeedu/F-9 kdeedu.spec,1.123,1.124 sources,1.57,1.58 Message-ID: <20090506123018.73AD870108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeedu/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7502/F-9 Modified Files: kdeedu.spec sources Log Message: KDE 4.2.3 Index: kdeedu.spec =================================================================== RCS file: /cvs/extras/rpms/kdeedu/F-9/kdeedu.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -p -r1.123 -r1.124 --- kdeedu.spec 2 Apr 2009 15:12:54 -0000 1.123 +++ kdeedu.spec 6 May 2009 12:29:48 -0000 1.124 @@ -13,7 +13,7 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} License: GPLv2 @@ -452,6 +452,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Mar 31 2009 Luk???? Tinkl - 4.2.2-1 - KDE 4.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeedu/F-9/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- sources 2 Apr 2009 14:59:14 -0000 1.57 +++ sources 6 May 2009 12:29:48 -0000 1.58 @@ -1 +1 @@ -132724e6d8d874372c218ed138cb2091 kdeedu-4.2.2.tar.bz2 +c71070469471fc8283c582b8285c44b8 kdeedu-4.2.3.tar.bz2 From pkgdb at fedoraproject.org Wed May 6 12:32:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 12:32:09 +0000 Subject: [pkgdb] kdegames: ltinkl has requested watchbugzilla Message-ID: <20090506123209.5652110F89C@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdegames (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegames From pkgdb at fedoraproject.org Wed May 6 12:32:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 12:32:11 +0000 Subject: [pkgdb] kdegames: ltinkl has requested watchcommits Message-ID: <20090506123211.84A1910F8A0@bastion2.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdegames (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegames From pkgdb at fedoraproject.org Wed May 6 12:32:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 12:32:13 +0000 Subject: [pkgdb] kdegames: ltinkl has requested commit Message-ID: <20090506123213.5C5CB10F8A3@bastion2.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdegames (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegames From ltinkl at fedoraproject.org Wed May 6 12:33:25 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:33:25 +0000 (UTC) Subject: rpms/kdegraphics/F-9 sources,1.57,1.58 Message-ID: <20090506123325.18D3570108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdegraphics/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7866/F-9 Modified Files: sources Log Message: KDE 4.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-9/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- sources 1 Apr 2009 23:22:07 -0000 1.57 +++ sources 6 May 2009 12:32:54 -0000 1.58 @@ -1 +1 @@ -92ccbd703885a1f7788e4f27f281a75c kdegraphics-4.2.2.tar.bz2 +29e9a466cd2b282a5139aeca8cc312a2 kdegraphics-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:33:24 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:33:24 +0000 (UTC) Subject: rpms/kdegraphics/F-10 kdegraphics.spec, 1.191, 1.192 sources, 1.64, 1.65 Message-ID: <20090506123324.D57D570108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdegraphics/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7866/F-10 Modified Files: kdegraphics.spec sources Log Message: KDE 4.2.3 Index: kdegraphics.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-10/kdegraphics.spec,v retrieving revision 1.191 retrieving revision 1.192 diff -u -p -r1.191 -r1.192 --- kdegraphics.spec 27 Apr 2009 16:12:29 -0000 1.191 +++ kdegraphics.spec 6 May 2009 12:32:54 -0000 1.192 @@ -6,8 +6,8 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.2.2 -Release: 5%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -242,6 +242,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Mon Apr 27 2009 Rex Dieter 4.2.2-5 - kio_msits subpkg, help avoid kchmviewer conflicts (#484861) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-10/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -p -r1.64 -r1.65 --- sources 1 Apr 2009 23:20:07 -0000 1.64 +++ sources 6 May 2009 12:32:54 -0000 1.65 @@ -1 +1 @@ -92ccbd703885a1f7788e4f27f281a75c kdegraphics-4.2.2.tar.bz2 +29e9a466cd2b282a5139aeca8cc312a2 kdegraphics-4.2.3.tar.bz2 From twaugh at fedoraproject.org Wed May 6 12:33:29 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Wed, 6 May 2009 12:33:29 +0000 (UTC) Subject: rpms/cups/F-9 cups.spec,1.443,1.444 Message-ID: <20090506123329.ED30D70108@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7908 Modified Files: cups.spec Log Message: * Wed May 6 2009 Tim Waugh 1:1.3.10-5 - Restart cupsd if "ServerAlias *" is added to cupsd.conf (bug #497354). - Ship "ServerAlias *" in cupsd.conf.default configuration file as well (bug #498884). Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v retrieving revision 1.443 retrieving revision 1.444 diff -u -p -r1.443 -r1.444 --- cups.spec 27 Apr 2009 15:57:14 -0000 1.443 +++ cups.spec 6 May 2009 12:32:59 -0000 1.444 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.10 -Release: 4%{?svn:.svn%{svn}}%{?dist} +Release: 5%{?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 @@ -269,13 +269,15 @@ ln -s ../../ppd $RPM_BUILD_ROOT%{_datadi # Disable Host: checking by default for compatibility. The # ServerAlias directive was added in 1.3.10. -cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd.conf +for suffix in conf conf.default; do + cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd."$suffix" # You should list each hostname alias used for this server so that it # can verify the correct name is used for it. Using "ServerAlias *" # disables checking. ServerAlias * EOF +done # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? @@ -350,6 +352,7 @@ if [ "$1" -gt 0 ]; then # disables checking. ServerAlias * EOF + /sbin/service cups condrestart > /dev/null 2>&1 || : fi fi @@ -476,6 +479,12 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/daemon/cups-lpd %changelog +* Wed May 6 2009 Tim Waugh 1:1.3.10-5 +- Restart cupsd if "ServerAlias *" is added to cupsd.conf + (bug #497354). +- Ship "ServerAlias *" in cupsd.conf.default configuration file as + well (bug #498884). + * Mon Apr 27 2009 Tim Waugh 1:1.3.10-4 - Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade (part of bug #497301). The default cupsd.conf now includes this From ltinkl at fedoraproject.org Wed May 6 12:35:18 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:35:18 +0000 (UTC) Subject: rpms/kdemultimedia/F-10 kdemultimedia.spec, 1.130, 1.131 sources, 1.62, 1.63 Message-ID: <20090506123518.BA9AA70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdemultimedia/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8169/F-10 Modified Files: kdemultimedia.spec sources Log Message: KDE 4.2.3 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/F-10/kdemultimedia.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -p -r1.130 -r1.131 --- kdemultimedia.spec 2 Apr 2009 15:04:28 -0000 1.130 +++ kdemultimedia.spec 6 May 2009 12:34:48 -0000 1.131 @@ -1,7 +1,7 @@ Name: kdemultimedia Epoch: 6 -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications Group: Applications/Multimedia @@ -151,6 +151,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/F-10/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- sources 2 Apr 2009 15:04:28 -0000 1.62 +++ sources 6 May 2009 12:34:48 -0000 1.63 @@ -1 +1 @@ -ebdf9ccc9eae935eda5f78d56773ee9a kdemultimedia-4.2.2.tar.bz2 +5f34bb1467a015a524e3ecbdd05b167c kdemultimedia-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:35:18 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:35:18 +0000 (UTC) Subject: rpms/kdemultimedia/F-9 kdemultimedia.spec, 1.123, 1.124 sources, 1.57, 1.58 Message-ID: <20090506123518.EAE1470108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdemultimedia/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8169/F-9 Modified Files: kdemultimedia.spec sources Log Message: KDE 4.2.3 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/F-9/kdemultimedia.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -p -r1.123 -r1.124 --- kdemultimedia.spec 2 Apr 2009 15:04:28 -0000 1.123 +++ kdemultimedia.spec 6 May 2009 12:34:48 -0000 1.124 @@ -1,7 +1,7 @@ Name: kdemultimedia Epoch: 6 -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications Group: Applications/Multimedia @@ -151,6 +151,9 @@ fi %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/F-9/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- sources 2 Apr 2009 15:04:28 -0000 1.57 +++ sources 6 May 2009 12:34:48 -0000 1.58 @@ -1 +1 @@ -ebdf9ccc9eae935eda5f78d56773ee9a kdemultimedia-4.2.2.tar.bz2 +5f34bb1467a015a524e3ecbdd05b167c kdemultimedia-4.2.3.tar.bz2 From dwalsh at fedoraproject.org Wed May 6 12:35:57 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Wed, 6 May 2009 12:35:57 +0000 (UTC) Subject: rpms/setroubleshoot/F-11 .cvsignore, 1.97, 1.98 setroubleshoot.spec, 1.131, 1.132 sources, 1.108, 1.109 Message-ID: <20090506123557.AE58B70108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/setroubleshoot/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8424 Modified Files: .cvsignore setroubleshoot.spec sources Log Message: * Wed May 6 2009 Dan Walsh - 2.1.10-1 - Make sure setroubleshoot exists after 10 seconds Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-11/.cvsignore,v retrieving revision 1.97 retrieving revision 1.98 diff -u -p -r1.97 -r1.98 --- .cvsignore 4 May 2009 15:59:38 -0000 1.97 +++ .cvsignore 6 May 2009 12:35:27 -0000 1.98 @@ -13,3 +13,4 @@ setroubleshoot-2.1.6.tar.gz setroubleshoot-2.1.7.tar.gz setroubleshoot-2.1.8.tar.gz setroubleshoot-2.1.9.tar.gz +setroubleshoot-2.1.10.tar.gz Index: setroubleshoot.spec =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-11/setroubleshoot.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -p -r1.131 -r1.132 --- setroubleshoot.spec 4 May 2009 16:01:19 -0000 1.131 +++ setroubleshoot.spec 6 May 2009 12:35:27 -0000 1.132 @@ -1,7 +1,7 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 2.1.9 -Release: 2%{?dist} +Version: 2.1.10 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/setroubleshoot @@ -194,7 +194,10 @@ Setroubleshoot documentation package %doc %{pkgdocdir} %changelog -* Mon May 4 2009 Dan Walsh - 2.1.9-2 +* Wed May 6 2009 Dan Walsh - 2.1.10-1 +- Make sure setroubleshoot exists after 10 seconds + +* Mon May 4 2009 Dan Walsh - 2.1.9-1 - Change multiple signatures from exception to warning - Update links on fedorahosted.org Index: sources =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-11/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -p -r1.108 -r1.109 --- sources 4 May 2009 15:59:38 -0000 1.108 +++ sources 6 May 2009 12:35:27 -0000 1.109 @@ -1 +1 @@ -1c2a21c6a524c62f46145854853341d9 setroubleshoot-2.1.9.tar.gz +18217d0c53d0b71e6381e213dab739b6 setroubleshoot-2.1.10.tar.gz From dwalsh at fedoraproject.org Wed May 6 12:36:12 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Wed, 6 May 2009 12:36:12 +0000 (UTC) Subject: rpms/setroubleshoot/devel .cvsignore, 1.97, 1.98 setroubleshoot.spec, 1.130, 1.131 sources, 1.109, 1.110 Message-ID: <20090506123612.41CE070108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/setroubleshoot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8477 Modified Files: .cvsignore setroubleshoot.spec sources Log Message: * Wed May 6 2009 Dan Walsh - 2.1.10-1 - Make sure setroubleshoot exists after 10 seconds Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v retrieving revision 1.97 retrieving revision 1.98 diff -u -p -r1.97 -r1.98 --- .cvsignore 4 May 2009 15:55:45 -0000 1.97 +++ .cvsignore 6 May 2009 12:35:41 -0000 1.98 @@ -13,3 +13,4 @@ setroubleshoot-2.1.6.tar.gz setroubleshoot-2.1.7.tar.gz setroubleshoot-2.1.8.tar.gz setroubleshoot-2.1.9.tar.gz +setroubleshoot-2.1.10.tar.gz Index: setroubleshoot.spec =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -p -r1.130 -r1.131 --- setroubleshoot.spec 4 May 2009 15:55:45 -0000 1.130 +++ setroubleshoot.spec 6 May 2009 12:35:41 -0000 1.131 @@ -1,6 +1,6 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 2.1.9 +Version: 2.1.10 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -194,6 +194,9 @@ Setroubleshoot documentation package %doc %{pkgdocdir} %changelog +* Wed May 6 2009 Dan Walsh - 2.1.10-1 +- Make sure setroubleshoot exists after 10 seconds + * Mon May 4 2009 Dan Walsh - 2.1.9-1 - Change multiple signatures from exception to warning - Update links on fedorahosted.org Index: sources =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v retrieving revision 1.109 retrieving revision 1.110 diff -u -p -r1.109 -r1.110 --- sources 4 May 2009 15:59:45 -0000 1.109 +++ sources 6 May 2009 12:35:41 -0000 1.110 @@ -1 +1 @@ -1c2a21c6a524c62f46145854853341d9 setroubleshoot-2.1.9.tar.gz +18217d0c53d0b71e6381e213dab739b6 setroubleshoot-2.1.10.tar.gz From ltinkl at fedoraproject.org Wed May 6 12:36:30 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:36:30 +0000 (UTC) Subject: rpms/kdenetwork/F-10 kdenetwork-4.2.3-filesharing-crash.patch, NONE, 1.1 kdenetwork.spec, 1.165, 1.166 sources, 1.70, 1.71 Message-ID: <20090506123630.B1D8A70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdenetwork/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8502/F-10 Modified Files: kdenetwork.spec sources Added Files: kdenetwork-4.2.3-filesharing-crash.patch Log Message: KDE 4.2.3 kdenetwork-4.2.3-filesharing-crash.patch: --- NEW FILE kdenetwork-4.2.3-filesharing-crash.patch --- --- kdenetwork/filesharing/advanced/nfs/nfsfile.cpp 2009/01/06 17:13:38 906699 +++ kdenetwork/filesharing/advanced/nfs/nfsfile.cpp 2009/05/05 00:50:30 963627 @@ -71,7 +71,7 @@ return 0L; QString testPath = path.trimmed(); - if ( testPath[testPath.length()-1] != '/' ) + if ( !testPath.endsWith('/') ) testPath += '/'; for (NFSEntry* entry = _entries.first(); entry; entry = _entries.next()) @@ -129,7 +129,7 @@ completeLine = currentLine; // is the line continued in the next line ? - if ( completeLine[completeLine.length()-1] == '\\' ) + if ( completeLine.endsWith('\\') ) { continuedLine = true; // remove the ending backslash @@ -144,7 +144,7 @@ } // comments - if ('#' == completeLine[0]) { + if (completeLine.startsWith('#') ) { _lines.append(new NFSComment(completeLine)); continue; } @@ -153,7 +153,7 @@ QString hosts; // Handle quotation marks - if ( completeLine[0] == '"' ) { + if ( completeLine.startsWith('"') ) { int i = completeLine.indexOf('"',1); if (i == -1) { kError() << "NFSFile: Parse error: Missing quotation mark: " @@ -177,7 +177,7 @@ } // normalize path - if ( path[path.length()-1] != '/' ) + if ( !path.endsWith('/') ) path += '/'; kDebug(5009) << "KNFSShare: Found path: '" << path << "'"; Index: kdenetwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/F-10/kdenetwork.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -p -r1.165 -r1.166 --- kdenetwork.spec 2 Apr 2009 15:07:22 -0000 1.165 +++ kdenetwork.spec 6 May 2009 12:36:00 -0000 1.166 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Network Applications Name: kdenetwork Epoch: 7 -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} License: GPLv2 @@ -10,11 +10,15 @@ URL: http://www.kde.org Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kdenetwork-4.2.0-handle-enc-message.patch Patch1: kdenetwork-4.2.0-libv4l.patch + +# 4.2 upstream patches +Patch100: kdenetwork-4.2.3-filesharing-crash.patch + # build Kopete against the system libgadu (backported from 4.3) # http://websvn.kde.org/?view=rev&revision=909144 # http://websvn.kde.org/?view=rev&revision=909145 -Patch100: kdenetwork-4.1.96-system-libgadu.patch -Patch104: kdenetwork-4.2.0-kopete-view-history.patch +Patch200: kdenetwork-4.1.96-system-libgadu.patch +Patch201: kdenetwork-4.2.0-kopete-view-history.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,9 +95,12 @@ Requires: kdelibs4-devel %setup -q %patch0 -p1 -b .handle-enc-message %patch1 -p1 -b .libv4l -%patch100 -p0 -b .system-libgadu +# 4.2 upstream patches +%patch100 -p1 -b .filesharing-crash +# 4.3 upstream patches +%patch200 -p0 -b .system-libgadu rm -rf kopete/protocols/gadu/libgadu/ -%patch104 -p1 -b .kopete-view-history +%patch201 -p1 -b .kopete-view-history %build @@ -177,6 +184,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/F-10/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- sources 2 Apr 2009 15:07:23 -0000 1.70 +++ sources 6 May 2009 12:36:00 -0000 1.71 @@ -1 +1 @@ -72193b5eb050ef45fad76422a15e0e1a kdenetwork-4.2.2.tar.bz2 +7d77ab0322f96251a8d3baf7e4f6990e kdenetwork-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:36:31 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:36:31 +0000 (UTC) Subject: rpms/kdenetwork/F-9 kdenetwork-4.2.3-filesharing-crash.patch, NONE, 1.1 kdenetwork.spec, 1.164, 1.165 sources, 1.64, 1.65 Message-ID: <20090506123631.319B070108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdenetwork/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8502/F-9 Modified Files: kdenetwork.spec sources Added Files: kdenetwork-4.2.3-filesharing-crash.patch Log Message: KDE 4.2.3 kdenetwork-4.2.3-filesharing-crash.patch: --- NEW FILE kdenetwork-4.2.3-filesharing-crash.patch --- --- kdenetwork/filesharing/advanced/nfs/nfsfile.cpp 2009/01/06 17:13:38 906699 +++ kdenetwork/filesharing/advanced/nfs/nfsfile.cpp 2009/05/05 00:50:30 963627 @@ -71,7 +71,7 @@ return 0L; QString testPath = path.trimmed(); - if ( testPath[testPath.length()-1] != '/' ) + if ( !testPath.endsWith('/') ) testPath += '/'; for (NFSEntry* entry = _entries.first(); entry; entry = _entries.next()) @@ -129,7 +129,7 @@ completeLine = currentLine; // is the line continued in the next line ? - if ( completeLine[completeLine.length()-1] == '\\' ) + if ( completeLine.endsWith('\\') ) { continuedLine = true; // remove the ending backslash @@ -144,7 +144,7 @@ } // comments - if ('#' == completeLine[0]) { + if (completeLine.startsWith('#') ) { _lines.append(new NFSComment(completeLine)); continue; } @@ -153,7 +153,7 @@ QString hosts; // Handle quotation marks - if ( completeLine[0] == '"' ) { + if ( completeLine.startsWith('"') ) { int i = completeLine.indexOf('"',1); if (i == -1) { kError() << "NFSFile: Parse error: Missing quotation mark: " @@ -177,7 +177,7 @@ } // normalize path - if ( path[path.length()-1] != '/' ) + if ( !path.endsWith('/') ) path += '/'; kDebug(5009) << "KNFSShare: Found path: '" << path << "'"; Index: kdenetwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -p -r1.164 -r1.165 --- kdenetwork.spec 2 Apr 2009 15:07:22 -0000 1.164 +++ kdenetwork.spec 6 May 2009 12:36:00 -0000 1.165 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Network Applications Name: kdenetwork Epoch: 7 -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} License: GPLv2 @@ -10,11 +10,15 @@ URL: http://www.kde.org Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kdenetwork-4.2.0-handle-enc-message.patch Patch1: kdenetwork-4.2.0-libv4l.patch + +# 4.2 upstream patches +Patch100: kdenetwork-4.2.3-filesharing-crash.patch + # build Kopete against the system libgadu (backported from 4.3) # http://websvn.kde.org/?view=rev&revision=909144 # http://websvn.kde.org/?view=rev&revision=909145 -Patch100: kdenetwork-4.1.96-system-libgadu.patch -Patch104: kdenetwork-4.2.0-kopete-view-history.patch +Patch200: kdenetwork-4.1.96-system-libgadu.patch +Patch201: kdenetwork-4.2.0-kopete-view-history.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,9 +95,12 @@ Requires: kdelibs4-devel %setup -q %patch0 -p1 -b .handle-enc-message %patch1 -p1 -b .libv4l -%patch100 -p0 -b .system-libgadu +# 4.2 upstream patches +%patch100 -p1 -b .filesharing-crash +# 4.3 upstream patches +%patch200 -p0 -b .system-libgadu rm -rf kopete/protocols/gadu/libgadu/ -%patch104 -p1 -b .kopete-view-history +%patch201 -p1 -b .kopete-view-history %build @@ -177,6 +184,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/F-9/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -p -r1.64 -r1.65 --- sources 2 Apr 2009 15:07:22 -0000 1.64 +++ sources 6 May 2009 12:36:00 -0000 1.65 @@ -1 +1 @@ -72193b5eb050ef45fad76422a15e0e1a kdenetwork-4.2.2.tar.bz2 +7d77ab0322f96251a8d3baf7e4f6990e kdenetwork-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:38:00 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:38:00 +0000 (UTC) Subject: rpms/kdesdk/F-10 kdesdk.spec, 1.128, 1.129 sources, 1.57, 1.58 kdesdk-4.2.1-blockquote.patch, 1.1, NONE Message-ID: <20090506123800.0CDF670108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdesdk/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8941/F-10 Modified Files: kdesdk.spec sources Removed Files: kdesdk-4.2.1-blockquote.patch Log Message: KDE 4.2.3 Index: kdesdk.spec =================================================================== RCS file: /cvs/extras/rpms/kdesdk/F-10/kdesdk.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -p -r1.128 -r1.129 --- kdesdk.spec 2 Apr 2009 15:21:48 -0000 1.128 +++ kdesdk.spec 6 May 2009 12:37:29 -0000 1.129 @@ -1,6 +1,6 @@ Name: kdesdk -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) Group: User Interface/Desktops @@ -11,7 +11,6 @@ Source0: ftp://ftp.kde.org/pub/kd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # upstreamable patches -Patch50: kdesdk-4.2.1-blockquote.patch BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: plasma-devel >= %{version} @@ -77,8 +76,6 @@ xml2pot %prep %setup -q -%patch50 -p1 -b .blockquote - %build mkdir -p %{_target_platform} @@ -226,6 +223,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesdk/F-10/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- sources 2 Apr 2009 15:21:48 -0000 1.57 +++ sources 6 May 2009 12:37:29 -0000 1.58 @@ -1 +1 @@ -018767d862229899f4a648a6c36fd0f6 kdesdk-4.2.2.tar.bz2 +a69a3199da0707dc9c2abaf357b341cb kdesdk-4.2.3.tar.bz2 --- kdesdk-4.2.1-blockquote.patch DELETED --- From ltinkl at fedoraproject.org Wed May 6 12:38:00 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:38:00 +0000 (UTC) Subject: rpms/kdesdk/F-9 kdesdk.spec, 1.116, 1.117 sources, 1.52, 1.53 kdesdk-4.2.1-blockquote.patch, 1.1, NONE Message-ID: <20090506123800.6C00970108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdesdk/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8941/F-9 Modified Files: kdesdk.spec sources Removed Files: kdesdk-4.2.1-blockquote.patch Log Message: KDE 4.2.3 Index: kdesdk.spec =================================================================== RCS file: /cvs/extras/rpms/kdesdk/F-9/kdesdk.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -p -r1.116 -r1.117 --- kdesdk.spec 2 Apr 2009 15:21:48 -0000 1.116 +++ kdesdk.spec 6 May 2009 12:37:30 -0000 1.117 @@ -1,6 +1,6 @@ Name: kdesdk -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) Group: User Interface/Desktops @@ -11,7 +11,6 @@ Source0: ftp://ftp.kde.org/pub/kd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # upstreamable patches -Patch50: kdesdk-4.2.1-blockquote.patch BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: plasma-devel >= %{version} @@ -77,8 +76,6 @@ xml2pot %prep %setup -q -%patch50 -p1 -b .blockquote - %build mkdir -p %{_target_platform} @@ -226,6 +223,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter - 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesdk/F-9/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -r1.52 -r1.53 --- sources 2 Apr 2009 15:21:48 -0000 1.52 +++ sources 6 May 2009 12:37:30 -0000 1.53 @@ -1 +1 @@ -018767d862229899f4a648a6c36fd0f6 kdesdk-4.2.2.tar.bz2 +a69a3199da0707dc9c2abaf357b341cb kdesdk-4.2.3.tar.bz2 --- kdesdk-4.2.1-blockquote.patch DELETED --- From ltinkl at fedoraproject.org Wed May 6 12:39:34 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:39:34 +0000 (UTC) Subject: rpms/kdetoys/F-9 kdetoys.spec,1.32,1.33 sources,1.25,1.26 Message-ID: <20090506123934.4899870108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdetoys/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9116/F-9 Modified Files: kdetoys.spec sources Log Message: KDE 4.2.3 Index: kdetoys.spec =================================================================== RCS file: /cvs/extras/rpms/kdetoys/F-9/kdetoys.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- kdetoys.spec 2 Apr 2009 15:24:30 -0000 1.32 +++ kdetoys.spec 6 May 2009 12:39:03 -0000 1.33 @@ -1,8 +1,8 @@ Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 Group: Amusements/Graphics @@ -89,6 +89,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/F-9/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sources 2 Apr 2009 15:24:30 -0000 1.25 +++ sources 6 May 2009 12:39:03 -0000 1.26 @@ -1 +1 @@ -dcc17b3d719c7ddb48f75b64f34af261 kdetoys-4.2.2.tar.bz2 +5548b13e12ba84230bda3f6d972afaa0 kdetoys-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:39:33 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:39:33 +0000 (UTC) Subject: rpms/kdetoys/F-10 kdetoys.spec,1.40,1.41 sources,1.30,1.31 Message-ID: <20090506123933.D2A4A70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdetoys/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9116/F-10 Modified Files: kdetoys.spec sources Log Message: KDE 4.2.3 Index: kdetoys.spec =================================================================== RCS file: /cvs/extras/rpms/kdetoys/F-10/kdetoys.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- kdetoys.spec 2 Apr 2009 15:24:30 -0000 1.40 +++ kdetoys.spec 6 May 2009 12:39:03 -0000 1.41 @@ -1,8 +1,8 @@ Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 Group: Amusements/Graphics @@ -89,6 +89,9 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 01 2009 Rex Dieter 4.2.2-2 - optimize scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/F-10/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- sources 2 Apr 2009 15:24:30 -0000 1.30 +++ sources 6 May 2009 12:39:03 -0000 1.31 @@ -1 +1 @@ -dcc17b3d719c7ddb48f75b64f34af261 kdetoys-4.2.2.tar.bz2 +5548b13e12ba84230bda3f6d972afaa0 kdetoys-4.2.3.tar.bz2 From pkgdb at fedoraproject.org Wed May 6 12:39:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 12:39:51 +0000 Subject: [pkgdb] kdegames had acl change status Message-ID: <20090506123952.6A83E10F8A0@bastion2.fedora.phx.redhat.com> than has set the watchcommits acl on kdegames (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegames From pkgdb at fedoraproject.org Wed May 6 12:39:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 12:39:51 +0000 Subject: [pkgdb] kdegames had acl change status Message-ID: <20090506123951.59F7710F893@bastion2.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdegames (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegames From pkgdb at fedoraproject.org Wed May 6 12:39:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 12:39:54 +0000 Subject: [pkgdb] kdegames had acl change status Message-ID: <20090506123954.63AA210F8A3@bastion2.fedora.phx.redhat.com> than has set the commit acl on kdegames (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdegames From ltinkl at fedoraproject.org Wed May 6 12:40:51 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:40:51 +0000 (UTC) Subject: rpms/kdeutils/F-10 kdeutils.spec, 1.155, 1.156 sources, 1.61, 1.62 kdeutils-4.2.2-ark.patch, 1.1, NONE Message-ID: <20090506124051.CFFF870108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeutils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9272/F-10 Modified Files: kdeutils.spec sources Removed Files: kdeutils-4.2.2-ark.patch Log Message: KDE 4.2.3 Index: kdeutils.spec =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-10/kdeutils.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -p -r1.155 -r1.156 --- kdeutils.spec 15 Apr 2009 10:58:19 -0000 1.155 +++ kdeutils.spec 6 May 2009 12:40:21 -0000 1.156 @@ -5,8 +5,8 @@ Name: kdeutils Epoch: 6 -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -20,7 +20,6 @@ Patch0: kdeutils-4.2.0-kjots-wit %endif Patch1: kdeutils-4.2.2-pykde4.patch # upstream fixes -Patch100: kdeutils-4.2.2-ark.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,12 +29,18 @@ BuildRequires: plasma-devel >= %{versio BuildRequires: gmp-devel BuildRequires: libarchive-devel BuildRequires: libzip-devel +BuildRequires: python BuildRequires: qimageblitz-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: kdelibs4 >= %{version} +%if 0%{?fedora} < 11 +# upgrade path so it doesn't get lost +Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release} +%endif + Provides: okteta = 0.1.0-1 Obsoletes: okteta < 0.1.0-1 @@ -70,10 +75,6 @@ Group: Applications/System Requires: PyKDE4 >= %{version} Requires: hal-cups-utils Requires: system-config-printer-libs -# upgrade path so it doesn't get lost -Requires: %{name} = %{epoch}:%{version}-%{release} -Obsoletes: %{name} < 6:4.2.1-3 - %description printer-applet %{summary}. @@ -95,7 +96,6 @@ rm -rf kdepim-%{version} %patch1 -p1 -b .pykde4 # upstream fixes -%patch100 -p1 -b .ark %build @@ -200,6 +200,12 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + +* Thu Apr 16 2009 Rex Dieter - 4.2.2-4 +- revert -printer-applet dep changes (and drop for f11+) + * Wed Apr 15 2009 Than Ngo - 4.2.2-3 - drop the BR on PyKDE4, system-config-printer-libs it's just needed for runtime Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-10/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- sources 2 Apr 2009 15:31:02 -0000 1.61 +++ sources 6 May 2009 12:40:21 -0000 1.62 @@ -1 +1 @@ -3df5186f9dacddbce48a1c7eb35515cd kdeutils-4.2.2.tar.bz2 +8fddacea28f6c0a6c2ac2462750b7e50 kdeutils-4.2.3.tar.bz2 --- kdeutils-4.2.2-ark.patch DELETED --- From ltinkl at fedoraproject.org Wed May 6 12:40:52 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:40:52 +0000 (UTC) Subject: rpms/kdeutils/F-11 sources,1.63,1.64 Message-ID: <20090506124052.3C16870108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeutils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9272/F-11 Modified Files: sources Log Message: KDE 4.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-11/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- sources 3 May 2009 22:26:17 -0000 1.63 +++ sources 6 May 2009 12:40:21 -0000 1.64 @@ -1,2 +1 @@ -3df5186f9dacddbce48a1c7eb35515cd kdeutils-4.2.2.tar.bz2 8fddacea28f6c0a6c2ac2462750b7e50 kdeutils-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:40:52 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:40:52 +0000 (UTC) Subject: rpms/kdeutils/F-9 kdeutils.spec, 1.141, 1.142 sources, 1.63, 1.64 kdeutils-4.2.2-ark.patch, 1.1, NONE Message-ID: <20090506124052.E059B70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdeutils/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9272/F-9 Modified Files: kdeutils.spec sources Removed Files: kdeutils-4.2.2-ark.patch Log Message: KDE 4.2.3 Index: kdeutils.spec =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-9/kdeutils.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -p -r1.141 -r1.142 --- kdeutils.spec 15 Apr 2009 11:00:41 -0000 1.141 +++ kdeutils.spec 6 May 2009 12:40:22 -0000 1.142 @@ -5,8 +5,8 @@ Name: kdeutils Epoch: 6 -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -20,7 +20,6 @@ Patch0: kdeutils-4.2.0-kjots-wit %endif Patch1: kdeutils-4.2.2-pykde4.patch # upstream fixes -Patch100: kdeutils-4.2.2-ark.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,12 +29,18 @@ BuildRequires: plasma-devel >= %{versio BuildRequires: gmp-devel BuildRequires: libarchive-devel BuildRequires: libzip-devel +BuildRequires: python BuildRequires: qimageblitz-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: kdelibs4 >= %{version} +%if 0%{?fedora} < 11 +# upgrade path so it doesn't get lost +Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release} +%endif + Provides: okteta = 0.1.0-1 Obsoletes: okteta < 0.1.0-1 @@ -70,10 +75,6 @@ Group: Applications/System Requires: PyKDE4 >= %{version} Requires: hal-cups-utils Requires: system-config-printer-libs -# upgrade path so it doesn't get lost -Requires: %{name} = %{epoch}:%{version}-%{release} -Obsoletes: %{name} < 6:4.2.1-3 - %description printer-applet %{summary}. @@ -95,7 +96,6 @@ rm -rf kdepim-%{version} %patch1 -p1 -b .pykde4 # upstream fixes -%patch100 -p1 -b .ark %build @@ -200,6 +200,12 @@ fi %changelog +* Mon May 04 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + +* Thu Apr 16 2009 Rex Dieter - 4.2.2-4 +- revert -printer-applet dep changes (and drop for f11+) + * Wed Apr 15 2009 Than Ngo - 4.2.2-3 - drop the BR on PyKDE4, system-config-printer-libs it's just needed for runtime Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-9/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- sources 2 Apr 2009 15:42:56 -0000 1.63 +++ sources 6 May 2009 12:40:22 -0000 1.64 @@ -1,2 +1 @@ -3df5186f9dacddbce48a1c7eb35515cd kdeutils-4.2.2.tar.bz2 -964208d570845c75e0c482bb3d33892f kdepim-4.2.2.tar.bz2 +8fddacea28f6c0a6c2ac2462750b7e50 kdeutils-4.2.3.tar.bz2 --- kdeutils-4.2.2-ark.patch DELETED --- From davidz at fedoraproject.org Wed May 6 12:44:40 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Wed, 6 May 2009 12:44:40 +0000 (UTC) Subject: rpms/gnome-disk-utility/F-11 gnome-disk-utility.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <20090506124440.1E25C70108@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gnome-disk-utility/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9784 Modified Files: gnome-disk-utility.spec sources Log Message: * Fri May 01 2009 David Zeuthen - 0.3-1%{?dist} - Upstream release 0.3 Index: gnome-disk-utility.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-11/gnome-disk-utility.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- gnome-disk-utility.spec 15 Apr 2009 19:11:22 -0000 1.11 +++ gnome-disk-utility.spec 6 May 2009 12:44:09 -0000 1.12 @@ -9,15 +9,16 @@ %define devicekit_disks_version 004 %define unique_version 1.0.4 %define libnotify_version 0.4.5 +%define nautilus_version 2.26 Summary: Disk management application Name: gnome-disk-utility Version: 0.3 -Release: 0.5.20090415git%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://git.gnome.org/cgit/gnome-disk-utility -Source0: %{name}-%{version}.20090415git.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -33,11 +34,14 @@ BuildRequires: DeviceKit-disks-devel >= BuildRequires: PolicyKit-gnome-devel >= %{polkit_gnome_version} BuildRequires: unique-devel >= %{unique_version} BuildRequires: libnotify-devel >= %{libnotify_version} +BuildRequires: nautilus-devel >= %{nautilus_version} BuildRequires: libsexy-devel BuildRequires: intltool Requires(post): scrollkeeper Requires(postun): scrollkeeper Requires: %{name}-libs = %{version}-%{release} +Obsoletes: gnome-disk-utility-format +Obsoletes: nautilus-gdu %description This package contains the Palimpsest disk management application. @@ -116,9 +120,11 @@ desktop-file-install --delete-original rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.a -# TODO: no translations yet -#%find_lang --with-gnome %{name} + +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT @@ -154,6 +160,8 @@ fi %{_libexecdir}/gdu-notification-daemon %{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop +%{_libdir}/nautilus/extensions-2.0/*.so +%{_libexecdir}/gdu-format-tool %{_bindir}/palimpsest %{_datadir}/applications/palimpsest.desktop @@ -164,10 +172,7 @@ fi %dir %{_datadir}/omf/palimpsest %{_datadir}/omf/palimpsest/* -# TODO: no translations yet -#%files libs -f %{name}.lang - -%files libs +%files libs -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING HACKING doc/TODO @@ -208,6 +213,9 @@ fi %{_includedir}/gnome-disk-utility/gdu-gtk/* %changelog +* Fri May 01 2009 David Zeuthen - 0.3-1%{?dist} +- Upstream release 0.3 + * Wed Apr 15 2009 David Zeuthen - 0.3-0.5.20090415git%{?dist} - New snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 15 Apr 2009 19:11:22 -0000 1.6 +++ sources 6 May 2009 12:44:09 -0000 1.7 @@ -1 +1 @@ -7aa1e2dc7de710d2494de3bae94ee15a gnome-disk-utility-0.3.20090415git.tar.bz2 +1aa94c224cd3dd2ebfd05bf31476dbb5 gnome-disk-utility-0.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:45:21 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:45:21 +0000 (UTC) Subject: rpms/kdegames/F-10 kdegames.spec,1.114,1.115 sources,1.66,1.67 Message-ID: <20090506124521.1CCB170108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdegames/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9857/F-10 Modified Files: kdegames.spec sources Log Message: KDE 4.2.3 Index: kdegames.spec =================================================================== RCS file: /cvs/extras/rpms/kdegames/F-10/kdegames.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -p -r1.114 -r1.115 --- kdegames.spec 8 Apr 2009 22:45:27 -0000 1.114 +++ kdegames.spec 6 May 2009 12:44:50 -0000 1.115 @@ -2,8 +2,8 @@ Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 -Version: 4.2.2 -Release: 6%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 URL: http://www.kde.org/ @@ -199,6 +199,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 08 2009 Kevin Kofler - 4.2.2-6 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegames/F-10/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- sources 2 Apr 2009 15:01:25 -0000 1.66 +++ sources 6 May 2009 12:44:50 -0000 1.67 @@ -1 +1 @@ -d78bba18dcf6bcdf86f77b26596f4c71 kdegames-4.2.2.tar.bz2 +85a1dfe811e0704eb7ef65e0c371f863 kdegames-4.2.3.tar.bz2 From ltinkl at fedoraproject.org Wed May 6 12:45:21 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Wed, 6 May 2009 12:45:21 +0000 (UTC) Subject: rpms/kdegames/F-9 kdegames.spec,1.104,1.105 sources,1.61,1.62 Message-ID: <20090506124521.7089E70108@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdegames/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9857/F-9 Modified Files: kdegames.spec sources Log Message: KDE 4.2.3 Index: kdegames.spec =================================================================== RCS file: /cvs/extras/rpms/kdegames/F-9/kdegames.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -p -r1.104 -r1.105 --- kdegames.spec 8 Apr 2009 22:45:27 -0000 1.104 +++ kdegames.spec 6 May 2009 12:44:51 -0000 1.105 @@ -2,8 +2,8 @@ Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 -Version: 4.2.2 -Release: 6%{?dist} +Version: 4.2.3 +Release: 1%{?dist} License: GPLv2 URL: http://www.kde.org/ @@ -199,6 +199,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Wed Apr 08 2009 Kevin Kofler - 4.2.2-6 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegames/F-9/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- sources 2 Apr 2009 15:01:24 -0000 1.61 +++ sources 6 May 2009 12:44:51 -0000 1.62 @@ -1 +1 @@ -d78bba18dcf6bcdf86f77b26596f4c71 kdegames-4.2.2.tar.bz2 +85a1dfe811e0704eb7ef65e0c371f863 kdegames-4.2.3.tar.bz2 From jbowes at fedoraproject.org Wed May 6 12:50:42 2009 From: jbowes at fedoraproject.org (James Bowes) Date: Wed, 6 May 2009 12:50:42 +0000 (UTC) Subject: rpms/gnome-nds-thumbnailer/devel .cvsignore, 1.2, 1.3 gnome-nds-thumbnailer.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090506125043.0AE9670108@cvs1.fedora.phx.redhat.com> Author: jbowes Update of /cvs/extras/rpms/gnome-nds-thumbnailer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10630 Modified Files: .cvsignore gnome-nds-thumbnailer.spec sources Log Message: update to 1.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-nds-thumbnailer/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 12 Feb 2008 12:45:51 -0000 1.2 +++ .cvsignore 6 May 2009 12:50:12 -0000 1.3 @@ -1 +1 @@ -gnome-nds-thumbnailer-1.0.2.tar.bz2 +gnome-nds-thumbnailer-1.2.1.tar.bz2 Index: gnome-nds-thumbnailer.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-nds-thumbnailer/devel/gnome-nds-thumbnailer.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- gnome-nds-thumbnailer.spec 24 Feb 2009 23:08:37 -0000 1.2 +++ gnome-nds-thumbnailer.spec 6 May 2009 12:50:12 -0000 1.3 @@ -1,12 +1,12 @@ Name: gnome-nds-thumbnailer -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Thumbnailer for Nintendo DS ROM files Group: Amusements/Graphics License: GPLv2+ URL: http://ftp.gnome.org/pub/GNOME/sources/%{name} -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -73,6 +73,9 @@ fi %changelog +* Wed May 06 2009 James Bowes 1.2.1-1 +- Latest upstream release + * Tue Feb 24 2009 Fedora Release Engineering - 1.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-nds-thumbnailer/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 12 Feb 2008 12:45:51 -0000 1.2 +++ sources 6 May 2009 12:50:12 -0000 1.3 @@ -1 +1 @@ -316e43eb66828addae64038372c59ab9 gnome-nds-thumbnailer-1.0.2.tar.bz2 +a20c1d98d9b16d8a538134fec1455dd7 gnome-nds-thumbnailer-1.2.1.tar.bz2 From dwalsh at fedoraproject.org Wed May 6 12:51:53 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Wed, 6 May 2009 12:51:53 +0000 (UTC) Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.114, 1.115 selinux-policy.spec, 1.852, 1.853 Message-ID: <20090506125153.105D770108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10900 Modified Files: policy-20090105.patch selinux-policy.spec Log Message: * Tue May 5 2009 Dan Walsh 3.6.12-30 -Remove duplicate line policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v retrieving revision 1.114 retrieving revision 1.115 diff -u -p -r1.114 -r1.115 --- policy-20090105.patch 5 May 2009 20:48:32 -0000 1.114 +++ policy-20090105.patch 6 May 2009 12:51:51 -0000 1.115 @@ -4897,7 +4897,7 @@ diff -b -B --ignore-all-space --exclude- +corecmd_executable_file(wm_exec_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2009-03-05 10:34:00.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc 2009-05-05 14:05:47.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc 2009-05-05 18:05:12.000000000 -0400 @@ -32,6 +32,8 @@ # # /etc @@ -4907,18 +4907,17 @@ diff -b -B --ignore-all-space --exclude- /etc/apcupsd/apccontrol -- gen_context(system_u:object_r:bin_t,s0) /etc/apcupsd/changeme -- gen_context(system_u:object_r:bin_t,s0) /etc/apcupsd/commfailure -- gen_context(system_u:object_r:bin_t,s0) -@@ -134,6 +136,10 @@ +@@ -134,6 +136,9 @@ /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0) ') +/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) +/opt/OpenPrinting-Gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) -+/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) + # # /usr # -@@ -210,6 +216,7 @@ +@@ -210,6 +215,7 @@ /usr/share/Modules/init(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/share/printconf/util/print\.py -- gen_context(system_u:object_r:bin_t,s0) /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0) @@ -4926,7 +4925,7 @@ diff -b -B --ignore-all-space --exclude- /usr/share/turboprint/lib(/.*)? -- gen_context(system_u:object_r:bin_t,s0) /usr/X11R6/lib(64)?/X11/xkb/xkbcomp -- gen_context(system_u:object_r:bin_t,s0) -@@ -299,3 +306,20 @@ +@@ -299,3 +305,20 @@ ifdef(`distro_suse',` /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) ') @@ -8952,7 +8951,7 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.12/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/apache.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/apache.te 2009-05-06 08:47:58.000000000 -0400 @@ -19,6 +19,8 @@ # Declarations # @@ -9331,20 +9330,23 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -493,6 +614,12 @@ - openca_kill(httpd_t) +@@ -494,12 +615,23 @@ ') + optional_policy(` ++ rpc_search_nfs_state_data(httpd_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(` ++optional_policy(` # Allow httpd to work with postgresql postgresql_stream_connect(httpd_t) -@@ -500,6 +627,7 @@ + postgresql_unpriv_client(httpd_t) tunable_policy(`httpd_can_network_connect_db',` postgresql_tcp_connect(httpd_t) @@ -9352,7 +9354,7 @@ diff -b -B --ignore-all-space --exclude- ') ') -@@ -508,6 +636,7 @@ +@@ -508,6 +640,7 @@ ') optional_policy(` @@ -9360,7 +9362,7 @@ diff -b -B --ignore-all-space --exclude- snmp_dontaudit_read_snmp_var_lib_files(httpd_t) snmp_dontaudit_write_snmp_var_lib_files(httpd_t) ') -@@ -535,6 +664,22 @@ +@@ -535,6 +668,22 @@ userdom_use_user_terminals(httpd_helper_t) @@ -9383,7 +9385,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # Apache PHP script local policy -@@ -564,20 +709,25 @@ +@@ -564,20 +713,25 @@ fs_search_auto_mountpoints(httpd_php_t) @@ -9415,7 +9417,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -595,23 +745,24 @@ +@@ -595,23 +749,24 @@ append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t) read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t) @@ -9444,7 +9446,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(httpd_suexec_t) files_read_usr_files(httpd_suexec_t) -@@ -624,6 +775,7 @@ +@@ -624,6 +779,7 @@ logging_send_syslog_msg(httpd_suexec_t) miscfiles_read_localization(httpd_suexec_t) @@ -9452,7 +9454,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`httpd_can_network_connect',` allow httpd_suexec_t self:tcp_socket create_stream_socket_perms; -@@ -641,12 +793,20 @@ +@@ -641,12 +797,20 @@ corenet_sendrecv_all_client_packets(httpd_suexec_t) ') @@ -9476,7 +9478,7 @@ diff -b -B --ignore-all-space --exclude- ') tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` -@@ -672,15 +832,14 @@ +@@ -672,15 +836,14 @@ dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write }; ') @@ -9495,7 +9497,7 @@ diff -b -B --ignore-all-space --exclude- allow httpd_sys_script_t httpd_t:tcp_socket { read write }; dontaudit httpd_sys_script_t httpd_config_t:dir search; -@@ -699,12 +858,24 @@ +@@ -699,12 +862,24 @@ # Should we add a boolean? apache_domtrans_rotatelogs(httpd_sys_script_t) @@ -9522,7 +9524,7 @@ diff -b -B --ignore-all-space --exclude- ') tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` -@@ -712,6 +883,35 @@ +@@ -712,6 +887,35 @@ fs_read_nfs_symlinks(httpd_sys_script_t) ') @@ -9558,7 +9560,7 @@ diff -b -B --ignore-all-space --exclude- 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) -@@ -724,6 +924,10 @@ +@@ -724,6 +928,10 @@ optional_policy(` mysql_stream_connect(httpd_sys_script_t) mysql_rw_db_sockets(httpd_sys_script_t) @@ -9569,7 +9571,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -735,6 +939,8 @@ +@@ -735,6 +943,8 @@ # httpd_rotatelogs local policy # @@ -9578,7 +9580,7 @@ diff -b -B --ignore-all-space --exclude- manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t) kernel_read_kernel_sysctls(httpd_rotatelogs_t) -@@ -754,6 +960,12 @@ +@@ -754,6 +964,12 @@ tunable_policy(`httpd_enable_cgi && httpd_unified',` allow httpd_user_script_t httpdcontent:file entrypoint; @@ -9591,7 +9593,7 @@ diff -b -B --ignore-all-space --exclude- ') # allow accessing files/dirs below the users home dir -@@ -762,3 +974,66 @@ +@@ -762,3 +978,67 @@ userdom_search_user_home_dirs(httpd_suexec_t) userdom_search_user_home_dirs(httpd_user_script_t) ') @@ -9658,6 +9660,7 @@ diff -b -B --ignore-all-space --exclude- +typealias httpd_sys_script_rw_t alias httpd_fastcgi_script_rw_t; +typealias httpd_sys_script_t alias httpd_fastcgi_script_t; +typealias httpd_var_run_t alias httpd_fastcgi_var_run_t; ++ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.6.12/policy/modules/services/audioentropy.te --- nsaserefpolicy/policy/modules/services/audioentropy.te 2009-01-05 15:39:43.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/services/audioentropy.te 2009-04-23 09:44:57.000000000 -0400 @@ -9685,7 +9688,7 @@ diff -b -B --ignore-all-space --exclude- diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.12/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/automount.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/automount.te 2009-05-06 08:47:22.000000000 -0400 @@ -71,6 +71,7 @@ files_mounton_all_mountpoints(automount_t) files_mount_all_file_type_fs(automount_t) @@ -25238,7 +25241,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.12/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/xserver.te 2009-04-27 08:35:28.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/xserver.te 2009-05-06 08:50:01.000000000 -0400 @@ -34,6 +34,13 @@ ## @@ -25427,7 +25430,7 @@ diff -b -B --ignore-all-space --exclude- allow xdm_t self:tcp_socket create_stream_socket_perms; allow xdm_t self:udp_socket create_socket_perms; allow xdm_t self:socket create_socket_perms; -@@ -314,6 +340,11 @@ +@@ -314,6 +340,13 @@ allow xdm_t self:key { search link write }; allow xdm_t xconsole_device_t:fifo_file { getattr setattr }; @@ -25436,10 +25439,12 @@ diff -b -B --ignore-all-space --exclude- + +manage_files_pattern(xdm_t, xdm_home_t, xdm_home_t) +userdom_user_home_dir_filetrans(xdm_t, xdm_home_t, file) ++#Handle mislabeled files in homedir ++userdom_delete_user_home_content_files(xdm_t) # Allow gdm to run gdm-binary can_exec(xdm_t, xdm_exec_t) -@@ -329,22 +360,38 @@ +@@ -329,22 +362,38 @@ manage_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t) manage_sock_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t) files_tmp_filetrans(xdm_t, xdm_tmp_t, { file dir sock_file }) @@ -25481,7 +25486,7 @@ diff -b -B --ignore-all-space --exclude- allow xdm_t xserver_t:process signal; allow xdm_t xserver_t:unix_stream_socket connectto; -@@ -358,6 +405,7 @@ +@@ -358,6 +407,7 @@ allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill }; allow xdm_t xserver_t:shm rw_shm_perms; @@ -25489,7 +25494,7 @@ diff -b -B --ignore-all-space --exclude- # connect to xdm xserver over stream socket stream_connect_pattern(xdm_t,xserver_tmp_t,xserver_tmp_t,xserver_t) -@@ -366,10 +414,14 @@ +@@ -366,10 +416,14 @@ delete_files_pattern(xdm_t,xserver_tmp_t,xserver_tmp_t) delete_sock_files_pattern(xdm_t,xserver_tmp_t,xserver_tmp_t) @@ -25505,7 +25510,7 @@ diff -b -B --ignore-all-space --exclude- kernel_read_system_state(xdm_t) kernel_read_kernel_sysctls(xdm_t) -@@ -389,11 +441,13 @@ +@@ -389,11 +443,13 @@ corenet_udp_sendrecv_all_ports(xdm_t) corenet_tcp_bind_generic_node(xdm_t) corenet_udp_bind_generic_node(xdm_t) @@ -25519,7 +25524,7 @@ diff -b -B --ignore-all-space --exclude- dev_read_rand(xdm_t) dev_read_sysfs(xdm_t) dev_getattr_framebuffer_dev(xdm_t) -@@ -401,6 +455,7 @@ +@@ -401,6 +457,7 @@ dev_getattr_mouse_dev(xdm_t) dev_setattr_mouse_dev(xdm_t) dev_rw_apm_bios(xdm_t) @@ -25527,7 +25532,7 @@ diff -b -B --ignore-all-space --exclude- dev_setattr_apm_bios_dev(xdm_t) dev_rw_dri(xdm_t) dev_rw_agp(xdm_t) -@@ -413,14 +468,17 @@ +@@ -413,14 +470,17 @@ dev_setattr_video_dev(xdm_t) dev_getattr_scanner_dev(xdm_t) dev_setattr_scanner_dev(xdm_t) @@ -25547,7 +25552,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(xdm_t) files_read_var_files(xdm_t) -@@ -431,9 +489,13 @@ +@@ -431,9 +491,13 @@ files_read_usr_files(xdm_t) # Poweroff wants to create the /poweroff file when run from xdm files_create_boot_flag(xdm_t) @@ -25561,7 +25566,7 @@ diff -b -B --ignore-all-space --exclude- storage_dontaudit_read_fixed_disk(xdm_t) storage_dontaudit_write_fixed_disk(xdm_t) -@@ -442,6 +504,7 @@ +@@ -442,6 +506,7 @@ storage_dontaudit_raw_write_removable_device(xdm_t) storage_dontaudit_setattr_removable_dev(xdm_t) storage_dontaudit_rw_scsi_generic(xdm_t) @@ -25569,7 +25574,7 @@ diff -b -B --ignore-all-space --exclude- term_setattr_console(xdm_t) term_use_unallocated_ttys(xdm_t) -@@ -450,6 +513,7 @@ +@@ -450,6 +515,7 @@ auth_domtrans_pam_console(xdm_t) auth_manage_pam_pid(xdm_t) auth_manage_pam_console_data(xdm_t) @@ -25577,7 +25582,7 @@ diff -b -B --ignore-all-space --exclude- auth_rw_faillog(xdm_t) auth_write_login_records(xdm_t) -@@ -460,10 +524,10 @@ +@@ -460,10 +526,10 @@ logging_read_generic_logs(xdm_t) @@ -25590,7 +25595,7 @@ diff -b -B --ignore-all-space --exclude- userdom_dontaudit_use_unpriv_user_fds(xdm_t) userdom_create_all_users_keys(xdm_t) -@@ -472,6 +536,8 @@ +@@ -472,6 +538,8 @@ # Search /proc for any user domain processes. userdom_read_all_users_state(xdm_t) userdom_signal_all_users(xdm_t) @@ -25599,7 +25604,7 @@ diff -b -B --ignore-all-space --exclude- xserver_rw_session(xdm_t,xdm_tmpfs_t) xserver_unconfined(xdm_t) -@@ -504,10 +570,12 @@ +@@ -504,10 +572,12 @@ optional_policy(` alsa_domtrans(xdm_t) @@ -25612,7 +25617,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -515,12 +583,45 @@ +@@ -515,12 +585,45 @@ ') optional_policy(` @@ -25658,7 +25663,7 @@ diff -b -B --ignore-all-space --exclude- hostname_exec(xdm_t) ') -@@ -542,6 +643,23 @@ +@@ -542,6 +645,23 @@ ') optional_policy(` @@ -25682,7 +25687,7 @@ diff -b -B --ignore-all-space --exclude- seutil_sigchld_newrole(xdm_t) ') -@@ -550,8 +668,9 @@ +@@ -550,8 +670,9 @@ ') optional_policy(` @@ -25694,7 +25699,7 @@ diff -b -B --ignore-all-space --exclude- ifndef(`distro_redhat',` allow xdm_t self:process { execheap execmem }; -@@ -560,7 +679,6 @@ +@@ -560,7 +681,6 @@ ifdef(`distro_rhel4',` allow xdm_t self:process { execheap execmem }; ') @@ -25702,7 +25707,7 @@ diff -b -B --ignore-all-space --exclude- optional_policy(` userhelper_dontaudit_search_config(xdm_t) -@@ -571,6 +689,10 @@ +@@ -571,6 +691,10 @@ ') optional_policy(` @@ -25713,7 +25718,7 @@ diff -b -B --ignore-all-space --exclude- xfs_stream_connect(xdm_t) ') -@@ -587,7 +709,7 @@ +@@ -587,7 +711,7 @@ # execheap needed until the X module loader is fixed. # NVIDIA Needs execstack @@ -25722,7 +25727,7 @@ diff -b -B --ignore-all-space --exclude- dontaudit xserver_t self:capability chown; allow xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow xserver_t self:memprotect mmap_zero; -@@ -602,9 +724,11 @@ +@@ -602,9 +726,11 @@ allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto }; allow xserver_t self:tcp_socket create_stream_socket_perms; allow xserver_t self:udp_socket create_socket_perms; @@ -25734,7 +25739,7 @@ diff -b -B --ignore-all-space --exclude- allow xserver_t { input_xevent_t input_xevent_type }:x_event send; -@@ -616,13 +740,14 @@ +@@ -616,13 +742,14 @@ type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t; allow xserver_t { rootwindow_t x_domain }:x_drawable send; @@ -25750,7 +25755,7 @@ diff -b -B --ignore-all-space --exclude- manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t) manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t) -@@ -635,9 +760,19 @@ +@@ -635,9 +762,19 @@ manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t) files_search_var_lib(xserver_t) @@ -25770,7 +25775,7 @@ diff -b -B --ignore-all-space --exclude- kernel_read_system_state(xserver_t) kernel_read_device_sysctls(xserver_t) -@@ -680,9 +815,14 @@ +@@ -680,9 +817,14 @@ dev_rw_xserver_misc(xserver_t) # read events - the synaptics touchpad driver reads raw events dev_rw_input_dev(xserver_t) @@ -25785,7 +25790,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(xserver_t) files_read_etc_runtime_files(xserver_t) -@@ -697,8 +837,13 @@ +@@ -697,8 +839,13 @@ fs_search_nfs(xserver_t) fs_search_auto_mountpoints(xserver_t) fs_search_ramfs(xserver_t) @@ -25799,7 +25804,7 @@ diff -b -B --ignore-all-space --exclude- selinux_validate_context(xserver_t) selinux_compute_access_vector(xserver_t) -@@ -720,6 +865,7 @@ +@@ -720,6 +867,7 @@ miscfiles_read_localization(xserver_t) miscfiles_read_fonts(xserver_t) @@ -25807,7 +25812,7 @@ diff -b -B --ignore-all-space --exclude- modutils_domtrans_insmod(xserver_t) -@@ -742,7 +888,7 @@ +@@ -742,7 +890,7 @@ ') ifdef(`enable_mls',` @@ -25816,7 +25821,7 @@ diff -b -B --ignore-all-space --exclude- range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh; ') -@@ -774,12 +920,16 @@ +@@ -774,12 +922,16 @@ ') optional_policy(` @@ -25834,7 +25839,7 @@ diff -b -B --ignore-all-space --exclude- unconfined_domtrans(xserver_t) ') -@@ -806,7 +956,7 @@ +@@ -806,7 +958,7 @@ allow xserver_t xdm_var_lib_t:file { getattr read }; dontaudit xserver_t xdm_var_lib_t:dir search; @@ -25843,7 +25848,7 @@ diff -b -B --ignore-all-space --exclude- # Label pid and temporary files with derived types. manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t) -@@ -827,9 +977,14 @@ +@@ -827,9 +979,14 @@ # to read ROLE_home_t - examine this in more detail # (xauth?) userdom_read_user_home_content_files(xserver_t) @@ -25858,7 +25863,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs(xserver_t) fs_manage_nfs_files(xserver_t) -@@ -844,11 +999,14 @@ +@@ -844,11 +1001,14 @@ optional_policy(` dbus_system_bus_client(xserver_t) @@ -25874,7 +25879,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -856,6 +1014,11 @@ +@@ -856,6 +1016,11 @@ rhgb_rw_tmpfs_files(xserver_t) ') @@ -25886,7 +25891,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # Rules common to all X window domains -@@ -881,6 +1044,8 @@ +@@ -881,6 +1046,8 @@ # X Server # can read server-owned resources allow x_domain xserver_t:x_resource read; @@ -25895,7 +25900,7 @@ diff -b -B --ignore-all-space --exclude- # can mess with own clients allow x_domain self:x_client { manage destroy }; -@@ -905,6 +1070,8 @@ +@@ -905,6 +1072,8 @@ # operations allowed on my windows allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive }; @@ -25904,7 +25909,7 @@ diff -b -B --ignore-all-space --exclude- # X Colormaps # can use the default colormap allow x_domain rootwindow_t:x_colormap { read use add_color }; -@@ -972,17 +1139,49 @@ +@@ -972,17 +1141,49 @@ allow xserver_unconfined_type { x_domain xserver_t }:x_resource *; allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *; @@ -28200,16 +28205,19 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.12/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/mount.te 2009-04-23 09:44:57.000000000 -0400 -@@ -18,17 +18,21 @@ ++++ serefpolicy-3.6.12/policy/modules/system/mount.te 2009-05-06 07:59:38.000000000 -0400 +@@ -18,17 +18,22 @@ init_system_domain(mount_t,mount_exec_t) role system_r types mount_t; +-type mount_loopback_t; # customizable +-files_type(mount_loopback_t) +typealias mount_t alias mount_ntfs_t; +typealias mount_exec_t alias mount_ntfs_exec_t; + - type mount_loopback_t; # customizable - files_type(mount_loopback_t) ++type mount_loop_t; # customizable ++files_type(mount_loop_t) ++typealias mount_loop_t alias mount_loopback_t; type mount_tmp_t; files_tmp_file(mount_tmp_t) @@ -28226,7 +28234,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # -@@ -36,7 +40,8 @@ +@@ -36,9 +41,10 @@ # # setuid/setgid needed to mount cifs @@ -28234,9 +28242,12 @@ diff -b -B --ignore-all-space --exclude- +allow mount_t self:capability { fsetid ipc_lock sys_rawio sys_resource sys_admin dac_override chown sys_tty_config setuid setgid }; +allow mount_t self:process { ptrace signal }; - allow mount_t mount_loopback_t:file read_file_perms; +-allow mount_t mount_loopback_t:file read_file_perms; ++allow mount_t mount_loop_t:file read_file_perms; -@@ -47,12 +52,25 @@ + allow mount_t mount_tmp_t:file manage_file_perms; + allow mount_t mount_tmp_t:dir manage_dir_perms; +@@ -47,12 +53,25 @@ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir }) @@ -28262,7 +28273,7 @@ diff -b -B --ignore-all-space --exclude- dev_rw_lvm_control(mount_t) dev_dontaudit_getattr_all_chr_files(mount_t) dev_dontaudit_getattr_memory_dev(mount_t) -@@ -62,16 +80,19 @@ +@@ -62,16 +81,19 @@ storage_raw_write_fixed_disk(mount_t) storage_raw_read_removable_device(mount_t) storage_raw_write_removable_device(mount_t) @@ -28285,7 +28296,7 @@ diff -b -B --ignore-all-space --exclude- term_use_all_terms(mount_t) -@@ -79,6 +100,7 @@ +@@ -79,6 +101,7 @@ corecmd_exec_bin(mount_t) domain_use_interactive_fds(mount_t) @@ -28293,7 +28304,7 @@ diff -b -B --ignore-all-space --exclude- files_search_all(mount_t) files_read_etc_files(mount_t) -@@ -87,7 +109,7 @@ +@@ -87,7 +110,7 @@ files_mounton_all_mountpoints(mount_t) files_unmount_rootfs(mount_t) # These rules need to be generalized. Only admin, initrc should have it: @@ -28302,7 +28313,7 @@ diff -b -B --ignore-all-space --exclude- files_mount_all_file_type_fs(mount_t) files_unmount_all_file_type_fs(mount_t) # for when /etc/mtab loses its type -@@ -100,6 +122,8 @@ +@@ -100,6 +123,8 @@ init_use_fds(mount_t) init_use_script_ptys(mount_t) init_dontaudit_getattr_initctl(mount_t) @@ -28311,7 +28322,7 @@ diff -b -B --ignore-all-space --exclude- auth_use_nsswitch(mount_t) -@@ -116,6 +140,7 @@ +@@ -116,6 +141,7 @@ seutil_read_config(mount_t) userdom_use_all_users_fds(mount_t) @@ -28319,7 +28330,7 @@ diff -b -B --ignore-all-space --exclude- ifdef(`distro_redhat',` optional_policy(` -@@ -133,7 +158,7 @@ +@@ -133,7 +159,7 @@ tunable_policy(`allow_mount_anyfile',` auth_read_all_dirs_except_shadow(mount_t) @@ -28328,7 +28339,7 @@ diff -b -B --ignore-all-space --exclude- files_mounton_non_security(mount_t) ') -@@ -141,16 +166,16 @@ +@@ -141,16 +167,16 @@ # for nfs corenet_all_recvfrom_unlabeled(mount_t) corenet_all_recvfrom_netlabel(mount_t) @@ -28353,7 +28364,7 @@ diff -b -B --ignore-all-space --exclude- corenet_tcp_bind_generic_port(mount_t) corenet_udp_bind_generic_port(mount_t) corenet_tcp_bind_reserved_port(mount_t) -@@ -164,6 +189,8 @@ +@@ -164,6 +190,8 @@ fs_search_rpc(mount_t) rpc_stub(mount_t) @@ -28362,7 +28373,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -171,6 +198,15 @@ +@@ -171,6 +199,15 @@ ') optional_policy(` @@ -28378,7 +28389,7 @@ diff -b -B --ignore-all-space --exclude- ifdef(`hide_broken_symptoms',` # for a bug in the X server rhgb_dontaudit_rw_stream_sockets(mount_t) -@@ -178,6 +214,11 @@ +@@ -178,6 +215,11 @@ ') ') @@ -28390,7 +28401,7 @@ diff -b -B --ignore-all-space --exclude- # for kernel package installation optional_policy(` rpm_rw_pipes(mount_t) -@@ -185,14 +226,24 @@ +@@ -185,14 +227,24 @@ optional_policy(` samba_domtrans_smbmount(mount_t) @@ -30468,7 +30479,7 @@ diff -b -B --ignore-all-space --exclude- +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if 2009-04-28 16:06:27.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if 2009-05-06 08:49:37.000000000 -0400 @@ -30,8 +30,9 @@ ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v retrieving revision 1.852 retrieving revision 1.853 diff -u -p -r1.852 -r1.853 --- selinux-policy.spec 5 May 2009 20:48:33 -0000 1.852 +++ selinux-policy.spec 6 May 2009 12:51:52 -0000 1.853 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.12 -Release: 29%{?dist} +Release: 30%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -477,6 +477,9 @@ exit 0 %endif %changelog +* Tue May 5 2009 Dan Walsh 3.6.12-30 +-Remove duplicate line + * Tue May 5 2009 Dan Walsh 3.6.12-29 - Allow svirt to manage pci and other sysfs device data From dwalsh at fedoraproject.org Wed May 6 12:51:59 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Wed, 6 May 2009 12:51:59 +0000 (UTC) Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.109, 1.110 selinux-policy.spec, 1.847, 1.848 Message-ID: <20090506125159.AEF7170108@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10946 Modified Files: policy-20090105.patch selinux-policy.spec Log Message: * Tue May 5 2009 Dan Walsh 3.6.12-30 -Remove duplicate line policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.109 retrieving revision 1.110 diff -u -p -r1.109 -r1.110 --- policy-20090105.patch 5 May 2009 20:48:39 -0000 1.109 +++ policy-20090105.patch 6 May 2009 12:51:58 -0000 1.110 @@ -4897,7 +4897,7 @@ diff -b -B --ignore-all-space --exclude- +corecmd_executable_file(wm_exec_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2009-03-05 10:34:00.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc 2009-05-05 14:05:47.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc 2009-05-05 18:05:12.000000000 -0400 @@ -32,6 +32,8 @@ # # /etc @@ -4907,18 +4907,17 @@ diff -b -B --ignore-all-space --exclude- /etc/apcupsd/apccontrol -- gen_context(system_u:object_r:bin_t,s0) /etc/apcupsd/changeme -- gen_context(system_u:object_r:bin_t,s0) /etc/apcupsd/commfailure -- gen_context(system_u:object_r:bin_t,s0) -@@ -134,6 +136,10 @@ +@@ -134,6 +136,9 @@ /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0) ') +/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) +/opt/OpenPrinting-Gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) -+/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0) + # # /usr # -@@ -210,6 +216,7 @@ +@@ -210,6 +215,7 @@ /usr/share/Modules/init(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/share/printconf/util/print\.py -- gen_context(system_u:object_r:bin_t,s0) /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0) @@ -4926,7 +4925,7 @@ diff -b -B --ignore-all-space --exclude- /usr/share/turboprint/lib(/.*)? -- gen_context(system_u:object_r:bin_t,s0) /usr/X11R6/lib(64)?/X11/xkb/xkbcomp -- gen_context(system_u:object_r:bin_t,s0) -@@ -299,3 +306,20 @@ +@@ -299,3 +305,20 @@ ifdef(`distro_suse',` /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) ') @@ -8952,7 +8951,7 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.12/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/apache.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/apache.te 2009-05-06 08:47:58.000000000 -0400 @@ -19,6 +19,8 @@ # Declarations # @@ -9331,20 +9330,23 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -493,6 +614,12 @@ - openca_kill(httpd_t) +@@ -494,12 +615,23 @@ ') + optional_policy(` ++ rpc_search_nfs_state_data(httpd_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(` ++optional_policy(` # Allow httpd to work with postgresql postgresql_stream_connect(httpd_t) -@@ -500,6 +627,7 @@ + postgresql_unpriv_client(httpd_t) tunable_policy(`httpd_can_network_connect_db',` postgresql_tcp_connect(httpd_t) @@ -9352,7 +9354,7 @@ diff -b -B --ignore-all-space --exclude- ') ') -@@ -508,6 +636,7 @@ +@@ -508,6 +640,7 @@ ') optional_policy(` @@ -9360,7 +9362,7 @@ diff -b -B --ignore-all-space --exclude- snmp_dontaudit_read_snmp_var_lib_files(httpd_t) snmp_dontaudit_write_snmp_var_lib_files(httpd_t) ') -@@ -535,6 +664,22 @@ +@@ -535,6 +668,22 @@ userdom_use_user_terminals(httpd_helper_t) @@ -9383,7 +9385,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # Apache PHP script local policy -@@ -564,20 +709,25 @@ +@@ -564,20 +713,25 @@ fs_search_auto_mountpoints(httpd_php_t) @@ -9415,7 +9417,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -595,23 +745,24 @@ +@@ -595,23 +749,24 @@ append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t) read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t) @@ -9444,7 +9446,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(httpd_suexec_t) files_read_usr_files(httpd_suexec_t) -@@ -624,6 +775,7 @@ +@@ -624,6 +779,7 @@ logging_send_syslog_msg(httpd_suexec_t) miscfiles_read_localization(httpd_suexec_t) @@ -9452,7 +9454,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`httpd_can_network_connect',` allow httpd_suexec_t self:tcp_socket create_stream_socket_perms; -@@ -641,12 +793,20 @@ +@@ -641,12 +797,20 @@ corenet_sendrecv_all_client_packets(httpd_suexec_t) ') @@ -9476,7 +9478,7 @@ diff -b -B --ignore-all-space --exclude- ') tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` -@@ -672,15 +832,14 @@ +@@ -672,15 +836,14 @@ dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write }; ') @@ -9495,7 +9497,7 @@ diff -b -B --ignore-all-space --exclude- allow httpd_sys_script_t httpd_t:tcp_socket { read write }; dontaudit httpd_sys_script_t httpd_config_t:dir search; -@@ -699,12 +858,24 @@ +@@ -699,12 +862,24 @@ # Should we add a boolean? apache_domtrans_rotatelogs(httpd_sys_script_t) @@ -9522,7 +9524,7 @@ diff -b -B --ignore-all-space --exclude- ') tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` -@@ -712,6 +883,35 @@ +@@ -712,6 +887,35 @@ fs_read_nfs_symlinks(httpd_sys_script_t) ') @@ -9558,7 +9560,7 @@ diff -b -B --ignore-all-space --exclude- 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) -@@ -724,6 +924,10 @@ +@@ -724,6 +928,10 @@ optional_policy(` mysql_stream_connect(httpd_sys_script_t) mysql_rw_db_sockets(httpd_sys_script_t) @@ -9569,7 +9571,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -735,6 +939,8 @@ +@@ -735,6 +943,8 @@ # httpd_rotatelogs local policy # @@ -9578,7 +9580,7 @@ diff -b -B --ignore-all-space --exclude- manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t) kernel_read_kernel_sysctls(httpd_rotatelogs_t) -@@ -754,6 +960,12 @@ +@@ -754,6 +964,12 @@ tunable_policy(`httpd_enable_cgi && httpd_unified',` allow httpd_user_script_t httpdcontent:file entrypoint; @@ -9591,7 +9593,7 @@ diff -b -B --ignore-all-space --exclude- ') # allow accessing files/dirs below the users home dir -@@ -762,3 +974,66 @@ +@@ -762,3 +978,67 @@ userdom_search_user_home_dirs(httpd_suexec_t) userdom_search_user_home_dirs(httpd_user_script_t) ') @@ -9658,6 +9660,7 @@ diff -b -B --ignore-all-space --exclude- +typealias httpd_sys_script_rw_t alias httpd_fastcgi_script_rw_t; +typealias httpd_sys_script_t alias httpd_fastcgi_script_t; +typealias httpd_var_run_t alias httpd_fastcgi_var_run_t; ++ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.6.12/policy/modules/services/audioentropy.te --- nsaserefpolicy/policy/modules/services/audioentropy.te 2009-01-05 15:39:43.000000000 -0500 +++ serefpolicy-3.6.12/policy/modules/services/audioentropy.te 2009-04-23 09:44:57.000000000 -0400 @@ -9685,7 +9688,7 @@ diff -b -B --ignore-all-space --exclude- diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.12/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/automount.te 2009-04-23 09:44:57.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/automount.te 2009-05-06 08:47:22.000000000 -0400 @@ -71,6 +71,7 @@ files_mounton_all_mountpoints(automount_t) files_mount_all_file_type_fs(automount_t) @@ -25238,7 +25241,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.12/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/services/xserver.te 2009-04-27 08:35:28.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/services/xserver.te 2009-05-06 08:50:01.000000000 -0400 @@ -34,6 +34,13 @@ ## @@ -25427,7 +25430,7 @@ diff -b -B --ignore-all-space --exclude- allow xdm_t self:tcp_socket create_stream_socket_perms; allow xdm_t self:udp_socket create_socket_perms; allow xdm_t self:socket create_socket_perms; -@@ -314,6 +340,11 @@ +@@ -314,6 +340,13 @@ allow xdm_t self:key { search link write }; allow xdm_t xconsole_device_t:fifo_file { getattr setattr }; @@ -25436,10 +25439,12 @@ diff -b -B --ignore-all-space --exclude- + +manage_files_pattern(xdm_t, xdm_home_t, xdm_home_t) +userdom_user_home_dir_filetrans(xdm_t, xdm_home_t, file) ++#Handle mislabeled files in homedir ++userdom_delete_user_home_content_files(xdm_t) # Allow gdm to run gdm-binary can_exec(xdm_t, xdm_exec_t) -@@ -329,22 +360,38 @@ +@@ -329,22 +362,38 @@ manage_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t) manage_sock_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t) files_tmp_filetrans(xdm_t, xdm_tmp_t, { file dir sock_file }) @@ -25481,7 +25486,7 @@ diff -b -B --ignore-all-space --exclude- allow xdm_t xserver_t:process signal; allow xdm_t xserver_t:unix_stream_socket connectto; -@@ -358,6 +405,7 @@ +@@ -358,6 +407,7 @@ allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill }; allow xdm_t xserver_t:shm rw_shm_perms; @@ -25489,7 +25494,7 @@ diff -b -B --ignore-all-space --exclude- # connect to xdm xserver over stream socket stream_connect_pattern(xdm_t,xserver_tmp_t,xserver_tmp_t,xserver_t) -@@ -366,10 +414,14 @@ +@@ -366,10 +416,14 @@ delete_files_pattern(xdm_t,xserver_tmp_t,xserver_tmp_t) delete_sock_files_pattern(xdm_t,xserver_tmp_t,xserver_tmp_t) @@ -25505,7 +25510,7 @@ diff -b -B --ignore-all-space --exclude- kernel_read_system_state(xdm_t) kernel_read_kernel_sysctls(xdm_t) -@@ -389,11 +441,13 @@ +@@ -389,11 +443,13 @@ corenet_udp_sendrecv_all_ports(xdm_t) corenet_tcp_bind_generic_node(xdm_t) corenet_udp_bind_generic_node(xdm_t) @@ -25519,7 +25524,7 @@ diff -b -B --ignore-all-space --exclude- dev_read_rand(xdm_t) dev_read_sysfs(xdm_t) dev_getattr_framebuffer_dev(xdm_t) -@@ -401,6 +455,7 @@ +@@ -401,6 +457,7 @@ dev_getattr_mouse_dev(xdm_t) dev_setattr_mouse_dev(xdm_t) dev_rw_apm_bios(xdm_t) @@ -25527,7 +25532,7 @@ diff -b -B --ignore-all-space --exclude- dev_setattr_apm_bios_dev(xdm_t) dev_rw_dri(xdm_t) dev_rw_agp(xdm_t) -@@ -413,14 +468,17 @@ +@@ -413,14 +470,17 @@ dev_setattr_video_dev(xdm_t) dev_getattr_scanner_dev(xdm_t) dev_setattr_scanner_dev(xdm_t) @@ -25547,7 +25552,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(xdm_t) files_read_var_files(xdm_t) -@@ -431,9 +489,13 @@ +@@ -431,9 +491,13 @@ files_read_usr_files(xdm_t) # Poweroff wants to create the /poweroff file when run from xdm files_create_boot_flag(xdm_t) @@ -25561,7 +25566,7 @@ diff -b -B --ignore-all-space --exclude- storage_dontaudit_read_fixed_disk(xdm_t) storage_dontaudit_write_fixed_disk(xdm_t) -@@ -442,6 +504,7 @@ +@@ -442,6 +506,7 @@ storage_dontaudit_raw_write_removable_device(xdm_t) storage_dontaudit_setattr_removable_dev(xdm_t) storage_dontaudit_rw_scsi_generic(xdm_t) @@ -25569,7 +25574,7 @@ diff -b -B --ignore-all-space --exclude- term_setattr_console(xdm_t) term_use_unallocated_ttys(xdm_t) -@@ -450,6 +513,7 @@ +@@ -450,6 +515,7 @@ auth_domtrans_pam_console(xdm_t) auth_manage_pam_pid(xdm_t) auth_manage_pam_console_data(xdm_t) @@ -25577,7 +25582,7 @@ diff -b -B --ignore-all-space --exclude- auth_rw_faillog(xdm_t) auth_write_login_records(xdm_t) -@@ -460,10 +524,10 @@ +@@ -460,10 +526,10 @@ logging_read_generic_logs(xdm_t) @@ -25590,7 +25595,7 @@ diff -b -B --ignore-all-space --exclude- userdom_dontaudit_use_unpriv_user_fds(xdm_t) userdom_create_all_users_keys(xdm_t) -@@ -472,6 +536,8 @@ +@@ -472,6 +538,8 @@ # Search /proc for any user domain processes. userdom_read_all_users_state(xdm_t) userdom_signal_all_users(xdm_t) @@ -25599,7 +25604,7 @@ diff -b -B --ignore-all-space --exclude- xserver_rw_session(xdm_t,xdm_tmpfs_t) xserver_unconfined(xdm_t) -@@ -504,10 +570,12 @@ +@@ -504,10 +572,12 @@ optional_policy(` alsa_domtrans(xdm_t) @@ -25612,7 +25617,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -515,12 +583,45 @@ +@@ -515,12 +585,45 @@ ') optional_policy(` @@ -25658,7 +25663,7 @@ diff -b -B --ignore-all-space --exclude- hostname_exec(xdm_t) ') -@@ -542,6 +643,23 @@ +@@ -542,6 +645,23 @@ ') optional_policy(` @@ -25682,7 +25687,7 @@ diff -b -B --ignore-all-space --exclude- seutil_sigchld_newrole(xdm_t) ') -@@ -550,8 +668,9 @@ +@@ -550,8 +670,9 @@ ') optional_policy(` @@ -25694,7 +25699,7 @@ diff -b -B --ignore-all-space --exclude- ifndef(`distro_redhat',` allow xdm_t self:process { execheap execmem }; -@@ -560,7 +679,6 @@ +@@ -560,7 +681,6 @@ ifdef(`distro_rhel4',` allow xdm_t self:process { execheap execmem }; ') @@ -25702,7 +25707,7 @@ diff -b -B --ignore-all-space --exclude- optional_policy(` userhelper_dontaudit_search_config(xdm_t) -@@ -571,6 +689,10 @@ +@@ -571,6 +691,10 @@ ') optional_policy(` @@ -25713,7 +25718,7 @@ diff -b -B --ignore-all-space --exclude- xfs_stream_connect(xdm_t) ') -@@ -587,7 +709,7 @@ +@@ -587,7 +711,7 @@ # execheap needed until the X module loader is fixed. # NVIDIA Needs execstack @@ -25722,7 +25727,7 @@ diff -b -B --ignore-all-space --exclude- dontaudit xserver_t self:capability chown; allow xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow xserver_t self:memprotect mmap_zero; -@@ -602,9 +724,11 @@ +@@ -602,9 +726,11 @@ allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto }; allow xserver_t self:tcp_socket create_stream_socket_perms; allow xserver_t self:udp_socket create_socket_perms; @@ -25734,7 +25739,7 @@ diff -b -B --ignore-all-space --exclude- allow xserver_t { input_xevent_t input_xevent_type }:x_event send; -@@ -616,13 +740,14 @@ +@@ -616,13 +742,14 @@ type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t; allow xserver_t { rootwindow_t x_domain }:x_drawable send; @@ -25750,7 +25755,7 @@ diff -b -B --ignore-all-space --exclude- manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t) manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t) -@@ -635,9 +760,19 @@ +@@ -635,9 +762,19 @@ manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t) files_search_var_lib(xserver_t) @@ -25770,7 +25775,7 @@ diff -b -B --ignore-all-space --exclude- kernel_read_system_state(xserver_t) kernel_read_device_sysctls(xserver_t) -@@ -680,9 +815,14 @@ +@@ -680,9 +817,14 @@ dev_rw_xserver_misc(xserver_t) # read events - the synaptics touchpad driver reads raw events dev_rw_input_dev(xserver_t) @@ -25785,7 +25790,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(xserver_t) files_read_etc_runtime_files(xserver_t) -@@ -697,8 +837,13 @@ +@@ -697,8 +839,13 @@ fs_search_nfs(xserver_t) fs_search_auto_mountpoints(xserver_t) fs_search_ramfs(xserver_t) @@ -25799,7 +25804,7 @@ diff -b -B --ignore-all-space --exclude- selinux_validate_context(xserver_t) selinux_compute_access_vector(xserver_t) -@@ -720,6 +865,7 @@ +@@ -720,6 +867,7 @@ miscfiles_read_localization(xserver_t) miscfiles_read_fonts(xserver_t) @@ -25807,7 +25812,7 @@ diff -b -B --ignore-all-space --exclude- modutils_domtrans_insmod(xserver_t) -@@ -742,7 +888,7 @@ +@@ -742,7 +890,7 @@ ') ifdef(`enable_mls',` @@ -25816,7 +25821,7 @@ diff -b -B --ignore-all-space --exclude- range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh; ') -@@ -774,12 +920,16 @@ +@@ -774,12 +922,16 @@ ') optional_policy(` @@ -25834,7 +25839,7 @@ diff -b -B --ignore-all-space --exclude- unconfined_domtrans(xserver_t) ') -@@ -806,7 +956,7 @@ +@@ -806,7 +958,7 @@ allow xserver_t xdm_var_lib_t:file { getattr read }; dontaudit xserver_t xdm_var_lib_t:dir search; @@ -25843,7 +25848,7 @@ diff -b -B --ignore-all-space --exclude- # Label pid and temporary files with derived types. manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t) -@@ -827,9 +977,14 @@ +@@ -827,9 +979,14 @@ # to read ROLE_home_t - examine this in more detail # (xauth?) userdom_read_user_home_content_files(xserver_t) @@ -25858,7 +25863,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs(xserver_t) fs_manage_nfs_files(xserver_t) -@@ -844,11 +999,14 @@ +@@ -844,11 +1001,14 @@ optional_policy(` dbus_system_bus_client(xserver_t) @@ -25874,7 +25879,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -856,6 +1014,11 @@ +@@ -856,6 +1016,11 @@ rhgb_rw_tmpfs_files(xserver_t) ') @@ -25886,7 +25891,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # Rules common to all X window domains -@@ -881,6 +1044,8 @@ +@@ -881,6 +1046,8 @@ # X Server # can read server-owned resources allow x_domain xserver_t:x_resource read; @@ -25895,7 +25900,7 @@ diff -b -B --ignore-all-space --exclude- # can mess with own clients allow x_domain self:x_client { manage destroy }; -@@ -905,6 +1070,8 @@ +@@ -905,6 +1072,8 @@ # operations allowed on my windows allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive }; @@ -25904,7 +25909,7 @@ diff -b -B --ignore-all-space --exclude- # X Colormaps # can use the default colormap allow x_domain rootwindow_t:x_colormap { read use add_color }; -@@ -972,17 +1139,49 @@ +@@ -972,17 +1141,49 @@ allow xserver_unconfined_type { x_domain xserver_t }:x_resource *; allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *; @@ -28200,16 +28205,19 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.12/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/mount.te 2009-04-23 09:44:57.000000000 -0400 -@@ -18,17 +18,21 @@ ++++ serefpolicy-3.6.12/policy/modules/system/mount.te 2009-05-06 07:59:38.000000000 -0400 +@@ -18,17 +18,22 @@ init_system_domain(mount_t,mount_exec_t) role system_r types mount_t; +-type mount_loopback_t; # customizable +-files_type(mount_loopback_t) +typealias mount_t alias mount_ntfs_t; +typealias mount_exec_t alias mount_ntfs_exec_t; + - type mount_loopback_t; # customizable - files_type(mount_loopback_t) ++type mount_loop_t; # customizable ++files_type(mount_loop_t) ++typealias mount_loop_t alias mount_loopback_t; type mount_tmp_t; files_tmp_file(mount_tmp_t) @@ -28226,7 +28234,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # -@@ -36,7 +40,8 @@ +@@ -36,9 +41,10 @@ # # setuid/setgid needed to mount cifs @@ -28234,9 +28242,12 @@ diff -b -B --ignore-all-space --exclude- +allow mount_t self:capability { fsetid ipc_lock sys_rawio sys_resource sys_admin dac_override chown sys_tty_config setuid setgid }; +allow mount_t self:process { ptrace signal }; - allow mount_t mount_loopback_t:file read_file_perms; +-allow mount_t mount_loopback_t:file read_file_perms; ++allow mount_t mount_loop_t:file read_file_perms; -@@ -47,12 +52,25 @@ + allow mount_t mount_tmp_t:file manage_file_perms; + allow mount_t mount_tmp_t:dir manage_dir_perms; +@@ -47,12 +53,25 @@ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir }) @@ -28262,7 +28273,7 @@ diff -b -B --ignore-all-space --exclude- dev_rw_lvm_control(mount_t) dev_dontaudit_getattr_all_chr_files(mount_t) dev_dontaudit_getattr_memory_dev(mount_t) -@@ -62,16 +80,19 @@ +@@ -62,16 +81,19 @@ storage_raw_write_fixed_disk(mount_t) storage_raw_read_removable_device(mount_t) storage_raw_write_removable_device(mount_t) @@ -28285,7 +28296,7 @@ diff -b -B --ignore-all-space --exclude- term_use_all_terms(mount_t) -@@ -79,6 +100,7 @@ +@@ -79,6 +101,7 @@ corecmd_exec_bin(mount_t) domain_use_interactive_fds(mount_t) @@ -28293,7 +28304,7 @@ diff -b -B --ignore-all-space --exclude- files_search_all(mount_t) files_read_etc_files(mount_t) -@@ -87,7 +109,7 @@ +@@ -87,7 +110,7 @@ files_mounton_all_mountpoints(mount_t) files_unmount_rootfs(mount_t) # These rules need to be generalized. Only admin, initrc should have it: @@ -28302,7 +28313,7 @@ diff -b -B --ignore-all-space --exclude- files_mount_all_file_type_fs(mount_t) files_unmount_all_file_type_fs(mount_t) # for when /etc/mtab loses its type -@@ -100,6 +122,8 @@ +@@ -100,6 +123,8 @@ init_use_fds(mount_t) init_use_script_ptys(mount_t) init_dontaudit_getattr_initctl(mount_t) @@ -28311,7 +28322,7 @@ diff -b -B --ignore-all-space --exclude- auth_use_nsswitch(mount_t) -@@ -116,6 +140,7 @@ +@@ -116,6 +141,7 @@ seutil_read_config(mount_t) userdom_use_all_users_fds(mount_t) @@ -28319,7 +28330,7 @@ diff -b -B --ignore-all-space --exclude- ifdef(`distro_redhat',` optional_policy(` -@@ -133,7 +158,7 @@ +@@ -133,7 +159,7 @@ tunable_policy(`allow_mount_anyfile',` auth_read_all_dirs_except_shadow(mount_t) @@ -28328,7 +28339,7 @@ diff -b -B --ignore-all-space --exclude- files_mounton_non_security(mount_t) ') -@@ -141,16 +166,16 @@ +@@ -141,16 +167,16 @@ # for nfs corenet_all_recvfrom_unlabeled(mount_t) corenet_all_recvfrom_netlabel(mount_t) @@ -28353,7 +28364,7 @@ diff -b -B --ignore-all-space --exclude- corenet_tcp_bind_generic_port(mount_t) corenet_udp_bind_generic_port(mount_t) corenet_tcp_bind_reserved_port(mount_t) -@@ -164,6 +189,8 @@ +@@ -164,6 +190,8 @@ fs_search_rpc(mount_t) rpc_stub(mount_t) @@ -28362,7 +28373,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -171,6 +198,15 @@ +@@ -171,6 +199,15 @@ ') optional_policy(` @@ -28378,7 +28389,7 @@ diff -b -B --ignore-all-space --exclude- ifdef(`hide_broken_symptoms',` # for a bug in the X server rhgb_dontaudit_rw_stream_sockets(mount_t) -@@ -178,6 +214,11 @@ +@@ -178,6 +215,11 @@ ') ') @@ -28390,7 +28401,7 @@ diff -b -B --ignore-all-space --exclude- # for kernel package installation optional_policy(` rpm_rw_pipes(mount_t) -@@ -185,14 +226,24 @@ +@@ -185,14 +227,24 @@ optional_policy(` samba_domtrans_smbmount(mount_t) @@ -30468,7 +30479,7 @@ diff -b -B --ignore-all-space --exclude- +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if 2009-04-28 16:06:27.000000000 -0400 ++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if 2009-05-06 08:49:37.000000000 -0400 @@ -30,8 +30,9 @@ ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.847 retrieving revision 1.848 diff -u -p -r1.847 -r1.848 --- selinux-policy.spec 5 May 2009 20:48:39 -0000 1.847 +++ selinux-policy.spec 6 May 2009 12:51:59 -0000 1.848 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.12 -Release: 29%{?dist} +Release: 30%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -477,6 +477,9 @@ exit 0 %endif %changelog +* Tue May 5 2009 Dan Walsh 3.6.12-30 +-Remove duplicate line + * Tue May 5 2009 Dan Walsh 3.6.12-29 - Allow svirt to manage pci and other sysfs device data From jbowes at fedoraproject.org Wed May 6 12:59:10 2009 From: jbowes at fedoraproject.org (James Bowes) Date: Wed, 6 May 2009 12:59:10 +0000 (UTC) Subject: rpms/gnome-nds-thumbnailer/F-11 gnome-nds-thumbnailer.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090506125910.4126A70108@cvs1.fedora.phx.redhat.com> Author: jbowes Update of /cvs/extras/rpms/gnome-nds-thumbnailer/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12832 Modified Files: gnome-nds-thumbnailer.spec sources Log Message: 1.2.1 for f11 Index: gnome-nds-thumbnailer.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-nds-thumbnailer/F-11/gnome-nds-thumbnailer.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- gnome-nds-thumbnailer.spec 24 Feb 2009 23:08:37 -0000 1.2 +++ gnome-nds-thumbnailer.spec 6 May 2009 12:58:39 -0000 1.3 @@ -1,12 +1,12 @@ Name: gnome-nds-thumbnailer -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Thumbnailer for Nintendo DS ROM files Group: Amusements/Graphics License: GPLv2+ URL: http://ftp.gnome.org/pub/GNOME/sources/%{name} -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -73,6 +73,9 @@ fi %changelog +* Wed May 06 2009 James Bowes 1.2.1-1 +- Latest upstream release + * Tue Feb 24 2009 Fedora Release Engineering - 1.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-nds-thumbnailer/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 12 Feb 2008 12:45:51 -0000 1.2 +++ sources 6 May 2009 12:58:39 -0000 1.3 @@ -1 +1 @@ -316e43eb66828addae64038372c59ab9 gnome-nds-thumbnailer-1.0.2.tar.bz2 +a20c1d98d9b16d8a538134fec1455dd7 gnome-nds-thumbnailer-1.2.1.tar.bz2 From davidz at fedoraproject.org Wed May 6 13:01:04 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Wed, 6 May 2009 13:01:04 +0000 (UTC) Subject: rpms/gvfs/F-11 gvfs.spec,1.127,1.128 Message-ID: <20090506130104.1F0D370108@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gvfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13158 Modified Files: gvfs.spec Log Message: * Wed May 06 2009 David Zeuthen - 1.2.2-5 - Don't show drives that are supposed to be hidden (#498649) - Only automount if media or drive was just inserted - this fixes a problem with spurious automounts when partitioning/formatting Index: gvfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gvfs/F-11/gvfs.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -p -r1.127 -r1.128 --- gvfs.spec 2 May 2009 05:01:34 -0000 1.127 +++ gvfs.spec 6 May 2009 13:00:33 -0000 1.128 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.2.2 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -39,6 +39,8 @@ Patch4: gvfs-1.2.2-ssh-auth-sock.patch # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor # +# These are all in gvfs' master branch on git.gnome.org. +# # http://bugzilla.gnome.org/show_bug.cgi?id=573826 Patch101: gdu-0001-Bug-573826-gdu-volume-monitor.patch # http://bugzilla.gnome.org/show_bug.cgi?id=573826 @@ -65,8 +67,10 @@ Patch111: gdu-0011-Bug-576083-pre-unmoun Patch112: gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch Patch113: gdu-0013-pass-the-flush-mount-option-for-vfat.patch -# upstream fix -Patch120: gvfs-1.2.2-really-hide.patch +# Only automount when media has just been inserted +Patch114: 0014-gvfs-use-device-media-detected.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=498649 +Patch115: 0015-gvfs-respect-presentation-hide-for-drives.patch %description The gvfs package provides backend implementations for the gio @@ -166,8 +170,8 @@ media players (Media Transfer Protocol) %patch111 -p1 -b .gdu-pre-unmount-signals %patch112 -p1 -b .gdu-unwanted-devices %patch113 -p1 -b .gdu-vfat-flush - -%patch120 -p1 -b .really-hide +%patch114 -p1 -b .gdu-automount-only-on-insertion +%patch115 -p1 -b .gdu-hide-drives %build @@ -311,6 +315,11 @@ update-desktop-database &> /dev/null ||: %changelog +* Wed May 06 2009 David Zeuthen - 1.2.2-5 +- Don't show drives that are supposed to be hidden (#498649) +- Only automount if media or drive was just inserted - this fixes + a problem with spurious automounts when partitioning/formatting + * Sat May 2 2009 Matthias Clasen - 1.2.2-4 - Really hide drives that are supposed to be hidden (#498649) From davidz at fedoraproject.org Wed May 6 13:02:53 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Wed, 6 May 2009 13:02:53 +0000 (UTC) Subject: rpms/gvfs/F-11 0014-gvfs-use-device-media-detected.patch, NONE, 1.1 0015-gvfs-respect-presentation-hide-for-drives.patch, NONE, 1.1 gvfs.spec, 1.128, 1.129 Message-ID: <20090506130253.AD41170108@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gvfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13444 Modified Files: gvfs.spec Added Files: 0014-gvfs-use-device-media-detected.patch 0015-gvfs-respect-presentation-hide-for-drives.patch Log Message: * Wed May 06 2009 David Zeuthen - 1.2.2-6 - Rebuild 0014-gvfs-use-device-media-detected.patch: --- NEW FILE 0014-gvfs-use-device-media-detected.patch --- >From 3f3f21fe6e2bdac8fd6acf048da6fb228adde092 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Fri, 01 May 2009 19:59:54 +0000 Subject: Use new gnome-disk-utility API to figure out when media was inserted This fixes a problem with Nautilus automounting newly created volumes appearing as a result of formatting/partitioning. --- diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c index 29e108d..c2c8b76 100644 --- a/monitor/gdu/ggdudrive.c +++ b/monitor/gdu/ggdudrive.c @@ -51,7 +51,6 @@ struct _GGduDrive { gboolean can_eject; gboolean can_poll_for_media; gboolean is_media_check_automatic; - time_t time_of_last_media_insertion; }; static void g_gdu_drive_drive_iface_init (GDriveIface *iface); @@ -178,9 +177,6 @@ update_drive (GGduDrive *drive) if (device != NULL) g_object_unref (device); - if (drive->has_media != old_has_media) - drive->time_of_last_media_insertion = time (NULL); - /* compute whether something changed */ changed = !((old_is_media_removable == drive->is_media_removable) && (old_has_media == drive->has_media) && @@ -233,8 +229,6 @@ g_gdu_drive_new (GVolumeMonitor *volume_monitor, drive->presentable = g_object_ref (presentable); - drive->time_of_last_media_insertion = time (NULL); - g_signal_connect (drive->presentable, "changed", G_CALLBACK (presentable_changed), drive); g_signal_connect (drive->presentable, "job-changed", G_CALLBACK (presentable_job_changed), drive); @@ -685,7 +679,16 @@ g_gdu_drive_has_presentable (GGduDrive *drive, time_t g_gdu_drive_get_time_of_last_media_insertion (GGduDrive *drive) { - return drive->time_of_last_media_insertion; + GduDevice *device; + time_t ret; + + ret = 0; + device = gdu_presentable_get_device (drive->presentable); + if (device != NULL) { + ret = gdu_device_get_media_detection_time (device); + g_object_unref (device); + } + return ret; } GduPresentable * -- cgit v0.8.2 0015-gvfs-respect-presentation-hide-for-drives.patch: --- NEW FILE 0015-gvfs-respect-presentation-hide-for-drives.patch --- >From 59dd3b33a71a930651f23142e2a7d7e57727144f Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Fri, 01 May 2009 21:23:01 +0000 Subject: Fix bug where drives are not ignored as they ought to be This should fix part of https://bugzilla.redhat.com/show_bug.cgi?id=498649#c14 (the other part is fixed in the Fedora livecd scripts) --- diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c index 2c1f727..df42249 100644 --- a/monitor/gdu/ggduvolumemonitor.c +++ b/monitor/gdu/ggduvolumemonitor.c @@ -833,8 +833,10 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points) goto out; } - if (gdu_device_get_presentation_hide (device)) + if (gdu_device_get_presentation_hide (device)) { + ignored = TRUE; goto out; + } has_volumes = FALSE; all_volumes_are_ignored = TRUE; -- cgit v0.8.2 Index: gvfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gvfs/F-11/gvfs.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -p -r1.128 -r1.129 --- gvfs.spec 6 May 2009 13:00:33 -0000 1.128 +++ gvfs.spec 6 May 2009 13:02:23 -0000 1.129 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.2.2 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -315,6 +315,9 @@ update-desktop-database &> /dev/null ||: %changelog +* Wed May 06 2009 David Zeuthen - 1.2.2-6 +- Rebuild + * Wed May 06 2009 David Zeuthen - 1.2.2-5 - Don't show drives that are supposed to be hidden (#498649) - Only automount if media or drive was just inserted - this fixes From astokes at fedoraproject.org Wed May 6 13:31:03 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 13:31:03 +0000 (UTC) Subject: rpms/cas/devel .cvsignore,1.2,1.3 cas.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <20090506133103.9449270108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/cas/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16700 Modified Files: .cvsignore cas.spec sources Log Message: New release, snippet support, further maintenance support, updated documentation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cas/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Jan 2009 18:32:15 -0000 1.2 +++ .cvsignore 6 May 2009 13:30:33 -0000 1.3 @@ -1 +1 @@ -cas-0.13.tar.gz +cas-0.14.tar.gz Index: cas.spec =================================================================== RCS file: /cvs/pkgs/rpms/cas/devel/cas.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- cas.spec 24 Feb 2009 06:35:36 -0000 1.2 +++ cas.spec 6 May 2009 13:30:33 -0000 1.3 @@ -2,8 +2,8 @@ Name: cas Summary: Tool to analyze and configure core file environment -Version: 0.13 -Release: 119%{?dist} +Version: 0.14 +Release: 10%{?dist} Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz License: GPLv3+ Group: Development/Libraries @@ -11,12 +11,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version BuildArch: noarch Url: http://fedorahosted.org/cas BuildRequires: python-devel +%if 0%{?rhel} +Requires: python-sqlite crash +%else Requires: crash +%endif %description CAS provides a user the ability to configure an environment for core analysis -quickly. All the hassles of matching kernel versions and machine architecture -types to core dumps are automatically detected and processed. +quickly. All the hassles of matching kernel versions and machine architecture +types to core dumps are automatically detected and processed. %prep %setup -q @@ -39,11 +43,32 @@ rm -rf ${RPM_BUILD_ROOT} %{python_sitelib}/* %{_mandir}/man1/cas.1.gz %{_mandir}/man1/cas-admin.1.gz -%doc LICENSE README PKG-INFO +%dir /var/lib/cas/snippets/ +%defattr(755,root,root) +%config(noreplace) /var/lib/cas/snippets/log +%config(noreplace) /var/lib/cas/snippets/memory +%config(noreplace) /var/lib/cas/snippets/sys +%config(noreplace) /var/lib/cas/snippets/template +%config(noreplace) /var/lib/cas/snippets/traceback +%config(noreplace) /var/lib/cas/snippets/modules +%doc AUTHORS LICENSE README PKG-INFO doc/* %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 0.13-119 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue May 5 2009 Adam Stokes - 0.14-8 +- support for purging old data +- documentation updated to reflect updated workflow and describe + new features. + +* Fri Apr 24 2009 Adam Stokes - 0.14-2 +- Finalizing sqlite implementation +- added AUTHORS + +* Thu Apr 2 2009 Scott Dodson - 0.14-1 +- Spec file changes to handle the snippets directory +- Snippets support to replace hardcoding crash input cmds + +* Wed Feb 11 2009 Adam Stokes - 0.13-120 +- added proper documentation * Wed Jan 7 2009 Adam Stokes - 0.13-116 - support for extracting kernel modules @@ -76,7 +101,7 @@ rm -rf ${RPM_BUILD_ROOT} - splitting off grabcore to be a download/extract only service - core of the work to be done specifically by their intended modules - + * Fri Dec 7 2007 Adam Stokes - 0.9 - release bump - decompression module added Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cas/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Jan 2009 18:32:15 -0000 1.2 +++ sources 6 May 2009 13:30:33 -0000 1.3 @@ -1 +1 @@ -8ac633c1c5ba6f38756fcb31a96513d6 cas-0.13.tar.gz +98f492705ca8d59e77520fbe1d4650b5 cas-0.14.tar.gz From astokes at fedoraproject.org Wed May 6 13:33:03 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 13:33:03 +0000 (UTC) Subject: rpms/cas/F-10 .cvsignore,1.2,1.3 cas.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <20090506133303.A3D5470108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/cas/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17019 Modified Files: .cvsignore cas.spec sources Log Message: New release, snippet support, further maintenance support, updated documentation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Jan 2009 18:36:09 -0000 1.2 +++ .cvsignore 6 May 2009 13:32:33 -0000 1.3 @@ -1 +1 @@ -cas-0.13.tar.gz +cas-0.14.tar.gz Index: cas.spec =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-10/cas.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- cas.spec 15 Jan 2009 18:36:09 -0000 1.1 +++ cas.spec 6 May 2009 13:32:33 -0000 1.2 @@ -2,8 +2,8 @@ Name: cas Summary: Tool to analyze and configure core file environment -Version: 0.13 -Release: 118%{?dist} +Version: 0.14 +Release: 10%{?dist} Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz License: GPLv3+ Group: Development/Libraries @@ -11,12 +11,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version BuildArch: noarch Url: http://fedorahosted.org/cas BuildRequires: python-devel +%if 0%{?rhel} +Requires: python-sqlite crash +%else Requires: crash +%endif %description CAS provides a user the ability to configure an environment for core analysis -quickly. All the hassles of matching kernel versions and machine architecture -types to core dumps are automatically detected and processed. +quickly. All the hassles of matching kernel versions and machine architecture +types to core dumps are automatically detected and processed. %prep %setup -q @@ -39,9 +43,33 @@ rm -rf ${RPM_BUILD_ROOT} %{python_sitelib}/* %{_mandir}/man1/cas.1.gz %{_mandir}/man1/cas-admin.1.gz -%doc LICENSE README PKG-INFO +%dir /var/lib/cas/snippets/ +%defattr(755,root,root) +%config(noreplace) /var/lib/cas/snippets/log +%config(noreplace) /var/lib/cas/snippets/memory +%config(noreplace) /var/lib/cas/snippets/sys +%config(noreplace) /var/lib/cas/snippets/template +%config(noreplace) /var/lib/cas/snippets/traceback +%config(noreplace) /var/lib/cas/snippets/modules +%doc AUTHORS LICENSE README PKG-INFO doc/* %changelog +* Tue May 5 2009 Adam Stokes - 0.14-8 +- support for purging old data +- documentation updated to reflect updated workflow and describe + new features. + +* Fri Apr 24 2009 Adam Stokes - 0.14-2 +- Finalizing sqlite implementation +- added AUTHORS + +* Thu Apr 2 2009 Scott Dodson - 0.14-1 +- Spec file changes to handle the snippets directory +- Snippets support to replace hardcoding crash input cmds + +* Wed Feb 11 2009 Adam Stokes - 0.13-120 +- added proper documentation + * Wed Jan 7 2009 Adam Stokes - 0.13-116 - support for extracting kernel modules - support for analyzing x86 cores on x86_64 system @@ -73,7 +101,7 @@ rm -rf ${RPM_BUILD_ROOT} - splitting off grabcore to be a download/extract only service - core of the work to be done specifically by their intended modules - + * Fri Dec 7 2007 Adam Stokes - 0.9 - release bump - decompression module added Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Jan 2009 18:36:09 -0000 1.2 +++ sources 6 May 2009 13:32:33 -0000 1.3 @@ -1 +1 @@ -8ac633c1c5ba6f38756fcb31a96513d6 cas-0.13.tar.gz +98f492705ca8d59e77520fbe1d4650b5 cas-0.14.tar.gz From astokes at fedoraproject.org Wed May 6 13:41:43 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 13:41:43 +0000 (UTC) Subject: rpms/cas/F-11 .cvsignore,1.2,1.3 cas.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <20090506134143.5D3E470108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/cas/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18092 Modified Files: .cvsignore cas.spec sources Log Message: New release, snippet support, further maintenance support, updated documentation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Jan 2009 18:32:15 -0000 1.2 +++ .cvsignore 6 May 2009 13:41:12 -0000 1.3 @@ -1 +1 @@ -cas-0.13.tar.gz +cas-0.14.tar.gz Index: cas.spec =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-11/cas.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- cas.spec 24 Feb 2009 06:35:36 -0000 1.2 +++ cas.spec 6 May 2009 13:41:12 -0000 1.3 @@ -2,8 +2,8 @@ Name: cas Summary: Tool to analyze and configure core file environment -Version: 0.13 -Release: 119%{?dist} +Version: 0.14 +Release: 10%{?dist} Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz License: GPLv3+ Group: Development/Libraries @@ -11,12 +11,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version BuildArch: noarch Url: http://fedorahosted.org/cas BuildRequires: python-devel +%if 0%{?rhel} +Requires: python-sqlite crash +%else Requires: crash +%endif %description CAS provides a user the ability to configure an environment for core analysis -quickly. All the hassles of matching kernel versions and machine architecture -types to core dumps are automatically detected and processed. +quickly. All the hassles of matching kernel versions and machine architecture +types to core dumps are automatically detected and processed. %prep %setup -q @@ -39,11 +43,32 @@ rm -rf ${RPM_BUILD_ROOT} %{python_sitelib}/* %{_mandir}/man1/cas.1.gz %{_mandir}/man1/cas-admin.1.gz -%doc LICENSE README PKG-INFO +%dir /var/lib/cas/snippets/ +%defattr(755,root,root) +%config(noreplace) /var/lib/cas/snippets/log +%config(noreplace) /var/lib/cas/snippets/memory +%config(noreplace) /var/lib/cas/snippets/sys +%config(noreplace) /var/lib/cas/snippets/template +%config(noreplace) /var/lib/cas/snippets/traceback +%config(noreplace) /var/lib/cas/snippets/modules +%doc AUTHORS LICENSE README PKG-INFO doc/* %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 0.13-119 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue May 5 2009 Adam Stokes - 0.14-8 +- support for purging old data +- documentation updated to reflect updated workflow and describe + new features. + +* Fri Apr 24 2009 Adam Stokes - 0.14-2 +- Finalizing sqlite implementation +- added AUTHORS + +* Thu Apr 2 2009 Scott Dodson - 0.14-1 +- Spec file changes to handle the snippets directory +- Snippets support to replace hardcoding crash input cmds + +* Wed Feb 11 2009 Adam Stokes - 0.13-120 +- added proper documentation * Wed Jan 7 2009 Adam Stokes - 0.13-116 - support for extracting kernel modules @@ -76,7 +101,7 @@ rm -rf ${RPM_BUILD_ROOT} - splitting off grabcore to be a download/extract only service - core of the work to be done specifically by their intended modules - + * Fri Dec 7 2007 Adam Stokes - 0.9 - release bump - decompression module added Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Jan 2009 18:32:15 -0000 1.2 +++ sources 6 May 2009 13:41:12 -0000 1.3 @@ -1 +1 @@ -8ac633c1c5ba6f38756fcb31a96513d6 cas-0.13.tar.gz +98f492705ca8d59e77520fbe1d4650b5 cas-0.14.tar.gz From astokes at fedoraproject.org Wed May 6 13:43:16 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 13:43:16 +0000 (UTC) Subject: rpms/cas/F-9 .cvsignore,1.2,1.3 cas.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <20090506134316.8CF2770108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/cas/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18478 Modified Files: .cvsignore cas.spec sources Log Message: New release, snippet support, further maintenance support, updated documentation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Jan 2009 18:34:43 -0000 1.2 +++ .cvsignore 6 May 2009 13:42:46 -0000 1.3 @@ -1 +1 @@ -cas-0.13.tar.gz +cas-0.14.tar.gz Index: cas.spec =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-9/cas.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- cas.spec 15 Jan 2009 18:34:43 -0000 1.1 +++ cas.spec 6 May 2009 13:42:46 -0000 1.2 @@ -2,8 +2,8 @@ Name: cas Summary: Tool to analyze and configure core file environment -Version: 0.13 -Release: 118%{?dist} +Version: 0.14 +Release: 10%{?dist} Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz License: GPLv3+ Group: Development/Libraries @@ -11,12 +11,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version BuildArch: noarch Url: http://fedorahosted.org/cas BuildRequires: python-devel +%if 0%{?rhel} +Requires: python-sqlite crash +%else Requires: crash +%endif %description CAS provides a user the ability to configure an environment for core analysis -quickly. All the hassles of matching kernel versions and machine architecture -types to core dumps are automatically detected and processed. +quickly. All the hassles of matching kernel versions and machine architecture +types to core dumps are automatically detected and processed. %prep %setup -q @@ -39,9 +43,33 @@ rm -rf ${RPM_BUILD_ROOT} %{python_sitelib}/* %{_mandir}/man1/cas.1.gz %{_mandir}/man1/cas-admin.1.gz -%doc LICENSE README PKG-INFO +%dir /var/lib/cas/snippets/ +%defattr(755,root,root) +%config(noreplace) /var/lib/cas/snippets/log +%config(noreplace) /var/lib/cas/snippets/memory +%config(noreplace) /var/lib/cas/snippets/sys +%config(noreplace) /var/lib/cas/snippets/template +%config(noreplace) /var/lib/cas/snippets/traceback +%config(noreplace) /var/lib/cas/snippets/modules +%doc AUTHORS LICENSE README PKG-INFO doc/* %changelog +* Tue May 5 2009 Adam Stokes - 0.14-8 +- support for purging old data +- documentation updated to reflect updated workflow and describe + new features. + +* Fri Apr 24 2009 Adam Stokes - 0.14-2 +- Finalizing sqlite implementation +- added AUTHORS + +* Thu Apr 2 2009 Scott Dodson - 0.14-1 +- Spec file changes to handle the snippets directory +- Snippets support to replace hardcoding crash input cmds + +* Wed Feb 11 2009 Adam Stokes - 0.13-120 +- added proper documentation + * Wed Jan 7 2009 Adam Stokes - 0.13-116 - support for extracting kernel modules - support for analyzing x86 cores on x86_64 system @@ -73,7 +101,7 @@ rm -rf ${RPM_BUILD_ROOT} - splitting off grabcore to be a download/extract only service - core of the work to be done specifically by their intended modules - + * Fri Dec 7 2007 Adam Stokes - 0.9 - release bump - decompression module added Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cas/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Jan 2009 18:34:43 -0000 1.2 +++ sources 6 May 2009 13:42:46 -0000 1.3 @@ -1 +1 @@ -8ac633c1c5ba6f38756fcb31a96513d6 cas-0.13.tar.gz +98f492705ca8d59e77520fbe1d4650b5 cas-0.14.tar.gz From rdieter at fedoraproject.org Wed May 6 13:44:56 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 13:44:56 +0000 (UTC) Subject: rpms/alpine/devel alpine-2.00-gcc44_reply_hack.patch, NONE, 1.1 alpine.spec, 1.17, 1.18 Message-ID: <20090506134456.ADC0B70108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/alpine/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18747/devel Modified Files: alpine.spec Added Files: alpine-2.00-gcc44_reply_hack.patch Log Message: * Wed May 06 2009 Rex Dieter - 2.00-5 - "reply to all recipients" doesn't include anyone on the Cc list (#496400) alpine-2.00-gcc44_reply_hack.patch: --- NEW FILE alpine-2.00-gcc44_reply_hack.patch --- diff -up alpine-2.00/pith/reply.c.gcc44 alpine-2.00/pith/reply.c --- alpine-2.00/pith/reply.c.gcc44 2008-06-03 14:27:23.000000000 -0500 +++ alpine-2.00/pith/reply.c 2009-05-06 08:07:27.000000000 -0500 @@ -357,6 +357,7 @@ set_role_from_msg(struct pine *ps, long * reply_seed - fill in reply header * */ +__attribute__((__optimize__(0))) void reply_seed(struct pine *ps, ENVELOPE *outgoing, ENVELOPE *env, struct mail_address *saved_from, struct mail_address *saved_to, Index: alpine.spec =================================================================== RCS file: /cvs/pkgs/rpms/alpine/devel/alpine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- alpine.spec 24 Feb 2009 00:43:17 -0000 1.17 +++ alpine.spec 6 May 2009 13:44:26 -0000 1.18 @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.00 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -26,6 +26,10 @@ Source0: ftp://ftp.cac.washington.edu/al Conflicts: pine BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# short-term workaround until gcc is fixed +# http://bugzilla.redhat.com/496400 +Patch1: alpine-2.00-gcc44_reply_hack.patch + BuildRequires: aspell BuildRequires: gettext BuildRequires: inews @@ -63,6 +67,10 @@ GNU Build System's autotools. %prep %setup -q +#if 0%{?fedora} > 10 +%patch1 -p1 -b .gcc44_reply_hack +#endif + %build touch imap/ip6 @@ -111,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 06 2009 Rex Dieter - 2.00-5 +- "reply to all recipients" doesn't include anyone on the Cc list (#496400) + * Mon Feb 23 2009 Fedora Release Engineering - 2.00-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Wed May 6 13:44:56 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 13:44:56 +0000 (UTC) Subject: rpms/alpine/F-11 alpine-2.00-gcc44_reply_hack.patch, NONE, 1.1 alpine.spec, 1.17, 1.18 Message-ID: <20090506134456.701FA70108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/alpine/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18747/F-11 Modified Files: alpine.spec Added Files: alpine-2.00-gcc44_reply_hack.patch Log Message: * Wed May 06 2009 Rex Dieter - 2.00-5 - "reply to all recipients" doesn't include anyone on the Cc list (#496400) alpine-2.00-gcc44_reply_hack.patch: --- NEW FILE alpine-2.00-gcc44_reply_hack.patch --- diff -up alpine-2.00/pith/reply.c.gcc44 alpine-2.00/pith/reply.c --- alpine-2.00/pith/reply.c.gcc44 2008-06-03 14:27:23.000000000 -0500 +++ alpine-2.00/pith/reply.c 2009-05-06 08:07:27.000000000 -0500 @@ -357,6 +357,7 @@ set_role_from_msg(struct pine *ps, long * reply_seed - fill in reply header * */ +__attribute__((__optimize__(0))) void reply_seed(struct pine *ps, ENVELOPE *outgoing, ENVELOPE *env, struct mail_address *saved_from, struct mail_address *saved_to, Index: alpine.spec =================================================================== RCS file: /cvs/pkgs/rpms/alpine/F-11/alpine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- alpine.spec 24 Feb 2009 00:43:17 -0000 1.17 +++ alpine.spec 6 May 2009 13:44:26 -0000 1.18 @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.00 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -26,6 +26,10 @@ Source0: ftp://ftp.cac.washington.edu/al Conflicts: pine BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# short-term workaround until gcc is fixed +# http://bugzilla.redhat.com/496400 +Patch1: alpine-2.00-gcc44_reply_hack.patch + BuildRequires: aspell BuildRequires: gettext BuildRequires: inews @@ -63,6 +67,10 @@ GNU Build System's autotools. %prep %setup -q +#if 0%{?fedora} > 10 +%patch1 -p1 -b .gcc44_reply_hack +#endif + %build touch imap/ip6 @@ -111,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 06 2009 Rex Dieter - 2.00-5 +- "reply to all recipients" doesn't include anyone on the Cc list (#496400) + * Mon Feb 23 2009 Fedora Release Engineering - 2.00-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Wed May 6 13:55:55 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 13:55:55 +0000 (UTC) Subject: rpms/akonadi/devel akonadi.spec,1.31,1.32 sources,1.10,1.11 Message-ID: <20090506135555.79A7A70108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20091 Modified Files: akonadi.spec sources Log Message: Not built yet, pending import/build of kde-4.3-related stuff * Wed May 06 2009 Rex Dieter - 1.1.85-1 - akonadi-1.1.85 Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- akonadi.spec 30 Apr 2009 20:46:15 -0000 1.31 +++ akonadi.spec 6 May 2009 13:55:24 -0000 1.32 @@ -1,21 +1,19 @@ Summary: PIM Storage Service Name: akonadi -Version: 1.1.2 +Version: 1.1.85 Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://download.akonadi-project.org/ -Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2 +Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # shrink default initial db size a bit (approx 140mb->28mb) %define mysql_conf_timestamp 20090220 Patch1: akonadi-1.1.1-mysql_conf.patch -## upstream - BuildRequires: cmake >= 2.6.0 BuildRequires: qt4-devel >= 4.4 BuildRequires: automoc4 @@ -73,6 +71,7 @@ make %{?_smp_mflags} -C %{_target_platfo %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} + mkdir -p $RPM_BUILD_ROOT%{_datadir}/akonadi/agents touch -d %{mysql_conf_timestamp} $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-local.conf @@ -104,20 +103,23 @@ fi %{_bindir}/akonadictl %{_bindir}/akonadiserver %{_libdir}/libakonadi*.so.1* -%{_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 -%dir %{_datadir}/akonadi -%dir %{_datadir}/akonadi/agents +%{_datadir}/akonadi/ %files devel %defattr(-,root,root,-) %{_includedir}/akonadi/ %{_libdir}/pkgconfig/akonadi.pc %{_libdir}/libakonadi*.so +%{_libdir}/cmake/Akonadi-%{version}/ %changelog +* Wed May 06 2009 Rex Dieter - 1.1.85-1 +- akonadi-1.1.85 + * Thu Apr 30 2009 Rex Dieter - 1.1.2-1 - akonadi-1.1.2 - optimize scriptlets a bit Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 30 Apr 2009 20:46:15 -0000 1.10 +++ sources 6 May 2009 13:55:24 -0000 1.11 @@ -1 +0,0 @@ -5651b02358f7d2f1c0954dfd31feafb1 akonadi-1.1.2.tar.bz2 From astokes at fedoraproject.org Wed May 6 14:00:05 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 14:00:05 +0000 (UTC) Subject: rpms/cas/EL-4 .cvsignore,1.2,1.3 cas.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <20090506140005.2F70670108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/cas/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21387 Modified Files: .cvsignore cas.spec sources Log Message: New release, snippet support, further maintenance support, updated documentation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cas/EL-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Jan 2009 18:45:49 -0000 1.2 +++ .cvsignore 6 May 2009 13:59:34 -0000 1.3 @@ -1 +1 @@ -cas-0.13.tar.gz +cas-0.14.tar.gz Index: cas.spec =================================================================== RCS file: /cvs/pkgs/rpms/cas/EL-4/cas.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- cas.spec 21 Jan 2009 18:57:09 -0000 1.2 +++ cas.spec 6 May 2009 13:59:34 -0000 1.3 @@ -2,8 +2,8 @@ Name: cas Summary: Tool to analyze and configure core file environment -Version: 0.13 -Release: 119%{?dist} +Version: 0.14 +Release: 10%{?dist} Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz License: GPLv3+ Group: Development/Libraries @@ -11,13 +11,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version BuildArch: noarch Url: http://fedorahosted.org/cas BuildRequires: python-devel +%if 0%{?rhel} +Requires: python-sqlite crash +%else Requires: crash -ExcludeArch: ppc ppc64 +%endif %description CAS provides a user the ability to configure an environment for core analysis -quickly. All the hassles of matching kernel versions and machine architecture -types to core dumps are automatically detected and processed. +quickly. All the hassles of matching kernel versions and machine architecture +types to core dumps are automatically detected and processed. %prep %setup -q @@ -40,11 +43,32 @@ rm -rf ${RPM_BUILD_ROOT} %{python_sitelib}/* %{_mandir}/man1/cas.1.gz %{_mandir}/man1/cas-admin.1.gz -%doc LICENSE README PKG-INFO +%dir /var/lib/cas/snippets/ +%defattr(755,root,root) +%config(noreplace) /var/lib/cas/snippets/log +%config(noreplace) /var/lib/cas/snippets/memory +%config(noreplace) /var/lib/cas/snippets/sys +%config(noreplace) /var/lib/cas/snippets/template +%config(noreplace) /var/lib/cas/snippets/traceback +%config(noreplace) /var/lib/cas/snippets/modules +%doc AUTHORS LICENSE README PKG-INFO doc/* %changelog -* Wed Jan 21 2009 Adam Stokes - 0.13-119 -- ExcludeArch ppc since crash is not available in this scenario +* Tue May 5 2009 Adam Stokes - 0.14-8 +- support for purging old data +- documentation updated to reflect updated workflow and describe + new features. + +* Fri Apr 24 2009 Adam Stokes - 0.14-2 +- Finalizing sqlite implementation +- added AUTHORS + +* Thu Apr 2 2009 Scott Dodson - 0.14-1 +- Spec file changes to handle the snippets directory +- Snippets support to replace hardcoding crash input cmds + +* Wed Feb 11 2009 Adam Stokes - 0.13-120 +- added proper documentation * Wed Jan 7 2009 Adam Stokes - 0.13-116 - support for extracting kernel modules @@ -77,7 +101,7 @@ rm -rf ${RPM_BUILD_ROOT} - splitting off grabcore to be a download/extract only service - core of the work to be done specifically by their intended modules - + * Fri Dec 7 2007 Adam Stokes - 0.9 - release bump - decompression module added Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cas/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Jan 2009 18:45:49 -0000 1.2 +++ sources 6 May 2009 13:59:34 -0000 1.3 @@ -1 +1 @@ -8ac633c1c5ba6f38756fcb31a96513d6 cas-0.13.tar.gz +98f492705ca8d59e77520fbe1d4650b5 cas-0.14.tar.gz From rdieter at fedoraproject.org Wed May 6 14:00:34 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 14:00:34 +0000 (UTC) Subject: rpms/akonadi/devel .cvsignore, 1.10, 1.11 akonadi.spec, 1.32, 1.33 sources, 1.11, 1.12 Message-ID: <20090506140034.B061F70108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21474 Modified Files: .cvsignore akonadi.spec sources Log Message: cleanup %%files a bit update sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 30 Apr 2009 20:46:15 -0000 1.10 +++ .cvsignore 6 May 2009 14:00:04 -0000 1.11 @@ -1 +1 @@ -akonadi-1.1.2.tar.bz2 +akonadi-1.1.85.tar.bz2 Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- akonadi.spec 6 May 2009 13:55:24 -0000 1.32 +++ akonadi.spec 6 May 2009 14:00:04 -0000 1.33 @@ -104,7 +104,7 @@ fi %{_bindir}/akonadiserver %{_libdir}/libakonadi*.so.1* %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml -%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service +%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service %{_datadir}/mime/packages/akonadi-mime.xml %{_datadir}/akonadi/ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 6 May 2009 13:55:24 -0000 1.11 +++ sources 6 May 2009 14:00:04 -0000 1.12 @@ -0,0 +1 @@ +d85ca08d8a0f9726177778c72b7e4c6d akonadi-1.1.85.tar.bz2 From astokes at fedoraproject.org Wed May 6 14:01:00 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 14:01:00 +0000 (UTC) Subject: rpms/cas/EL-5 .cvsignore,1.2,1.3 cas.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <20090506140100.C52D070108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/cas/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21597 Modified Files: .cvsignore cas.spec sources Log Message: New release, snippet support, further maintenance support, updated documentation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cas/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Jan 2009 18:44:32 -0000 1.2 +++ .cvsignore 6 May 2009 14:00:30 -0000 1.3 @@ -1 +1 @@ -cas-0.13.tar.gz +cas-0.14.tar.gz Index: cas.spec =================================================================== RCS file: /cvs/pkgs/rpms/cas/EL-5/cas.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- cas.spec 21 Jan 2009 18:58:47 -0000 1.2 +++ cas.spec 6 May 2009 14:00:30 -0000 1.3 @@ -2,8 +2,8 @@ Name: cas Summary: Tool to analyze and configure core file environment -Version: 0.13 -Release: 119%{?dist} +Version: 0.14 +Release: 10%{?dist} Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz License: GPLv3+ Group: Development/Libraries @@ -11,13 +11,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version BuildArch: noarch Url: http://fedorahosted.org/cas BuildRequires: python-devel +%if 0%{?rhel} +Requires: python-sqlite crash +%else Requires: crash -ExcludeArch: ppc ppc64 +%endif %description CAS provides a user the ability to configure an environment for core analysis -quickly. All the hassles of matching kernel versions and machine architecture -types to core dumps are automatically detected and processed. +quickly. All the hassles of matching kernel versions and machine architecture +types to core dumps are automatically detected and processed. %prep %setup -q @@ -40,11 +43,32 @@ rm -rf ${RPM_BUILD_ROOT} %{python_sitelib}/* %{_mandir}/man1/cas.1.gz %{_mandir}/man1/cas-admin.1.gz -%doc LICENSE README PKG-INFO +%dir /var/lib/cas/snippets/ +%defattr(755,root,root) +%config(noreplace) /var/lib/cas/snippets/log +%config(noreplace) /var/lib/cas/snippets/memory +%config(noreplace) /var/lib/cas/snippets/sys +%config(noreplace) /var/lib/cas/snippets/template +%config(noreplace) /var/lib/cas/snippets/traceback +%config(noreplace) /var/lib/cas/snippets/modules +%doc AUTHORS LICENSE README PKG-INFO doc/* %changelog -* Wed Jan 21 2009 Adam Stokes - 0.13-119 -- ExcludeArch ppc since crash is not available in this scenario +* Tue May 5 2009 Adam Stokes - 0.14-8 +- support for purging old data +- documentation updated to reflect updated workflow and describe + new features. + +* Fri Apr 24 2009 Adam Stokes - 0.14-2 +- Finalizing sqlite implementation +- added AUTHORS + +* Thu Apr 2 2009 Scott Dodson - 0.14-1 +- Spec file changes to handle the snippets directory +- Snippets support to replace hardcoding crash input cmds + +* Wed Feb 11 2009 Adam Stokes - 0.13-120 +- added proper documentation * Wed Jan 7 2009 Adam Stokes - 0.13-116 - support for extracting kernel modules @@ -77,7 +101,7 @@ rm -rf ${RPM_BUILD_ROOT} - splitting off grabcore to be a download/extract only service - core of the work to be done specifically by their intended modules - + * Fri Dec 7 2007 Adam Stokes - 0.9 - release bump - decompression module added Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cas/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Jan 2009 18:44:32 -0000 1.2 +++ sources 6 May 2009 14:00:30 -0000 1.3 @@ -1 +1 @@ -8ac633c1c5ba6f38756fcb31a96513d6 cas-0.13.tar.gz +98f492705ca8d59e77520fbe1d4650b5 cas-0.14.tar.gz From rdieter at fedoraproject.org Wed May 6 14:01:40 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 14:01:40 +0000 (UTC) Subject: rpms/akonadi/F-11 akonadi.spec,1.31,1.32 Message-ID: <20090506140140.430B870108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21685 Modified Files: akonadi.spec Log Message: * Wed May 06 2009 Rex Dieter - 1.1.2-2 - cleanup %files, dir-owner ship a bit Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-11/akonadi.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- akonadi.spec 30 Apr 2009 20:46:14 -0000 1.31 +++ akonadi.spec 6 May 2009 14:01:09 -0000 1.32 @@ -14,8 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version %define mysql_conf_timestamp 20090220 Patch1: akonadi-1.1.1-mysql_conf.patch -## upstream - BuildRequires: cmake >= 2.6.0 BuildRequires: qt4-devel >= 4.4 BuildRequires: automoc4 @@ -104,11 +102,10 @@ fi %{_bindir}/akonadictl %{_bindir}/akonadiserver %{_libdir}/libakonadi*.so.1* -%{_datadir}/dbus-1/interfaces/ -%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service +%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml +%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service %{_datadir}/mime/packages/akonadi-mime.xml -%dir %{_datadir}/akonadi -%dir %{_datadir}/akonadi/agents +%{_datadir}/akonadi/ %files devel %defattr(-,root,root,-) @@ -118,6 +115,9 @@ fi %changelog +* Wed May 06 2009 Rex Dieter - 1.1.2-2 +- cleanup %%files, dir-owner ship a bit + * Thu Apr 30 2009 Rex Dieter - 1.1.2-1 - akonadi-1.1.2 - optimize scriptlets a bit From rdieter at fedoraproject.org Wed May 6 14:11:11 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 14:11:11 +0000 (UTC) Subject: rpms/soprano/devel soprano.spec,1.30,1.31 Message-ID: <20090506141111.D4F5170108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/soprano/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23044/devel Modified Files: soprano.spec Log Message: * Wed May 6 2009 Rex Dieter - 2.2.3-2 - %files: drop ownership of %_datadir/dbus-1.0/interfaces (#334681) - %files: track shlib sonames - make -apidocs noarch Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- soprano.spec 2 Mar 2009 16:10:07 -0000 1.30 +++ soprano.spec 6 May 2009 14:10:41 -0000 1.31 @@ -7,7 +7,7 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -44,6 +44,9 @@ Requires: pkgconfig Group: Development/Documentation Summary: Soprano API documentation Requires: %{name} = %{?epoch:%{epoch}:}%{version} +%if 0%{?fedora} > 9 +BuildArch: noarch +%endif %description apidocs This package includes the Soprano API documentation in HTML @@ -81,16 +84,17 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/sopranocmd %{_bindir}/sopranod %{_bindir}/onto2vocabularyclass -%{_libdir}/lib*.so.* +%{_libdir}/libsoprano.so.4* +%{_libdir}/libsopranoclient.so.1* +%{_libdir}/libsopranonoindex.so.1* +%{_libdir}/libsopranoserver.so.1* %{_libdir}/soprano/ %{_datadir}/soprano/ -# Own this one here for lack of a better place (see also #334681) -%dir %{_datadir}/dbus-1/interfaces -%{_datadir}/dbus-1/interfaces/org.soprano.* +%{_datadir}/dbus-1/interfaces/org.soprano.*.xml %files devel %defattr(-,root,root,-) -%{_libdir}/lib*.so +%{_libdir}/libsoprano*.so %{_libdir}/pkgconfig/soprano.pc %{_includedir}/soprano/ %{_includedir}/Soprano/ @@ -103,6 +107,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 6 2009 Rex Dieter - 2.2.3-2 +- %%files: drop ownership of %%_datadir/dbus-1.0/interfaces (#334681) +- %%files: track shlib sonames +- make -apidocs noarch + * Mon Mar 2 2009 Luk???? Tinkl - 2.2.3-1 - update to 2.2.3, fix apidox building From rdieter at fedoraproject.org Wed May 6 14:11:12 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 14:11:12 +0000 (UTC) Subject: rpms/soprano/F-11 soprano.spec,1.30,1.31 Message-ID: <20090506141112.1DDB370108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/soprano/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23044/F-11 Modified Files: soprano.spec Log Message: * Wed May 6 2009 Rex Dieter - 2.2.3-2 - %files: drop ownership of %_datadir/dbus-1.0/interfaces (#334681) - %files: track shlib sonames - make -apidocs noarch Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-11/soprano.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- soprano.spec 2 Mar 2009 16:10:07 -0000 1.30 +++ soprano.spec 6 May 2009 14:10:41 -0000 1.31 @@ -7,7 +7,7 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -44,6 +44,9 @@ Requires: pkgconfig Group: Development/Documentation Summary: Soprano API documentation Requires: %{name} = %{?epoch:%{epoch}:}%{version} +%if 0%{?fedora} > 9 +BuildArch: noarch +%endif %description apidocs This package includes the Soprano API documentation in HTML @@ -81,16 +84,17 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/sopranocmd %{_bindir}/sopranod %{_bindir}/onto2vocabularyclass -%{_libdir}/lib*.so.* +%{_libdir}/libsoprano.so.4* +%{_libdir}/libsopranoclient.so.1* +%{_libdir}/libsopranonoindex.so.1* +%{_libdir}/libsopranoserver.so.1* %{_libdir}/soprano/ %{_datadir}/soprano/ -# Own this one here for lack of a better place (see also #334681) -%dir %{_datadir}/dbus-1/interfaces -%{_datadir}/dbus-1/interfaces/org.soprano.* +%{_datadir}/dbus-1/interfaces/org.soprano.*.xml %files devel %defattr(-,root,root,-) -%{_libdir}/lib*.so +%{_libdir}/libsoprano*.so %{_libdir}/pkgconfig/soprano.pc %{_includedir}/soprano/ %{_includedir}/Soprano/ @@ -103,6 +107,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 6 2009 Rex Dieter - 2.2.3-2 +- %%files: drop ownership of %%_datadir/dbus-1.0/interfaces (#334681) +- %%files: track shlib sonames +- make -apidocs noarch + * Mon Mar 2 2009 Luk???? Tinkl - 2.2.3-1 - update to 2.2.3, fix apidox building From linville at fedoraproject.org Wed May 6 14:34:37 2009 From: linville at fedoraproject.org (John W. Linville) Date: Wed, 6 May 2009 14:34:37 +0000 (UTC) Subject: rpms/kernel/F-11 linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch, NONE, 1.1 kernel.spec, 1.1591, 1.1592 Message-ID: <20090506143437.C823970108@cvs1.fedora.phx.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26210 Modified Files: kernel.spec Added Files: linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch Log Message: back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch: --- NEW FILE linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch --- >From d05b54aa8e2770cb427f188536f8f449793acba9 Mon Sep 17 00:00:00 2001 From: Luis R. Rodriguez Date: Mon, 4 May 2009 15:30:01 -0700 Subject: [PATCH] ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling This is a port of commit 91ed19f5f66a7fe544f0ec385e981f43491d1d5a Without this after scanning your device will set the association ID to something bogus and what is being reported is multicast/broadcast frame are not being received. For details see this bug report: https://bugzilla.redhat.com/show_bug.cgi?id=498502 >From the original commit: So that a new created IBSS network doesn't break on the first scan. It seems to Sujith and me that this stupid code unnecessary, too. So remove it... Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville Signed-off-by: Jouni Malinen Signed-off-by: Luis R. Rodriguez --- drivers/net/wireless/ath9k/main.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 3c04044..1cc826b 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c @@ -2300,11 +2300,6 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw, rfilt = ath_calcrxfilter(sc); ath9k_hw_setrxfilter(sc->sc_ah, rfilt); - if (changed_flags & FIF_BCN_PRBRESP_PROMISC) { - if (*total_flags & FIF_BCN_PRBRESP_PROMISC) - ath9k_hw_write_associd(sc->sc_ah, ath_bcast_mac, 0); - } - DPRINTF(sc, ATH_DBG_CONFIG, "Set HW RX filter: 0x%x\n", sc->rx.rxfilter); } -- 1.6.2.2.446.gfbdc0 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v retrieving revision 1.1591 retrieving revision 1.1592 diff -u -p -r1.1591 -r1.1592 --- kernel.spec 6 May 2009 03:12:04 -0000 1.1591 +++ kernel.spec 6 May 2009 14:34:07 -0000 1.1592 @@ -666,6 +666,7 @@ Patch682: linux-2.6-ipw2x00-age-scan-res Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch Patch685: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch +Patch686: linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch Patch700: linux-2.6-dma-debug-fixes.patch @@ -1311,6 +1312,9 @@ ApplyPatch linux-2.6-iwlagn-fix-hw-rfkil # back-port mac80211: fix beacon loss detection after scan ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch +# back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling +ApplyPatch linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch + # Fix up DMA debug code ApplyPatch linux-2.6-dma-debug-fixes.patch @@ -1963,6 +1967,9 @@ fi # and build. %changelog +* Wed May 06 2009 John W. Linville 2.6.29.2-130 +- back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling + * Wed May 06 2009 Dave Airlie 2.6.29.2-129 - drm-next: update with latest patch queue for upstream + intel fixes - drm-modesetting-radeon.patch: rebase onto drm-next From linville at fedoraproject.org Wed May 6 14:40:46 2009 From: linville at fedoraproject.org (John W. Linville) Date: Wed, 6 May 2009 14:40:46 +0000 (UTC) Subject: rpms/kernel/F-10 linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch, NONE, 1.1 kernel.spec, 1.1354, 1.1355 Message-ID: <20090506144046.31FDF70108@cvs1.fedora.phx.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26993 Modified Files: kernel.spec Added Files: linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch Log Message: back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch: --- NEW FILE linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch --- >From d05b54aa8e2770cb427f188536f8f449793acba9 Mon Sep 17 00:00:00 2001 From: Luis R. Rodriguez Date: Mon, 4 May 2009 15:30:01 -0700 Subject: [PATCH] ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling This is a port of commit 91ed19f5f66a7fe544f0ec385e981f43491d1d5a Without this after scanning your device will set the association ID to something bogus and what is being reported is multicast/broadcast frame are not being received. For details see this bug report: https://bugzilla.redhat.com/show_bug.cgi?id=498502 >From the original commit: So that a new created IBSS network doesn't break on the first scan. It seems to Sujith and me that this stupid code unnecessary, too. So remove it... Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville Signed-off-by: Jouni Malinen Signed-off-by: Luis R. Rodriguez --- drivers/net/wireless/ath9k/main.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 3c04044..1cc826b 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c @@ -2300,11 +2300,6 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw, rfilt = ath_calcrxfilter(sc); ath9k_hw_setrxfilter(sc->sc_ah, rfilt); - if (changed_flags & FIF_BCN_PRBRESP_PROMISC) { - if (*total_flags & FIF_BCN_PRBRESP_PROMISC) - ath9k_hw_write_associd(sc->sc_ah, ath_bcast_mac, 0); - } - DPRINTF(sc, ATH_DBG_CONFIG, "Set HW RX filter: 0x%x\n", sc->rx.rxfilter); } -- 1.6.2.2.446.gfbdc0 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1354 retrieving revision 1.1355 diff -u -p -r1.1354 -r1.1355 --- kernel.spec 28 Apr 2009 15:06:14 -0000 1.1354 +++ kernel.spec 6 May 2009 14:40:15 -0000 1.1355 @@ -648,6 +648,7 @@ Patch682: linux-2.6-ipw2x00-age-scan-res Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch Patch685: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch +Patch686: linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch Patch1515: linux-2.6.29-lirc.patch Patch1520: linux-2.6-hdpvr.patch @@ -1290,6 +1291,9 @@ ApplyPatch linux-2.6-iwlagn-fix-hw-rfkil # back-port mac80211: fix beacon loss detection after scan ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch +# back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling +ApplyPatch linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch + # http://www.lirc.org/ ApplyPatch linux-2.6.29-lirc.patch # http://hg.jannau.net/hdpvr/ @@ -1929,6 +1933,9 @@ fi %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Wed May 06 2009 John W. Linville 2.6.29.2-55 +- back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling + * Tue Apr 28 2009 Chuck Ebbert 2.6.29.2-54 - Make the kernel-vanilla package buildable again. From hadess at fedoraproject.org Wed May 6 15:06:49 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 6 May 2009 15:06:49 +0000 (UTC) Subject: rpms/gnome-bluetooth/F-11 .cvsignore, 1.14, 1.15 gnome-bluetooth.spec, 1.78, 1.79 sources, 1.15, 1.16 Message-ID: <20090506150650.089F470108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29928 Modified Files: .cvsignore gnome-bluetooth.spec sources Log Message: * Wed May 06 2009 Bastien Nocera 2.27.5-1 - Update to 2.27.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 14 Apr 2009 13:48:31 -0000 1.14 +++ .cvsignore 6 May 2009 15:06:18 -0000 1.15 @@ -1 +1 @@ -gnome-bluetooth-2.27.4.tar.bz2 +gnome-bluetooth-2.27.5.tar.bz2 Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gnome-bluetooth.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -p -r1.78 -r1.79 --- gnome-bluetooth.spec 1 May 2009 17:21:53 -0000 1.78 +++ gnome-bluetooth.spec 6 May 2009 15:06:18 -0000 1.79 @@ -1,6 +1,6 @@ Name: gnome-bluetooth -Version: 2.27.4 -Release: 4%{?dist} +Version: 2.27.5 +Release: 1%{?dist} Summary: Bluetooth graphical utilities Group: Applications/Communications @@ -187,6 +187,9 @@ fi %{_datadir}/gtk-doc/html/gnome-bluetooth/ %changelog +* Wed May 06 2009 Bastien Nocera 2.27.5-1 +- Update to 2.27.5 + * Fri May 01 2009 Bastien Nocera 2.27.4-4 - Touch the icon theme directory, should fix the icon not appearing properly on new installs Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 14 Apr 2009 13:48:31 -0000 1.15 +++ sources 6 May 2009 15:06:18 -0000 1.16 @@ -1 +1 @@ -e34180aa90d5d718b819572b21b76d08 gnome-bluetooth-2.27.4.tar.bz2 +aed68677df14a79b047760595e942638 gnome-bluetooth-2.27.5.tar.bz2 From kwizart at fedoraproject.org Wed May 6 15:11:52 2009 From: kwizart at fedoraproject.org (Nicolas Chauvet) Date: Wed, 6 May 2009 15:11:52 +0000 (UTC) Subject: rpms/python-alsaaudio/devel python-alsaaudio.spec, 1.8, 1.9 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 Message-ID: <20090506151152.8988170108@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/python-alsaaudio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30532 Modified Files: python-alsaaudio.spec sources .cvsignore Log Message: Update to 0.5 but wait for alsa-lib today's update Index: python-alsaaudio.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-alsaaudio/devel/python-alsaaudio.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- python-alsaaudio.spec 26 Feb 2009 20:42:54 -0000 1.8 +++ python-alsaaudio.spec 6 May 2009 15:11:21 -0000 1.9 @@ -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-alsaaudio -Version: 0.4 -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Python Alsa Bindings Group: Development/Languages @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 6 2009 kwizart < kwizart at gmail.com > - 0.5-1 +- Update to 0.5 + * Thu Feb 26 2009 Fedora Release Engineering - 0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-alsaaudio/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 12 Feb 2009 11:42:12 -0000 1.4 +++ sources 6 May 2009 15:11:21 -0000 1.5 @@ -1 +1 @@ -b312c28efba7db0494836a79f0a49898 pyalsaaudio-0.4.tar.gz +ca072c41d649c959f27f85d4fbc4dcec pyalsaaudio-0.5.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-alsaaudio/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 12 Feb 2009 11:42:12 -0000 1.4 +++ .cvsignore 6 May 2009 15:11:22 -0000 1.5 @@ -1 +1 @@ -pyalsaaudio-0.4.tar.gz +pyalsaaudio-0.5.tar.gz From hadess at fedoraproject.org Wed May 6 15:20:12 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 6 May 2009 15:20:12 +0000 (UTC) Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.14, 1.15 gnome-bluetooth.spec, 1.77, 1.78 sources, 1.15, 1.16 Message-ID: <20090506152012.366E370108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31280 Modified Files: .cvsignore gnome-bluetooth.spec sources Log Message: * Wed May 06 2009 Bastien Nocera 2.27.5-1 - Update to 2.27.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 14 Apr 2009 13:48:31 -0000 1.14 +++ .cvsignore 6 May 2009 15:19:40 -0000 1.15 @@ -1 +1 @@ -gnome-bluetooth-2.27.4.tar.bz2 +gnome-bluetooth-2.27.5.tar.bz2 Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 --- gnome-bluetooth.spec 1 May 2009 17:55:54 -0000 1.77 +++ gnome-bluetooth.spec 6 May 2009 15:19:41 -0000 1.78 @@ -1,6 +1,6 @@ Name: gnome-bluetooth -Version: 2.27.4 -Release: 4%{?dist} +Version: 2.27.5 +Release: 1%{?dist} Summary: Bluetooth graphical utilities Group: Applications/Communications @@ -184,6 +184,9 @@ fi %{_datadir}/gtk-doc/html/gnome-bluetooth/ %changelog +* Wed May 06 2009 Bastien Nocera 2.27.5-1 +- Update to 2.27.5 + * Fri May 01 2009 Bastien Nocera 2.27.4-4 - Use the scriplets on the wiki for the icon update Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 14 Apr 2009 13:48:31 -0000 1.15 +++ sources 6 May 2009 15:19:41 -0000 1.16 @@ -1 +1 @@ -e34180aa90d5d718b819572b21b76d08 gnome-bluetooth-2.27.4.tar.bz2 +aed68677df14a79b047760595e942638 gnome-bluetooth-2.27.5.tar.bz2 From s4504kr at fedoraproject.org Wed May 6 15:30:35 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Wed, 6 May 2009 15:30:35 +0000 (UTC) Subject: rpms/pdftk/devel pdftk.spec,1.19,1.20 Message-ID: <20090506153035.DE46970131@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32324 Modified Files: pdftk.spec Log Message: Remove workaround for brocken gcj Index: pdftk.spec =================================================================== RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- pdftk.spec 29 Apr 2009 16:04:01 -0000 1.19 +++ pdftk.spec 6 May 2009 15:30:05 -0000 1.20 @@ -3,7 +3,7 @@ Summary: The PDF Tool Kit Name: pdftk Version: 1.41 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: http://www.pdfhacks.com/pdftk/ # Remove java-lib/com because it's contains licensing issue @@ -53,7 +53,7 @@ rm -rf java_libs %build # Requires as a workaround for gcc BZ #39380 -export CFLAGS="${RPM_OPT_FLAGS} -O0" +export CFLAGS="${RPM_OPT_FLAGS}" jar tf %{_javadir}/itext-%{itextvers}.jar | grep '\.class$' | sed 's/\.class//' | sed 's|/|\.|g' > classes gjavah -d java_libs -cni -classpath=%{_javadir}/itext-%{itextvers}.jar \ `cat classes` @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Wed May 6 2009 Jochen Schmitt 1.41-19 +- Remove workaround for brocken gcj + * Wed Apr 29 2009 Jochen Schmitt 1.41-18 - Add bcprov and bcmail to classpath patch (BZ #497986) From astokes at fedoraproject.org Wed May 6 15:34:25 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 15:34:25 +0000 (UTC) Subject: rpms/sos/devel sos.spec,1.9,1.10 sources,1.5,1.6 Message-ID: <20090506153425.503A070108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/sos/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1074 Modified Files: sos.spec sources Log Message: remove instances of sysrq triggering Index: sos.spec =================================================================== RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sos.spec 26 Feb 2009 02:06:03 -0000 1.9 +++ sos.spec 6 May 2009 15:33:54 -0000 1.10 @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 1.8 -Release: 10%{?dist} +Release: 11%{?dist} Group: Application/Tools Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz License: GPLv2+ @@ -33,8 +33,8 @@ support technicians and developers. rm -rf ${RPM_BUILD_ROOT} install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport +%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT} +ln -s /usr/sbin/sosreport ${RPM_BUILD_ROOT}/usr/sbin/sysreport %find_lang %{name} %clean @@ -54,6 +54,10 @@ rm -rf ${RPM_BUILD_ROOT} %config %{_sysconfdir}/sos.conf %changelog +* Wed May 05 2009 Adam Stokes - 1.8-11 +- Remove all instances of sysrq +- Consistent macro usage in spec + * Wed Feb 25 2009 Fedora Release Engineering - 1.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sos/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 21 Jan 2009 23:35:42 -0000 1.5 +++ sources 6 May 2009 15:33:54 -0000 1.6 @@ -1 +1 @@ -75f91e5380dd1d31ccd6f7a2a9d242c4 sos-1.8.tar.gz +7aa30837d431ed2546b26d2ae30cd6bb sos-1.8.tar.gz From rhughes at fedoraproject.org Wed May 6 15:35:37 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Wed, 6 May 2009 15:35:37 +0000 (UTC) Subject: rpms/gnome-power-manager/F-11 gnome-power-manager-fix-display-blank.patch, NONE, 1.1 gnome-power-manager.spec, 1.156, 1.157 Message-ID: <20090506153537.9865770108@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-power-manager/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1292 Modified Files: gnome-power-manager.spec Added Files: gnome-power-manager-fix-display-blank.patch Log Message: * Wed May 06 2009 Richard Hughes - 2.26.1-3 - Backport a patch from upstream to fix backlight DPMS. - Fixes #498041 gnome-power-manager-fix-display-blank.patch: --- NEW FILE gnome-power-manager-fix-display-blank.patch --- commit ede53de9e51bc484de2e04fdd90b5e4107b2aba2 Author: Kyle McMartin Date: Wed May 6 16:28:28 2009 +0100 Only setup the blanking timeout when a timeout is set. Fixes rh#498041 Signed-off-by: Richard Hughes diff --git a/src/gpm-idle.c b/src/gpm-idle.c index 3e515e6..dbbd637 100644 --- a/src/gpm-idle.c +++ b/src/gpm-idle.c @@ -230,15 +230,18 @@ gpm_idle_evaluate (GpmIdle *idle) gpm_idle_set_mode (idle, GPM_IDLE_MODE_DIM); } - /* set up blank callback even when session is not idle */ - if (idle->priv->timeout_blank_id == 0) { + /* set up blank callback even when session is not idle, + * but only if we actually want to blank. */ + if (idle->priv->timeout_blank_id == 0 && + idle->priv->timeout_blank != 0) { egg_debug ("setting up blank callback"); idle->priv->timeout_blank_id = g_timeout_add_seconds (idle->priv->timeout_blank, (GSourceFunc) gpm_idle_blank_cb, idle); } /* only do the sleep timeout when the session is idle */ if (is_idle) { - if (idle->priv->timeout_sleep_id == 0) { + if (idle->priv->timeout_sleep_id == 0 && + idle->priv->timeout_sleep != 0) { egg_debug ("setting up sleep callback = %i", idle->priv->timeout_blank); idle->priv->timeout_sleep_id = g_timeout_add_seconds (idle->priv->timeout_sleep, (GSourceFunc) gpm_idle_sleep_cb, idle); } Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -p -r1.156 -r1.157 --- gnome-power-manager.spec 23 Apr 2009 12:42:51 -0000 1.156 +++ gnome-power-manager.spec 6 May 2009 15:35:07 -0000 1.157 @@ -4,7 +4,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager Version: 2.26.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and GFDL Group: Applications/System Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz @@ -12,6 +12,9 @@ Source: http://download.gnome.org/source # Already upstream: 1a170f276931360ff6255df667fb5e53678f4913 Patch0: gnome-power-manager-2.26.1-backport-gpp-correctly.patch +# Already upstream: ede53de9e51bc484de2e04fdd90b5e4107b2aba2 +Patch1: gnome-power-manager-fix-display-blank.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://projects.gnome.org/gnome-power-manager/ @@ -60,6 +63,7 @@ change preferences. %prep %setup -q %patch0 -p1 -b .backport-gpp +%patch1 -p1 -b .fix-backlight-dpms %build %configure \ @@ -167,6 +171,10 @@ fi %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml %changelog +* Wed May 06 2009 Richard Hughes - 2.26.1-3 +- Backport a patch from upstream to fix backlight DPMS. +- Fixes #498041 + * Thu Apr 23 2009 Richard Hughes - 2.26.1-2 - Backport a patch from upstream that was missed for 2.26.1 that fixes the DPMS timeout slider in gnome-power-preferences. From markmc at fedoraproject.org Wed May 6 15:46:28 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 6 May 2009 15:46:28 +0000 (UTC) Subject: rpms/libvirt/devel libvirt-0.6.3-hostdev-managed.patch, NONE, 1.1 Makefile, 1.2, 1.3 libvirt.spec, 1.128, 1.129 Message-ID: <20090506154628.7D0AA70108@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2354 Modified Files: Makefile libvirt.spec Added Files: libvirt-0.6.3-hostdev-managed.patch Log Message: * Wed May 6 2009 Mark McLoughlin - 0.6.3-5.fc12 - Fix handling of (bug #499386) libvirt-0.6.3-hostdev-managed.patch: --- NEW FILE libvirt-0.6.3-hostdev-managed.patch --- >From 3d7771e0570e09096ad9391a857dad48b150bc0c Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 6 May 2009 16:33:28 +0100 Subject: [PATCH] Fix qemu driver's interpretation of This change: Tue Mar 3 08:55:13 GMT 2009 Daniel P. Berrange Don't try to detach & reset PCI devices while running test suite for XML-> ARGV conversion. * src/qemu_driver.c: Add qemuPrepareHostDevices() helper to detach and reset PCI devices. * src/qemu_conf.c: Don't detach & reset PCI devices while building the command line argv accidentally did this: - if (hostdev->managed) { + if (!hostdev->managed) { Which results in managed='yes' not causing the device to be detached when the guest is starting. Signed-off-by: Mark McLoughlin --- src/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 5898026..59312c0 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn, if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) continue; - if (!hostdev->managed) { + if (hostdev->managed) { pciDevice *dev = pciGetDevice(conn, hostdev->source.subsys.u.pci.domain, hostdev->source.subsys.u.pci.bus, -- 1.6.0.6 Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- Makefile 15 Oct 2007 19:05:00 -0000 1.2 +++ Makefile 6 May 2009 15:45:57 -0000 1.3 @@ -19,3 +19,7 @@ MAKEFILE_COMMON := $(shell $(checkout-ma endif include $(MAKEFILE_COMMON) + +ifeq ($(BRANCH),devel) +include Makefile.preview +endif Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -p -r1.128 -r1.129 --- libvirt.spec 5 May 2009 13:38:26 -0000 1.128 +++ libvirt.spec 6 May 2009 15:45:57 -0000 1.129 @@ -55,14 +55,14 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream -# N/A Patch1: libvirt-0.6.3-shared-readonly-label.patch +Patch2: libvirt-0.6.3-hostdev-managed.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -217,6 +217,7 @@ of recent versions of Linux (and other O %prep %setup -q %patch1 -p1 +%patch2 -p1 %patch200 -p0 @@ -547,6 +548,9 @@ fi %endif %changelog +* Wed May 6 2009 Mark McLoughlin - 0.6.3-5.fc12 +- Fix handling of (bug #499386) + * Tue May 5 2009 Daniel Berrange - 0.6.3-4.fc12 - Fix readonly/shared disk image labelling (rhbz #493692) From markmc at fedoraproject.org Wed May 6 15:52:17 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 6 May 2009 15:52:17 +0000 (UTC) Subject: rpms/libvirt/F-11 libvirt-0.6.3-hostdev-managed.patch, NONE, 1.1 libvirt.spec, 1.126, 1.127 Message-ID: <20090506155217.D1CD070108@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3157 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-hostdev-managed.patch Log Message: * Wed May 6 2009 Mark McLoughlin - 0.6.2-5.fc11 - Fix handling of (bug #499386) libvirt-0.6.3-hostdev-managed.patch: --- NEW FILE libvirt-0.6.3-hostdev-managed.patch --- >From 3d7771e0570e09096ad9391a857dad48b150bc0c Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 6 May 2009 16:33:28 +0100 Subject: [PATCH] Fix qemu driver's interpretation of This change: Tue Mar 3 08:55:13 GMT 2009 Daniel P. Berrange Don't try to detach & reset PCI devices while running test suite for XML-> ARGV conversion. * src/qemu_driver.c: Add qemuPrepareHostDevices() helper to detach and reset PCI devices. * src/qemu_conf.c: Don't detach & reset PCI devices while building the command line argv accidentally did this: - if (hostdev->managed) { + if (!hostdev->managed) { Which results in managed='yes' not causing the device to be detached when the guest is starting. Signed-off-by: Mark McLoughlin --- src/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 5898026..59312c0 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn, if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) continue; - if (!hostdev->managed) { + if (hostdev->managed) { pciDevice *dev = pciGetDevice(conn, hostdev->source.subsys.u.pci.domain, hostdev->source.subsys.u.pci.bus, -- 1.6.0.6 Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- libvirt.spec 5 May 2009 13:01:15 -0000 1.126 +++ libvirt.spec 6 May 2009 15:51:47 -0000 1.127 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -75,6 +75,8 @@ Source: libvirt-%{version}.tar.gz Patch0: libvirt-0.6.2-qemu-drive-format.patch # Fix shared/readonly disk labelling Patch1: libvirt-0.6.2-shared-readonly-label.patch +# Fix +Patch2: libvirt-0.6.3-hostdev-managed.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -231,6 +233,7 @@ of recent versions of Linux (and other O %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch200 -p0 @@ -554,6 +557,9 @@ fi %endif %changelog +* Wed May 6 2009 Mark McLoughlin - 0.6.2-5.fc11 +- Fix handling of (bug #499386) + * Tue May 5 2009 Daniel P. Berrange - 0.6.2-4.fc11 - Fix labelling of shared/readonly disks (rhbz #493692) From markmc at fedoraproject.org Wed May 6 15:52:38 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 6 May 2009 15:52:38 +0000 (UTC) Subject: rpms/libvirt/devel Makefile,1.3,1.4 Message-ID: <20090506155238.B8F3270108@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3186 Modified Files: Makefile Log Message: Revert accidentally committed change Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- Makefile 6 May 2009 15:45:57 -0000 1.3 +++ Makefile 6 May 2009 15:52:08 -0000 1.4 @@ -19,7 +19,3 @@ MAKEFILE_COMMON := $(shell $(checkout-ma endif include $(MAKEFILE_COMMON) - -ifeq ($(BRANCH),devel) -include Makefile.preview -endif From pkgdb at fedoraproject.org Wed May 6 16:02:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 16:02:27 +0000 Subject: [pkgdb] eclipse-dltk: akurtakov has requested watchcommits Message-ID: <20090506160227.BF9DD10F89F@bastion2.fedora.phx.redhat.com> akurtakov has requested the watchcommits acl on eclipse-dltk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-dltk From pkgdb at fedoraproject.org Wed May 6 16:02:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 16:02:28 +0000 Subject: [pkgdb] eclipse-dltk: akurtakov has requested watchbugzilla Message-ID: <20090506160228.16FCD10F8A2@bastion2.fedora.phx.redhat.com> akurtakov has requested the watchbugzilla acl on eclipse-dltk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-dltk From pkgdb at fedoraproject.org Wed May 6 16:02:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 16:02:28 +0000 Subject: [pkgdb] eclipse-dltk: akurtakov has requested commit Message-ID: <20090506160228.4536F10F8A5@bastion2.fedora.phx.redhat.com> akurtakov has requested the commit acl on eclipse-dltk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-dltk From crobinso at fedoraproject.org Wed May 6 16:04:08 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:04:08 +0000 (UTC) Subject: rpms/python-virtinst/F-11 virtinst-0.400.3-fix-pci-assign.patch, NONE, 1.1 python-virtinst.spec, 1.67, 1.68 Message-ID: <20090506160408.7AC0B70108@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5296 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-pci-assign.patch Log Message: Fix PCI assignment (bz 499267) virtinst-0.400.3-fix-pci-assign.patch: --- NEW FILE virtinst-0.400.3-fix-pci-assign.patch --- diff -rup virtinst-0.400.3/virtinst/VirtualHostDevice.py new/virtinst/VirtualHostDevice.py --- virtinst-0.400.3/virtinst/VirtualHostDevice.py 2009-05-06 11:58:57.000000000 -0400 +++ new/virtinst/VirtualHostDevice.py 2009-05-06 11:59:20.000000000 -0400 @@ -201,8 +201,9 @@ class VirtualHostDevicePCI(VirtualHostDe try: # Do this as a sanity check, so that we don't fail at domain # start time - self._nodedev.dettach() - self._nodedev.reset() + node = conn.nodeDeviceLookupByName(self._nodedev.name) + node.dettach() + node.reset() except Exception, e: raise RuntimeError(_("Could not detach PCI device: %s" % str(e))) Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -p -r1.67 -r1.68 --- python-virtinst.spec 21 Apr 2009 17:19:02 -0000 1.67 +++ python-virtinst.spec 6 May 2009 16:03:37 -0000 1.68 @@ -31,6 +31,8 @@ Patch6: %{appname}-%{version}-fix-floppy Patch7: %{appname}-%{version}-updated-trans.patch # Only throw warnings if we fail to relabel install media (bz 496340) Patch8: %{appname}-%{version}-selinux-warn.patch +# Fix PCI assignment detach/reset calls (bz 499267) +Patch9: %{appname}-%{version}-fix-pci-assign.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +67,7 @@ and install new VMs) and virt-clone (clo %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build python setup.py build @@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-convert %changelog +* Wed May 06 2009 Cole Robinson - 0.400.3-8.fc11 +- Fix PCI assignment (bz 499267) + * Tue Apr 21 2009 Cole Robinson - 0.400.3-7.fc11 - Only warn if selinux labeling appears to be wrong (bz 496340) From crobinso at fedoraproject.org Wed May 6 16:11:18 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:11:18 +0000 (UTC) Subject: rpms/python-virtinst/F-11 python-virtinst.spec,1.68,1.69 Message-ID: <20090506161118.29AB170108@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6153 Modified Files: python-virtinst.spec Log Message: Bump spec. Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -p -r1.68 -r1.69 --- python-virtinst.spec 6 May 2009 16:03:37 -0000 1.68 +++ python-virtinst.spec 6 May 2009 16:10:47 -0000 1.69 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 7%{_extra_release} +Release: 8%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch From crobinso at fedoraproject.org Wed May 6 16:12:32 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:12:32 +0000 (UTC) Subject: rpms/python-virtinst/devel virtinst-0.400.3-fix-pci-assign.patch, NONE, 1.1 python-virtinst.spec, 1.67, 1.68 Message-ID: <20090506161232.D83F570108@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6435 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-pci-assign.patch Log Message: Fix PCI assignment (bz 499267) virtinst-0.400.3-fix-pci-assign.patch: --- NEW FILE virtinst-0.400.3-fix-pci-assign.patch --- diff -rup virtinst-0.400.3/virtinst/VirtualHostDevice.py new/virtinst/VirtualHostDevice.py --- virtinst-0.400.3/virtinst/VirtualHostDevice.py 2009-05-06 11:58:57.000000000 -0400 +++ new/virtinst/VirtualHostDevice.py 2009-05-06 11:59:20.000000000 -0400 @@ -201,8 +201,9 @@ class VirtualHostDevicePCI(VirtualHostDe try: # Do this as a sanity check, so that we don't fail at domain # start time - self._nodedev.dettach() - self._nodedev.reset() + node = conn.nodeDeviceLookupByName(self._nodedev.name) + node.dettach() + node.reset() except Exception, e: raise RuntimeError(_("Could not detach PCI device: %s" % str(e))) Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -p -r1.67 -r1.68 --- python-virtinst.spec 21 Apr 2009 16:19:26 -0000 1.67 +++ python-virtinst.spec 6 May 2009 16:12:02 -0000 1.68 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 7%{_extra_release} +Release: 8%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch @@ -31,6 +31,8 @@ Patch6: %{appname}-%{version}-fix-floppy Patch7: %{appname}-%{version}-updated-trans.patch # Only throw warnings if we fail to relabel install media (bz 496340) Patch8: %{appname}-%{version}-selinux-warn.patch +# Fix PCI assignment detach/reset calls (bz 499267) +Patch9: %{appname}-%{version}-fix-pci-assign.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +67,7 @@ and install new VMs) and virt-clone (clo %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build python setup.py build @@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-convert %changelog +* Wed May 06 2009 Cole Robinson - 0.400.3-8.fc12 +- Fix PCI assignment (bz 499267) + * Tue Apr 21 2009 Cole Robinson - 0.400.3-7.fc11 - Only warn if selinux labeling appears to be wrong (bz 496340) From tbzatek at fedoraproject.org Wed May 6 16:15:04 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Wed, 6 May 2009 16:15:04 +0000 (UTC) Subject: rpms/gvfs/F-11 gvfs-1.2.3-ftp-filesize.patch, NONE, 1.1 gvfs.spec, 1.129, 1.130 Message-ID: <20090506161504.0B37D70108@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6833 Modified Files: gvfs.spec Added Files: gvfs-1.2.3-ftp-filesize.patch Log Message: * Wed May 06 2009 Tomas Bzatek - 1.2.2-7 - FTP: fix 32-bit file size string conversion (#499286) gvfs-1.2.3-ftp-filesize.patch: --- NEW FILE gvfs-1.2.3-ftp-filesize.patch --- diff -up gvfs-1.2.2/daemon/gvfsbackendftp.c.orig gvfs-1.2.2/daemon/gvfsbackendftp.c --- gvfs-1.2.2/daemon/gvfsbackendftp.c.orig 2009-04-11 20:46:38.000000000 +0200 +++ gvfs-1.2.2/daemon/gvfsbackendftp.c 2009-05-06 17:09:42.000000000 +0200 @@ -1236,7 +1236,7 @@ dir_default_iter_process (gpointer else if (symlink) *symlink = NULL; - g_file_info_set_size (info, strtoul (result.fe_size, NULL, 10)); + g_file_info_set_size (info, g_ascii_strtoull (result.fe_size, NULL, 10)); gvfs_file_info_populate_default (info, s, type == 'f' ? G_FILE_TYPE_REGULAR : @@ -2228,7 +2228,7 @@ create_file_info (GVfsBackendFtp *ftp, F gvfs_file_info_populate_default (info, filename, G_FILE_TYPE_REGULAR); - g_file_info_set_size (info, strtoul (conn->read_buffer+4, NULL, 0)); + g_file_info_set_size (info, g_ascii_strtoull (conn->read_buffer+4, NULL, 0)); g_file_info_set_is_hidden (info, TRUE); } Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -p -r1.129 -r1.130 --- gvfs.spec 6 May 2009 13:02:23 -0000 1.129 +++ gvfs.spec 6 May 2009 16:14:33 -0000 1.130 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.2.2 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -36,6 +36,8 @@ Patch2: gvfs-1.1.7-gdu-computer-expose-d Patch3: gvfs-bash-completion.patch # From svn: Patch4: gvfs-1.2.2-ssh-auth-sock.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=499286 +Patch5: gvfs-1.2.3-ftp-filesize.patch # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor # @@ -72,6 +74,7 @@ Patch114: 0014-gvfs-use-device-media-det # https://bugzilla.redhat.com/show_bug.cgi?id=498649 Patch115: 0015-gvfs-respect-presentation-hide-for-drives.patch + %description The gvfs package provides backend implementations for the gio framework in GLib. It includes ftp, sftp, cifs. @@ -156,6 +159,7 @@ media players (Media Transfer Protocol) %patch2 -p1 -b .computer-expose-devices %patch3 -p1 -b .bash-completion %patch4 -p0 -b .ssh-auth-sock +%patch5 -p1 -b .ftp-size %patch101 -p1 -b .gdu-volume-monitor %patch102 -p1 -b .gdu-volumes-typo @@ -315,6 +319,9 @@ update-desktop-database &> /dev/null ||: %changelog +* Wed May 06 2009 Tomas Bzatek - 1.2.2-7 +- FTP: fix 32-bit file size string conversion (#499286) + * Wed May 06 2009 David Zeuthen - 1.2.2-6 - Rebuild From hadess at fedoraproject.org Wed May 6 16:16:39 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 6 May 2009 16:16:39 +0000 (UTC) Subject: rpms/gstreamer/devel .cvsignore, 1.36, 1.37 gstreamer.spec, 1.96, 1.97 sources, 1.37, 1.38 Message-ID: <20090506161639.7D5BF70108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7090 Modified Files: .cvsignore gstreamer.spec sources Log Message: * Wed May 06 2009 Bastien Nocera 0.10.22.4-1 - Update to 0.10.22.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- .cvsignore 20 Jan 2009 16:13:10 -0000 1.36 +++ .cvsignore 6 May 2009 16:16:08 -0000 1.37 @@ -1 +1 @@ -gstreamer-0.10.22.tar.bz2 +gstreamer-0.10.22.4.tar.bz2 Index: gstreamer.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -p -r1.96 -r1.97 --- gstreamer.spec 26 Feb 2009 19:19:17 -0000 1.96 +++ gstreamer.spec 6 May 2009 16:16:09 -0000 1.97 @@ -5,8 +5,8 @@ %define _libxml2 2.4.0 Name: %{gstreamer} -Version: 0.10.22 -Release: 4%{?dist} +Version: 0.10.22.4 +Release: 1%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia @@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.gstreamer %changelog +* Wed May 06 2009 Bastien Nocera 0.10.22.4-1 +- Update to 0.10.22.4 + * Thu Feb 26 2009 Warren Togami - 0.10.22-4 - Move req on which and pkgconfig to gstreamer-tools Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- sources 20 Jan 2009 16:13:11 -0000 1.37 +++ sources 6 May 2009 16:16:09 -0000 1.38 @@ -1 +1 @@ -35dd8598837af4074753afe5b59e8ef2 gstreamer-0.10.22.tar.bz2 +5d7c532a503d77df34c4df830f00c49a gstreamer-0.10.22.4.tar.bz2 From hadess at fedoraproject.org Wed May 6 16:21:59 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 6 May 2009 16:21:59 +0000 (UTC) Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.20, 1.21 gstreamer-plugins-base.spec, 1.72, 1.73 sources, 1.21, 1.22 Message-ID: <20090506162159.E499970108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7676 Modified Files: .cvsignore gstreamer-plugins-base.spec sources Log Message: * Wed May 06 2009 Bastien Nocera 0.10.22.4-1 - Update to 0.10.22.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- .cvsignore 20 Jan 2009 16:20:15 -0000 1.20 +++ .cvsignore 6 May 2009 16:21:29 -0000 1.21 @@ -1 +1 @@ -gst-plugins-base-0.10.22.tar.bz2 +gst-plugins-base-0.10.22.4.tar.bz2 Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -p -r1.72 -r1.73 --- gstreamer-plugins-base.spec 25 Feb 2009 01:32:41 -0000 1.72 +++ gstreamer-plugins-base.spec 6 May 2009 16:21:29 -0000 1.73 @@ -4,8 +4,8 @@ %define _gst 0.10.22 Name: %{gstreamer}-plugins-base -Version: 0.10.22 -Release: 2%{?dist} +Version: 0.10.22.4 +Release: 1%{?dist} Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia @@ -246,6 +246,9 @@ GStreamer Base Plugins library developme %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Wed May 06 2009 Bastien Nocera 0.10.22.4-1 +- Update to 0.10.22.4 + * Tue Feb 24 2009 Fedora Release Engineering - 0.10.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 20 Jan 2009 16:20:15 -0000 1.21 +++ sources 6 May 2009 16:21:29 -0000 1.22 @@ -1 +1 @@ -5d0f1e07f8f6db564971b50f75261e8a gst-plugins-base-0.10.22.tar.bz2 +f80c66c63b91ec700c2e989a51daa02f gst-plugins-base-0.10.22.4.tar.bz2 From iankent at fedoraproject.org Wed May 6 16:27:36 2009 From: iankent at fedoraproject.org (Ian Kent) Date: Wed, 6 May 2009 16:27:36 +0000 (UTC) Subject: rpms/autofs/F-11 autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch, NONE, 1.1 autofs.spec, 1.279, 1.280 Message-ID: <20090506162736.0BAC270108@cvs1.fedora.phx.redhat.com> Author: iankent Update of /cvs/pkgs/rpms/autofs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8287 Modified Files: autofs.spec Added Files: autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch Log Message: * Wed Apr 6 2009 Ian Kent - 1:5.0.4-26 - dont fail on ipv6 address adding host. autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch: --- NEW FILE autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch --- autofs-5.0.4 - dont fail on ipv6 address adding host From: Ian Kent We don't have IPv6 support enabled in libtirpc yet. When we perform name (or address) lookup and we get a mixture of IPv4 and IPv6 addresses the lack of IPv6 support can cause the parse_location() function to fail to add any valid hosts when in fact it should. --- include/replicated.h | 1 + modules/replicated.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/replicated.h b/include/replicated.h index e0133ff..fd87c08 100644 --- a/include/replicated.h +++ b/include/replicated.h @@ -21,6 +21,7 @@ #define PROXIMITY_SUBNET 0x0002 #define PROXIMITY_NET 0x0004 #define PROXIMITY_OTHER 0x0008 +#define PROXIMITY_UNSUPPORTED 0x0010 #define NFS2_SUPPORTED 0x0010 #define NFS3_SUPPORTED 0x0020 diff --git a/modules/replicated.c b/modules/replicated.c index 79845d0..a66de9f 100644 --- a/modules/replicated.c +++ b/modules/replicated.c @@ -181,7 +181,7 @@ static unsigned int get_proximity(struct sockaddr *host_addr) case AF_INET6: #ifndef INET6 - return PROXIMITY_ERROR; + return PROXIMITY_UNSUPPORTED; #else addr6 = (struct sockaddr_in6 *) host_addr; hst6_addr = (struct in6_addr *) &addr6->sin6_addr; @@ -1048,6 +1048,13 @@ static int add_new_host(struct host **list, int addr_len; prx = get_proximity(host_addr->ai_addr); + /* + * If we tried to add an IPv6 address and we don't have IPv6 + * support return success in the hope of getting an IPv4 + * address later. + */ + if (prx == PROXIMITY_UNSUPPORTED) + return 1; if (prx == PROXIMITY_ERROR) return 0; Index: autofs.spec =================================================================== RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v retrieving revision 1.279 retrieving revision 1.280 diff -u -p -r1.279 -r1.280 --- autofs.spec 16 Apr 2009 04:12:54 -0000 1.279 +++ autofs.spec 6 May 2009 16:27:05 -0000 1.280 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.4 -Release: 25 +Release: 26 Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -51,6 +51,7 @@ Patch38: autofs-5.0.4-fix-st_remove_task Patch39: autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch Patch40: autofs-5.0.4-zero-s_magic-is-valid.patch Patch41: autofs-5.0.4-use-percent-hack-for-master.patch +Patch42: autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.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 libtirpc-devel Requires: kernel >= 2.6.17 @@ -133,6 +134,7 @@ echo %{version}-%{release} > .version %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -185,6 +187,9 @@ fi %{_libdir}/autofs/ %changelog +* Wed Apr 6 2009 Ian Kent - 1:5.0.4-26 +- dont fail on ipv6 address adding host. + * Thu Apr 16 2009 Ian Kent - 1:5.0.4-25 - fix lsb init script header. - fix memory leak reading ldap master map. From iankent at fedoraproject.org Wed May 6 16:29:50 2009 From: iankent at fedoraproject.org (Ian Kent) Date: Wed, 6 May 2009 16:29:50 +0000 (UTC) Subject: rpms/autofs/F-11 autofs.spec,1.280,1.281 Message-ID: <20090506162950.5389270108@cvs1.fedora.phx.redhat.com> Author: iankent Update of /cvs/pkgs/rpms/autofs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8580 Modified Files: autofs.spec Log Message: * Wed May 6 2009 Ian Kent - 1:5.0.4-26 - fix date in changelog entry. Index: autofs.spec =================================================================== RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v retrieving revision 1.280 retrieving revision 1.281 diff -u -p -r1.280 -r1.281 --- autofs.spec 6 May 2009 16:27:05 -0000 1.280 +++ autofs.spec 6 May 2009 16:29:19 -0000 1.281 @@ -187,7 +187,7 @@ fi %{_libdir}/autofs/ %changelog -* Wed Apr 6 2009 Ian Kent - 1:5.0.4-26 +* Wed May 6 2009 Ian Kent - 1:5.0.4-26 - dont fail on ipv6 address adding host. * Thu Apr 16 2009 Ian Kent - 1:5.0.4-25 From orion at fedoraproject.org Wed May 6 16:32:32 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Wed, 6 May 2009 16:32:32 +0000 (UTC) Subject: rpms/perl-Net-Patricia/devel .cvsignore, 1.3, 1.4 perl-Net-Patricia.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <20090506163232.9262470108@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/perl-Net-Patricia/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9263 Modified Files: .cvsignore perl-Net-Patricia.spec sources Log Message: * Wed May 6 2009 Orion Poplawski 1.15-1 - Update to 1.15 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Patricia/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 31 Jan 2006 21:51:53 -0000 1.3 +++ .cvsignore 6 May 2009 16:32:02 -0000 1.4 @@ -1 +1 @@ -Net-Patricia-1.014.tar.gz +Net-Patricia-1.15.tar.gz Index: perl-Net-Patricia.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Patricia/devel/perl-Net-Patricia.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- perl-Net-Patricia.spec 26 Feb 2009 23:17:10 -0000 1.9 +++ perl-Net-Patricia.spec 6 May 2009 16:32:02 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Net-Patricia -Version: 1.014 -Release: 7%{?dist} +Version: 1.15 +Release: 1%{?dist} Summary: Patricia Trie perl module for fast IP address lookups License: GPLv2+ Group: Development/Libraries @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed May 6 2009 Orion Poplawski 1.15-1 +- Update to 1.15 + * Thu Feb 26 2009 Fedora Release Engineering - 1.014-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Patricia/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 31 Jan 2006 21:51:53 -0000 1.3 +++ sources 6 May 2009 16:32:02 -0000 1.4 @@ -1 +1 @@ -16ec73b5b514dbe4275e349fca236c49 Net-Patricia-1.014.tar.gz +c068c3e061cca7fc6c721e56930465f8 Net-Patricia-1.15.tar.gz From crobinso at fedoraproject.org Wed May 6 16:33:04 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:33:04 +0000 (UTC) Subject: rpms/libvirt/F-11 libvirt-0.6.3-refresh-qemu-caps.patch, NONE, 1.1 libvirt.spec, 1.127, 1.128 Message-ID: <20090506163304.78A6470108@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9126 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-refresh-qemu-caps.patch Log Message: Refresh qemu caps when getCapabilities is called (bug #460649) libvirt-0.6.3-refresh-qemu-caps.patch: --- NEW FILE libvirt-0.6.3-refresh-qemu-caps.patch --- commit 0e51348cb9aeafe5e2fd6469a4bde0baa1eb8720 Author: Cole Robinson Date: Mon May 4 15:06:03 2009 -0400 Refresh QEMU driver capabilities for each getCapabilities call. Also fix up a couple issues where caps are accessed without locking the driver structure. diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 23ea961..790dac6 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1885,10 +1885,12 @@ static int qemudGetNodeInfo(virConnectPtr conn, static char *qemudGetCapabilities(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; - char *xml; + char *xml = NULL; qemuDriverLock(driver); - if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) + virCapabilitiesFree(qemu_driver->caps); + if ((qemu_driver->caps = qemudCapsInit()) == NULL || + (xml = virCapabilitiesFormatXML(driver->caps)) == NULL) virReportOOMError(conn); qemuDriverUnlock(driver); @@ -3169,20 +3171,26 @@ cleanup: return ret; } -static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) +static int qemudNodeGetSecurityModel(virConnectPtr conn, + virSecurityModelPtr secmodel) { struct qemud_driver *driver = (struct qemud_driver *)conn->privateData; char *p; + int ret = 0; - if (!driver->securityDriver) - return -2; + qemuDriverLock(driver); + if (!driver->securityDriver) { + ret = -2; + goto cleanup; + } p = driver->caps->host.secModel.model; if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("security model string exceeds max %d bytes"), VIR_SECURITY_MODEL_BUFLEN-1); - return -1; + ret = -1; + goto cleanup; } strcpy(secmodel->model, p); @@ -3191,10 +3199,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("security DOI string exceeds max %d bytes"), VIR_SECURITY_DOI_BUFLEN-1); - return -1; + ret = -1; + goto cleanup; } strcpy(secmodel->doi, p); - return 0; + +cleanup: + qemuDriverUnlock(driver); + return ret; } /* TODO: check seclabel restore */ Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -p -r1.127 -r1.128 --- libvirt.spec 6 May 2009 15:51:47 -0000 1.127 +++ libvirt.spec 6 May 2009 16:32:34 -0000 1.128 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -77,6 +77,8 @@ Patch0: libvirt-0.6.2-qemu-drive-format. Patch1: libvirt-0.6.2-shared-readonly-label.patch # Fix Patch2: libvirt-0.6.3-hostdev-managed.patch +# Refresh qemu caps when getCapabilities is called (bz 460649) +Patch3: libvirt-0.6.3-refresh-qemu-caps.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -234,6 +236,7 @@ of recent versions of Linux (and other O %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch200 -p0 @@ -557,6 +560,9 @@ fi %endif %changelog +* Wed May 6 2009 Cole Robinson - 0.6.2-6.fc11 +- Refresh qemu caps when getCapabilities is called (bug #460649) + * Wed May 6 2009 Mark McLoughlin - 0.6.2-5.fc11 - Fix handling of (bug #499386) From iankent at fedoraproject.org Wed May 6 16:33:20 2009 From: iankent at fedoraproject.org (Ian Kent) Date: Wed, 6 May 2009 16:33:20 +0000 (UTC) Subject: rpms/autofs/F-11 autofs.spec,1.281,1.282 Message-ID: <20090506163320.6E52170135@cvs1.fedora.phx.redhat.com> Author: iankent Update of /cvs/pkgs/rpms/autofs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9332 Modified Files: autofs.spec Log Message: * Wed May 6 2009 Ian Kent - 1:5.0.4-27 - fix revision number also. Index: autofs.spec =================================================================== RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v retrieving revision 1.281 retrieving revision 1.282 diff -u -p -r1.281 -r1.282 --- autofs.spec 6 May 2009 16:29:19 -0000 1.281 +++ autofs.spec 6 May 2009 16:32:50 -0000 1.282 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.4 -Release: 26 +Release: 27 Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -187,7 +187,7 @@ fi %{_libdir}/autofs/ %changelog -* Wed May 6 2009 Ian Kent - 1:5.0.4-26 +* Wed May 6 2009 Ian Kent - 1:5.0.4-27 - dont fail on ipv6 address adding host. * Thu Apr 16 2009 Ian Kent - 1:5.0.4-25 From crobinso at fedoraproject.org Wed May 6 16:33:46 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:33:46 +0000 (UTC) Subject: rpms/libvirt/devel libvirt-0.6.3-refresh-qemu-caps.patch, NONE, 1.1 libvirt.spec, 1.129, 1.130 Message-ID: <20090506163346.B4CA970131@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9542 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-refresh-qemu-caps.patch Log Message: Refresh qemu caps when getCapabilities is called (bug #460649) libvirt-0.6.3-refresh-qemu-caps.patch: --- NEW FILE libvirt-0.6.3-refresh-qemu-caps.patch --- commit 0e51348cb9aeafe5e2fd6469a4bde0baa1eb8720 Author: Cole Robinson Date: Mon May 4 15:06:03 2009 -0400 Refresh QEMU driver capabilities for each getCapabilities call. Also fix up a couple issues where caps are accessed without locking the driver structure. diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 23ea961..790dac6 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1885,10 +1885,12 @@ static int qemudGetNodeInfo(virConnectPtr conn, static char *qemudGetCapabilities(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; - char *xml; + char *xml = NULL; qemuDriverLock(driver); - if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) + virCapabilitiesFree(qemu_driver->caps); + if ((qemu_driver->caps = qemudCapsInit()) == NULL || + (xml = virCapabilitiesFormatXML(driver->caps)) == NULL) virReportOOMError(conn); qemuDriverUnlock(driver); @@ -3169,20 +3171,26 @@ cleanup: return ret; } -static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) +static int qemudNodeGetSecurityModel(virConnectPtr conn, + virSecurityModelPtr secmodel) { struct qemud_driver *driver = (struct qemud_driver *)conn->privateData; char *p; + int ret = 0; - if (!driver->securityDriver) - return -2; + qemuDriverLock(driver); + if (!driver->securityDriver) { + ret = -2; + goto cleanup; + } p = driver->caps->host.secModel.model; if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("security model string exceeds max %d bytes"), VIR_SECURITY_MODEL_BUFLEN-1); - return -1; + ret = -1; + goto cleanup; } strcpy(secmodel->model, p); @@ -3191,10 +3199,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("security DOI string exceeds max %d bytes"), VIR_SECURITY_DOI_BUFLEN-1); - return -1; + ret = -1; + goto cleanup; } strcpy(secmodel->doi, p); - return 0; + +cleanup: + qemuDriverUnlock(driver); + return ret; } /* TODO: check seclabel restore */ Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -p -r1.129 -r1.130 --- libvirt.spec 6 May 2009 15:45:57 -0000 1.129 +++ libvirt.spec 6 May 2009 16:33:16 -0000 1.130 @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -63,6 +63,8 @@ Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream Patch1: libvirt-0.6.3-shared-readonly-label.patch Patch2: libvirt-0.6.3-hostdev-managed.patch +# Refresh qemu caps when getCapabilities is called (bz 460649) +Patch3: libvirt-0.6.3-refresh-qemu-caps.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -218,6 +220,7 @@ of recent versions of Linux (and other O %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch200 -p0 @@ -548,6 +551,9 @@ fi %endif %changelog +* Wed May 6 2009 Cole Robinson - 0.6.3-6.fc12 +- Refresh qemu caps when getCapabilities is called (bug #460649) + * Wed May 6 2009 Mark McLoughlin - 0.6.3-5.fc12 - Fix handling of (bug #499386) From kyle at fedoraproject.org Wed May 6 16:39:42 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 6 May 2009 16:39:42 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.30-rc4-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.1060, 1.1061 config-generic, 1.282, 1.283 kernel.spec, 1.1539, 1.1540 linux-2.6-utrace.patch, 1.110, 1.111 sources, 1.1019, 1.1020 upstream, 1.933, 1.934 linux-2.6-cdrom-door-status.patch, 1.3, NONE linux-2.6-iwl3945-remove-useless-exports.patch, 1.1, NONE Message-ID: <20090506163942.B22DF70108@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11034 Modified Files: .cvsignore config-generic kernel.spec linux-2.6-utrace.patch sources upstream Added Files: patch-2.6.30-rc4-git3.bz2.sign Removed Files: linux-2.6-cdrom-door-status.patch linux-2.6-iwl3945-remove-useless-exports.patch Log Message: * Wed May 06 2009 Kyle McMartin - Linux 2.6.30-rc4-git3 - linux-2.6-cdrom-door-status.patch: merged upstream. - linux-2.6-iwl3945-remove-useless-exports.patch: merged upstream. - linux-2.6-utrace.patch: rebase against changes to fs/proc/array.c - USB_NET_CDC_EEM=m --- NEW FILE patch-2.6.30-rc4-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBKAXx4yGugalF9Dw4RAqfWAJoDNLhYZCKzgvuWxmBYrc4wXLmRtQCdEbFB 7BQzBfklrSPdsImfPTO2BBQ= =qPCI -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1060 retrieving revision 1.1061 diff -u -p -r1.1060 -r1.1061 --- .cvsignore 30 Apr 2009 21:03:29 -0000 1.1060 +++ .cvsignore 6 May 2009 16:39:11 -0000 1.1061 @@ -7,3 +7,4 @@ kernel-2.6.29 linux-2.6.29.tar.bz2 patch-2.6.29-git15.bz2 patch-2.6.30-rc4.bz2 +patch-2.6.30-rc4-git3.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.282 retrieving revision 1.283 diff -u -p -r1.282 -r1.283 --- config-generic 22 Apr 2009 15:40:04 -0000 1.282 +++ config-generic 6 May 2009 16:39:11 -0000 1.283 @@ -2820,6 +2820,7 @@ CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_ZAURUS=m # Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1539 retrieving revision 1.1540 diff -u -p -r1.1539 -r1.1540 --- kernel.spec 1 May 2009 18:29:15 -0000 1.1539 +++ kernel.spec 6 May 2009 16:39:11 -0000 1.1540 @@ -58,7 +58,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -102,7 +102,7 @@ Summary: The Linux kernel %define doc_build_fail true %endif -%define rawhide_skip_docs 0 +%define rawhide_skip_docs 1 %if 0%{?rawhide_skip_docs} %define with_doc 0 %endif @@ -641,10 +641,6 @@ Patch800: linux-2.6-crash-driver.patch Patch1515: linux-2.6.29-lirc.patch -# Fix the return code CD accesses when the CDROM drive door is closed -# but the drive isn't yet ready. -Patch1550: linux-2.6-cdrom-door-status.patch - Patch1700: agp-set_memory_ucwb.patch # nouveau + drm fixes Patch1811: drm-next.patch @@ -676,8 +672,6 @@ Patch3000: linux-2.6-btrfs-experimental- Patch9002: cpufreq-add-atom-to-p4-clockmod.patch -Patch9100: linux-2.6-iwl3945-remove-useless-exports.patch - #snmp fixes Patch10000: linux-2.6-missing-rfc2465-stats.patch @@ -1209,10 +1203,6 @@ ApplyPatch linux-2.6-crash-driver.patch # http://www.lirc.org/ ApplyPatch linux-2.6.29-lirc.patch -# Fix the return code CD accesses when the CDROM drive door is closed -# but the drive isn't yet ready. -ApplyPatch linux-2.6-cdrom-door-status.patch - ApplyPatch linux-2.6-e1000-ich9.patch ApplyPatch agp-set_memory_ucwb.patch @@ -1241,8 +1231,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch -ApplyPatch linux-2.6-iwl3945-remove-useless-exports.patch - # END OF PATCH APPLICATIONS %endif @@ -1836,6 +1824,13 @@ fi # ||----w | # || || %changelog +* Wed May 06 2009 Kyle McMartin +- Linux 2.6.30-rc4-git3 +- linux-2.6-cdrom-door-status.patch: merged upstream. +- linux-2.6-iwl3945-remove-useless-exports.patch: merged upstream. +- linux-2.6-utrace.patch: rebase against changes to fs/proc/array.c +- USB_NET_CDC_EEM=m + * Fri May 01 2009 Eric Sandeen - Fix ext4 corruption on partial write into prealloc block 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.110 retrieving revision 1.111 diff -u -p -r1.110 -r1.111 --- linux-2.6-utrace.patch 8 Apr 2009 01:31:58 -0000 1.110 +++ linux-2.6-utrace.patch 6 May 2009 16:39:12 -0000 1.111 @@ -1,46 +1,5 @@ -utrace core - -This adds the utrace facility, a new modular interface in the kernel for -implementing user thread tracing and debugging. This fits on top of the -tracehook_* layer, so the new code is well-isolated. - -The new interface is in and the DocBook utrace book -describes it. It allows for multiple separate tracing engines to work in -parallel without interfering with each other. Higher-level tracing -facilities can be implemented as loadable kernel modules using this layer. - -The new facility is made optional under CONFIG_UTRACE. -When this is not enabled, no new code is added. -It can only be enabled on machines that have all the -prerequisites and select CONFIG_HAVE_ARCH_TRACEHOOK. - -In this initial version, utrace and ptrace do not play together at all. -If ptrace is attached to a thread, the attach calls in the utrace kernel -API return -EBUSY. If utrace is attached to a thread, the PTRACE_ATTACH -or PTRACE_TRACEME request will return EBUSY to userland. The old ptrace -code is otherwise unchanged and nothing using ptrace should be affected -by this patch as long as utrace is not used at the same time. In the -future we can clean up the ptrace implementation and rework it to use -the utrace API. - -Signed-off-by: Roland McGrath ---- - Documentation/DocBook/Makefile | 2 +- - Documentation/DocBook/utrace.tmpl | 571 +++++++++ - fs/proc/array.c | 3 + - include/linux/init_task.h | 1 + - include/linux/sched.h | 6 + - include/linux/tracehook.h | 61 +- - include/linux/utrace.h | 692 +++++++++++ - include/linux/utrace_struct.h | 58 + - init/Kconfig | 9 + - kernel/Makefile | 1 + - kernel/ptrace.c | 18 +- - kernel/utrace.c | 2351 +++++++++++++++++++++++++++++++++++++ - 12 files changed, 3770 insertions(+), 3 deletions(-) - diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile -index a3a83d3..0a07ba9 100644 +index b1eb661..02851f6 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -9,7 +9,7 @@ @@ -54,7 +13,7 @@ index a3a83d3..0a07ba9 100644 mac80211.xml debugobjects.xml sh.xml regulator.xml \ diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl new file mode 100644 -index ...b802c55 100644 +index 0000000..b802c55 --- /dev/null +++ b/Documentation/DocBook/utrace.tmpl @@ -0,0 +1,571 @@ @@ -630,18 +589,18 @@ index ...b802c55 100644 + + diff --git a/fs/proc/array.c b/fs/proc/array.c -index 7e4877d..0c683ed 100644 +index 725a650..e299a63 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c -@@ -81,6 +81,7 @@ - #include +@@ -82,6 +82,7 @@ #include + #include #include +#include #include #include -@@ -187,6 +188,8 @@ static inline void task_state(struct seq +@@ -188,6 +189,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, cred->uid, cred->euid, cred->suid, cred->fsuid, cred->gid, cred->egid, cred->sgid, cred->fsgid); @@ -651,10 +610,10 @@ index 7e4877d..0c683ed 100644 if (p->files) fdt = files_fdtable(p->files); diff --git a/include/linux/init_task.h b/include/linux/init_task.h -index dcfb933..5625de6 100644 +index d87247d..0d0b55d 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h -@@ -183,6 +183,7 @@ extern struct cred init_cred; +@@ -170,6 +170,7 @@ extern struct cred init_cred; [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \ }, \ .dirties = INIT_PROP_LOCAL_SINGLE(dirties), \ @@ -663,7 +622,7 @@ index dcfb933..5625de6 100644 INIT_TRACE_IRQFLAGS \ INIT_LOCKDEP \ diff --git a/include/linux/sched.h b/include/linux/sched.h -index 98e1fe5..e9c3350 100644 +index b4c38bc..30db106 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -59,6 +59,7 @@ struct sched_param { @@ -674,7 +633,7 @@ index 98e1fe5..e9c3350 100644 #include #include -@@ -1290,6 +1291,11 @@ struct task_struct { +@@ -1291,6 +1292,11 @@ struct task_struct { #endif seccomp_t seccomp; @@ -687,7 +646,7 @@ index 98e1fe5..e9c3350 100644 u32 parent_exec_id; u32 self_exec_id; diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h -index 4ec4821..a7de30f 100644 +index 4ec4821..a7de30f 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h @@ -49,6 +49,7 @@ @@ -707,7 +666,7 @@ index 4ec4821..a7de30f 100644 return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall +@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall(struct pt_regs *regs) static inline __must_check int tracehook_report_syscall_entry( struct pt_regs *regs) { @@ -717,7 +676,7 @@ index 4ec4821..a7de30f 100644 ptrace_report_syscall(regs); return 0; } -@@ -134,6 +140,8 @@ static inline __must_check int tracehook +@@ -134,6 +140,8 @@ static inline __must_check int tracehook_report_syscall_entry( */ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step) { @@ -726,7 +685,7 @@ index 4ec4821..a7de30f 100644 ptrace_report_syscall(regs); } -@@ -194,6 +202,8 @@ static inline void tracehook_report_exec +@@ -194,6 +202,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt, struct linux_binprm *bprm, struct pt_regs *regs) { @@ -735,7 +694,7 @@ index 4ec4821..a7de30f 100644 if (!ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXEC, 0) && unlikely(task_ptrace(current) & PT_PTRACED)) send_sig(SIGTRAP, current, 0); -@@ -211,6 +221,8 @@ static inline void tracehook_report_exec +@@ -211,6 +221,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt, */ static inline void tracehook_report_exit(long *exit_code) { @@ -744,7 +703,7 @@ index 4ec4821..a7de30f 100644 ptrace_event(PT_TRACE_EXIT, PTRACE_EVENT_EXIT, *exit_code); } -@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clon +@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clone(unsigned clone_flags) static inline void tracehook_finish_clone(struct task_struct *child, unsigned long clone_flags, int trace) { @@ -752,7 +711,7 @@ index 4ec4821..a7de30f 100644 ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace); } -@@ -280,6 +293,8 @@ static inline void tracehook_report_clon +@@ -280,6 +293,8 @@ static inline void tracehook_report_clone(int trace, struct pt_regs *regs, unsigned long clone_flags, pid_t pid, struct task_struct *child) { @@ -761,7 +720,7 @@ index 4ec4821..a7de30f 100644 if (unlikely(trace) || unlikely(clone_flags & CLONE_PTRACE)) { /* * The child starts up with an immediate SIGSTOP. -@@ -311,6 +326,9 @@ static inline void tracehook_report_clon +@@ -311,6 +326,9 @@ static inline void tracehook_report_clone_complete(int trace, pid_t pid, struct task_struct *child) { @@ -771,7 +730,7 @@ index 4ec4821..a7de30f 100644 if (unlikely(trace)) ptrace_event(0, trace, pid); } -@@ -345,6 +363,7 @@ static inline void tracehook_report_vfor +@@ -345,6 +363,7 @@ static inline void tracehook_report_vfork_done(struct task_struct *child, */ static inline void tracehook_prepare_release_task(struct task_struct *task) { @@ -779,7 +738,7 @@ index 4ec4821..a7de30f 100644 } /** -@@ -359,6 +378,7 @@ static inline void tracehook_prepare_rel +@@ -359,6 +378,7 @@ static inline void tracehook_prepare_release_task(struct task_struct *task) static inline void tracehook_finish_release_task(struct task_struct *task) { ptrace_release_task(task); @@ -787,7 +746,7 @@ index 4ec4821..a7de30f 100644 } /** -@@ -380,6 +400,8 @@ static inline void tracehook_signal_hand +@@ -380,6 +400,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info, const struct k_sigaction *ka, struct pt_regs *regs, int stepping) { @@ -796,7 +755,7 @@ index 4ec4821..a7de30f 100644 if (stepping) ptrace_notify(SIGTRAP); } -@@ -397,6 +419,8 @@ static inline void tracehook_signal_hand +@@ -397,6 +419,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info, static inline int tracehook_consider_ignored_signal(struct task_struct *task, int sig) { @@ -805,7 +764,7 @@ index 4ec4821..a7de30f 100644 return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -416,6 +440,9 @@ static inline int tracehook_consider_ign +@@ -416,6 +440,9 @@ static inline int tracehook_consider_ignored_signal(struct task_struct *task, static inline int tracehook_consider_fatal_signal(struct task_struct *task, int sig) { @@ -815,7 +774,7 @@ index 4ec4821..a7de30f 100644 return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -430,6 +457,8 @@ static inline int tracehook_consider_fat +@@ -430,6 +457,8 @@ static inline int tracehook_consider_fatal_signal(struct task_struct *task, */ static inline int tracehook_force_sigpending(void) { @@ -824,7 +783,7 @@ index 4ec4821..a7de30f 100644 return 0; } -@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(s +@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(struct task_struct *task, siginfo_t *info, struct k_sigaction *return_ka) { @@ -833,7 +792,7 @@ index 4ec4821..a7de30f 100644 return 0; } -@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(s +@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(struct task_struct *task, */ static inline int tracehook_notify_jctl(int notify, int why) { @@ -842,7 +801,7 @@ index 4ec4821..a7de30f 100644 return notify ?: (current->ptrace & PT_PTRACED) ? why : 0; } -@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl( +@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl(int notify, int why) static inline int tracehook_notify_death(struct task_struct *task, void **death_cookie, int group_dead) { @@ -851,7 +810,7 @@ index 4ec4821..a7de30f 100644 if (task_detached(task)) return task->ptrace ? SIGCHLD : DEATH_REAP; -@@ -545,6 +580,20 @@ static inline void tracehook_report_deat +@@ -545,6 +580,20 @@ static inline void tracehook_report_death(struct task_struct *task, int signal, void *death_cookie, int group_dead) { @@ -872,7 +831,7 @@ index 4ec4821..a7de30f 100644 } #ifdef TIF_NOTIFY_RESUME -@@ -574,10 +623,20 @@ static inline void set_notify_resume(str +@@ -574,10 +623,20 @@ static inline void set_notify_resume(struct task_struct *task) * asynchronously, this will be called again before we return to * user mode. * @@ -896,7 +855,7 @@ index 4ec4821..a7de30f 100644 diff --git a/include/linux/utrace.h b/include/linux/utrace.h new file mode 100644 -index ...f46cc0f 100644 +index 0000000..f46cc0f --- /dev/null +++ b/include/linux/utrace.h @@ -0,0 +1,692 @@ @@ -1594,7 +1553,7 @@ index ...f46cc0f 100644 +#endif /* linux/utrace.h */ diff --git a/include/linux/utrace_struct.h b/include/linux/utrace_struct.h new file mode 100644 -index ...aba7e09 100644 +index 0000000..aba7e09 --- /dev/null +++ b/include/linux/utrace_struct.h @@ -0,0 +1,58 @@ @@ -1657,10 +1616,10 @@ index ...aba7e09 100644 + +#endif /* linux/utrace_struct.h */ diff --git a/init/Kconfig b/init/Kconfig -index f2f9b53..0d104d9 100644 +index 7be4d38..a6987df 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1141,6 +1141,15 @@ config STOP_MACHINE +@@ -1149,6 +1149,15 @@ config STOP_MACHINE help Need stop_machine() primitive. @@ -1677,7 +1636,7 @@ index f2f9b53..0d104d9 100644 config PREEMPT_NOTIFIERS diff --git a/kernel/Makefile b/kernel/Makefile -index 4242366..a79634e 100644 +index 4242366..a79634e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o @@ -1689,7 +1648,7 @@ index 4242366..a79634e 100644 obj-$(CONFIG_AUDITSYSCALL) += auditsc.o obj-$(CONFIG_AUDIT_TREE) += audit_tree.o diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index aaad0ec..8ba9b73 100644 +index 0692ab5..1d33e9c 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -16,6 +16,7 @@ @@ -1700,8 +1659,8 @@ index aaad0ec..8ba9b73 100644 #include #include #include -@@ -176,6 +177,14 @@ bool ptrace_may_access(struct task_struc - return (!err ? true : false); +@@ -174,6 +175,14 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode) + return !err; } +/* @@ -1715,7 +1674,7 @@ index aaad0ec..8ba9b73 100644 int ptrace_attach(struct task_struct *task) { int retval; -@@ -214,6 +223,11 @@ repeat: +@@ -212,6 +221,11 @@ repeat: goto repeat; } @@ -1727,7 +1686,7 @@ index aaad0ec..8ba9b73 100644 if (!task->mm) goto bad; /* the same process cannot be attached many times */ -@@ -590,7 +604,9 @@ int ptrace_traceme(void) +@@ -588,7 +602,9 @@ int ptrace_traceme(void) */ repeat: task_lock(current); @@ -1740,7 +1699,7 @@ index aaad0ec..8ba9b73 100644 */ diff --git a/kernel/utrace.c b/kernel/utrace.c new file mode 100644 -index ...c2bb162 100644 +index 0000000..c2bb162 --- /dev/null +++ b/kernel/utrace.c @@ -0,0 +1,2351 @@ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.1019 retrieving revision 1.1020 diff -u -p -r1.1019 -r1.1020 --- sources 30 Apr 2009 21:03:30 -0000 1.1019 +++ sources 6 May 2009 16:39:12 -0000 1.1020 @@ -1,2 +1,3 @@ 64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2 1672a3064a2bfe049715a1103f03561c patch-2.6.30-rc4.bz2 +f04330e41b862632d60568dfd32ded6c patch-2.6.30-rc4-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.933 retrieving revision 1.934 diff -u -p -r1.933 -r1.934 --- upstream 30 Apr 2009 21:03:30 -0000 1.933 +++ upstream 6 May 2009 16:39:12 -0000 1.934 @@ -1,2 +1,3 @@ linux-2.6.29.tar.bz2 patch-2.6.30-rc4.bz2 +patch-2.6.30-rc4-git3.bz2 --- linux-2.6-cdrom-door-status.patch DELETED --- --- linux-2.6-iwl3945-remove-useless-exports.patch DELETED --- From tbzatek at fedoraproject.org Wed May 6 16:40:57 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Wed, 6 May 2009 16:40:57 +0000 (UTC) Subject: rpms/gvfs/F-10 gvfs-1.2.3-ftp-filesize.patch, NONE, 1.1 gvfs.spec, 1.98, 1.99 Message-ID: <20090506164057.1EAAD70108@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11263 Modified Files: gvfs.spec Added Files: gvfs-1.2.3-ftp-filesize.patch Log Message: * Wed May 06 2009 Tomas Bzatek - 1.0.3-8 - FTP: fix 32-bit file size string conversion (#499286) gvfs-1.2.3-ftp-filesize.patch: --- NEW FILE gvfs-1.2.3-ftp-filesize.patch --- >From 138d1f85f2bebd2b96b9d538a578cd4d98eeceb4 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Wed, 6 May 2009 16:41:50 +0200 Subject: [PATCH] FTP: fix 32-bit file size string conversion --- daemon/gvfsbackendftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c index 4076053..7109607 100644 --- a/daemon/gvfsbackendftp.c +++ b/daemon/gvfsbackendftp.c @@ -1239,7 +1239,7 @@ dir_default_iter_process (gpointer iter, else if (symlink) *symlink = NULL; - g_file_info_set_size (info, strtoul (result.fe_size, NULL, 10)); + g_file_info_set_size (info, g_ascii_strtoull (result.fe_size, NULL, 10)); gvfs_file_info_populate_default (info, s, type == 'f' ? G_FILE_TYPE_REGULAR : -- 1.6.2.2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-10/gvfs.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -p -r1.98 -r1.99 --- gvfs.spec 11 Mar 2009 14:25:37 -0000 1.98 +++ gvfs.spec 6 May 2009 16:40:26 -0000 1.99 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.0.3 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -67,6 +67,9 @@ Patch13: gvfs-1.1.8-sftp-handle-keys.pat # SFTP: 100% cpu usage when connecting to a ssh key and denying key access Patch14: gvfs-1.1.8-sftp-eating-cpu.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=499286 +Patch15: gvfs-1.2.3-ftp-filesize.patch + %description The gvfs package provides backend implementations for the gio framework in GLib. It includes ftp, sftp, cifs. @@ -161,6 +164,7 @@ popd %patch12 -p0 -b .sftp-user %patch13 -p0 -b .sftp-keys %patch14 -p0 -b .sftp-cpu +%patch15 -p1 -b .ftp-size %build @@ -299,6 +303,9 @@ update-desktop-database &> /dev/null ||: %changelog +* Wed May 06 2009 Tomas Bzatek - 1.0.3-8 +- FTP: fix 32-bit file size string conversion (#499286) + * Wed Mar 11 2009 Tomas Bzatek - 1.0.3-7 - SFTP: Don't specify user unless requested explicitly by the uri - SFTP: Don't ask for username when getting ssh key passphrase From kengert at fedoraproject.org Wed May 6 16:45:44 2009 From: kengert at fedoraproject.org (Kai Engert) Date: Wed, 6 May 2009 16:45:44 +0000 (UTC) Subject: rpms/nss/devel nss.spec,1.66,1.67 Message-ID: <20090506164544.0B08A70108@cvs1.fedora.phx.redhat.com> Author: kengert Update of /cvs/extras/rpms/nss/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11769 Modified Files: nss.spec Log Message: * Wed May 06 2009 Kai Engert - 3.12.3-4 - add conflicts info in order to fix bug 499436 Index: nss.spec =================================================================== RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- nss.spec 14 Apr 2009 22:21:51 -0000 1.66 +++ nss.spec 6 May 2009 16:45:13 -0000 1.67 @@ -4,7 +4,7 @@ Summary: Network Security Services Name: nss Version: 3.12.3 -Release: 3%{?dist} +Release: 4%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -48,6 +48,7 @@ v3 certificates, and other security stan %package softokn-freebl Summary: Freebl library for the Network Security Services Group: System Environment/Base +Conflicts: nss < 3.12.2.99.3-5 %description softokn-freebl Network Security Services (NSS) is a set of libraries designed to @@ -476,6 +477,8 @@ done %changelog +* Wed May 06 2009 Kai Engert - 3.12.3-4 +- add conflicts info in order to fix bug 499436 * Tue Apr 14 2009 Kai Engert - 3.12.3-3 - ship .chk files instead of running shlibsign at install time - include .chk file in softokn-freebl subpackage From wart at fedoraproject.org Wed May 6 16:51:56 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Wed, 6 May 2009 16:51:56 +0000 (UTC) Subject: rpms/manaworld/devel .cvsignore, 1.13, 1.14 manaworld.spec, 1.17, 1.18 sources, 1.13, 1.14 Message-ID: <20090506165156.139F870108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/manaworld/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12392 Modified Files: .cvsignore manaworld.spec sources Log Message: Update to 0.0.28.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- .cvsignore 27 Jan 2009 19:01:21 -0000 1.13 +++ .cvsignore 6 May 2009 16:51:25 -0000 1.14 @@ -1 +1 @@ -tmw-0.0.28.tar.gz +tmw-0.0.28.1.tar.gz Index: manaworld.spec =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/devel/manaworld.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- manaworld.spec 25 Feb 2009 23:18:11 -0000 1.17 +++ manaworld.spec 6 May 2009 16:51:25 -0000 1.18 @@ -1,6 +1,6 @@ Name: manaworld -Version: 0.0.28 -Release: 2%{?dist} +Version: 0.0.28.1 +Release: 1%{?dist} Summary: 2D MMORPG world Group: Amusements/Games @@ -80,6 +80,9 @@ fi %changelog +* Tue May 5 2009 Wart 0.0.28.1-1 +- Update to 0.0.28.1 + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 27 Jan 2009 19:01:22 -0000 1.13 +++ sources 6 May 2009 16:51:25 -0000 1.14 @@ -1 +1 @@ -7d157a95e761ef7bee6f6a04645355ba tmw-0.0.28.tar.gz +d92b06bb580df72587a668f97b8fd6a7 tmw-0.0.28.1.tar.gz From astokes at fedoraproject.org Wed May 6 16:59:17 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 16:59:17 +0000 (UTC) Subject: rpms/sos/F-11 sos.spec,1.9,1.10 sources,1.5,1.6 Message-ID: <20090506165917.576D670108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/sos/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13102 Modified Files: sos.spec sources Log Message: no sysrq triggers Index: sos.spec =================================================================== RCS file: /cvs/pkgs/rpms/sos/F-11/sos.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sos.spec 26 Feb 2009 02:06:03 -0000 1.9 +++ sos.spec 6 May 2009 16:58:46 -0000 1.10 @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 1.8 -Release: 10%{?dist} +Release: 11%{?dist} Group: Application/Tools Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz License: GPLv2+ @@ -33,8 +33,8 @@ support technicians and developers. rm -rf ${RPM_BUILD_ROOT} install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport +%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT} +ln -s /usr/sbin/sosreport ${RPM_BUILD_ROOT}/usr/sbin/sysreport %find_lang %{name} %clean @@ -54,6 +54,10 @@ rm -rf ${RPM_BUILD_ROOT} %config %{_sysconfdir}/sos.conf %changelog +* Wed May 05 2009 Adam Stokes - 1.8-11 +- Remove all instances of sysrq +- Consistent macro usage in spec + * Wed Feb 25 2009 Fedora Release Engineering - 1.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sos/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 21 Jan 2009 23:35:42 -0000 1.5 +++ sources 6 May 2009 16:58:46 -0000 1.6 @@ -1 +1 @@ -75f91e5380dd1d31ccd6f7a2a9d242c4 sos-1.8.tar.gz +7aa30837d431ed2546b26d2ae30cd6bb sos-1.8.tar.gz From astokes at fedoraproject.org Wed May 6 17:01:30 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 17:01:30 +0000 (UTC) Subject: rpms/sos/F-10 sos.spec,1.7,1.8 sources,1.5,1.6 Message-ID: <20090506170130.2FFDF70108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/sos/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13507 Modified Files: sos.spec sources Log Message: no sysrq triggers Index: sos.spec =================================================================== RCS file: /cvs/pkgs/rpms/sos/F-10/sos.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sos.spec 21 Jan 2009 23:37:06 -0000 1.7 +++ sos.spec 6 May 2009 17:00:59 -0000 1.8 @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 1.8 -Release: 9%{?dist} +Release: 11%{?dist} Group: Application/Tools Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz License: GPLv2+ @@ -33,8 +33,8 @@ support technicians and developers. rm -rf ${RPM_BUILD_ROOT} install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport +%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT} +ln -s /usr/sbin/sosreport ${RPM_BUILD_ROOT}/usr/sbin/sysreport %find_lang %{name} %clean @@ -54,6 +54,13 @@ rm -rf ${RPM_BUILD_ROOT} %config %{_sysconfdir}/sos.conf %changelog +* Wed May 05 2009 Adam Stokes - 1.8-11 +- Remove all instances of sysrq +- Consistent macro usage in spec + +* Wed Feb 25 2009 Fedora Release Engineering - 1.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Jan 21 2009 Adam Stokes - 1.8-9 - Resolves: bz436053 /usr/share/sos is not owned by any package - Resolves: bz434626 Wrong directory structure for translations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sos/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 21 Jan 2009 23:37:06 -0000 1.5 +++ sources 6 May 2009 17:00:59 -0000 1.6 @@ -1 +1 @@ -75f91e5380dd1d31ccd6f7a2a9d242c4 sos-1.8.tar.gz +7aa30837d431ed2546b26d2ae30cd6bb sos-1.8.tar.gz From mmcgrath at fedoraproject.org Wed May 6 17:02:36 2009 From: mmcgrath at fedoraproject.org (Mike McGrath) Date: Wed, 6 May 2009 17:02:36 +0000 (UTC) Subject: rpms/trac-mercurial-plugin/EL-5 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 trac-mercurial-plugin.spec, 1.2, 1.3 Message-ID: <20090506170236.DE53E70108@cvs1.fedora.phx.redhat.com> Author: mmcgrath Update of /cvs/pkgs/rpms/trac-mercurial-plugin/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13767 Modified Files: .cvsignore sources trac-mercurial-plugin.spec Log Message: updated to most recent version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trac-mercurial-plugin/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 6 Jul 2007 02:50:41 -0000 1.1 +++ .cvsignore 6 May 2009 17:02:06 -0000 1.2 @@ -0,0 +1 @@ +TracMercurial-0.10.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trac-mercurial-plugin/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 6 Jul 2007 03:10:44 -0000 1.2 +++ sources 6 May 2009 17:02:06 -0000 1.3 @@ -1 +1 @@ -f9cc477b4f24256115bd7eba9f831c66 TracMercurial-0.10.0.2.tar.gz +eb94ce479b07f6b9b7c3dad6958269e6 TracMercurial-0.10.0.3.tar.gz Index: trac-mercurial-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/trac-mercurial-plugin/EL-5/trac-mercurial-plugin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- trac-mercurial-plugin.spec 6 Jul 2007 03:26:11 -0000 1.2 +++ trac-mercurial-plugin.spec 6 May 2009 17:02:06 -0000 1.3 @@ -1,11 +1,12 @@ # 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()")} -%define svnrev 5798 + +%define svnrev 8179 Name: trac-mercurial-plugin -Version: 0.10.0.2 -Release: 3.20070705svn%{svnrev}%{?dist} +Version: 0.10.0.3 +Release: 1.20080318svn%{svnrev}%{?dist} Summary: Mercurial plugin for Trac Group: Applications/Internet @@ -54,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 06 2009 Mike McGrath - 0.10.0.3-20080318svn8179 +- Updated to svn revision 8179 + * Thu Jul 05 2007 Jesse Keating - 0.10.0.2-3.20070705svn5798 - Require trac, python-setuptools as well From astokes at fedoraproject.org Wed May 6 17:03:17 2009 From: astokes at fedoraproject.org (Adam Stokes) Date: Wed, 6 May 2009 17:03:17 +0000 (UTC) Subject: rpms/sos/F-9 sos.spec,1.5,1.6 sources,1.5,1.6 Message-ID: <20090506170317.D418170108@cvs1.fedora.phx.redhat.com> Author: astokes Update of /cvs/pkgs/rpms/sos/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13859 Modified Files: sos.spec sources Log Message: no sysrq triggers Index: sos.spec =================================================================== RCS file: /cvs/pkgs/rpms/sos/F-9/sos.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sos.spec 21 Jan 2009 23:38:38 -0000 1.5 +++ sos.spec 6 May 2009 17:02:47 -0000 1.6 @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 1.8 -Release: 9%{?dist} +Release: 11%{?dist} Group: Application/Tools Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz License: GPLv2+ @@ -33,8 +33,8 @@ support technicians and developers. rm -rf ${RPM_BUILD_ROOT} install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport +%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT} +ln -s /usr/sbin/sosreport ${RPM_BUILD_ROOT}/usr/sbin/sysreport %find_lang %{name} %clean @@ -54,6 +54,13 @@ rm -rf ${RPM_BUILD_ROOT} %config %{_sysconfdir}/sos.conf %changelog +* Wed May 05 2009 Adam Stokes - 1.8-11 +- Remove all instances of sysrq +- Consistent macro usage in spec + +* Wed Feb 25 2009 Fedora Release Engineering - 1.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Jan 21 2009 Adam Stokes - 1.8-9 - Resolves: bz436053 /usr/share/sos is not owned by any package - Resolves: bz434626 Wrong directory structure for translations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sos/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 21 Jan 2009 23:38:38 -0000 1.5 +++ sources 6 May 2009 17:02:47 -0000 1.6 @@ -1 +1 @@ -75f91e5380dd1d31ccd6f7a2a9d242c4 sos-1.8.tar.gz +7aa30837d431ed2546b26d2ae30cd6bb sos-1.8.tar.gz From dcantrel at fedoraproject.org Wed May 6 17:31:36 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Wed, 6 May 2009 17:31:36 +0000 (UTC) Subject: rpms/dhcp/devel dhcp.spec,1.255,1.256 Message-ID: <20090506173136.0D6C370108@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17945 Modified Files: dhcp.spec Log Message: * Wed May 06 2009 David Cantrell - 12:4.1.0-20 - Obsolete libdhcp4client <= 12:4.0.0-34.fc10 (#499290) Index: dhcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.255 retrieving revision 1.256 diff -u -p -r1.255 -r1.256 --- dhcp.spec 21 Apr 2009 20:41:30 -0000 1.255 +++ dhcp.spec 6 May 2009 17:31:05 -0000 1.256 @@ -10,7 +10,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.1.0 -Release: 19%{?dist} +Release: 20%{?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. @@ -79,7 +79,7 @@ Requires: initscripts >= 6.75 Requires(post): coreutils Requires(post): grep Obsoletes: dhcpcd <= 1.3.22pl1-7 -Obsoletes: libdhcp4client <= 12:4.0.0-31.fc10 +Obsoletes: libdhcp4client <= 12:4.0.0-34.fc10 Obsoletes: libdhcp <= 1.99.8-1.fc10 Provides: dhcpcd = 1.3.22pl1-8 @@ -97,7 +97,7 @@ provides the ISC DHCP client daemon. %package devel Summary: Development headers and libraries for interfacing to the DHCP server Group: Development/Libraries -Obsoletes: libdhcp4client-devel <= 12:4.0.0-31 +Obsoletes: libdhcp4client-devel <= 12:4.0.0-34.fc10 Obsoletes: libdhcp-devel <= 1.99.8-1 Requires: %{name} = %{epoch}:%{version}-%{release} @@ -423,6 +423,9 @@ fi %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %changelog +* Wed May 06 2009 David Cantrell - 12:4.1.0-20 +- Obsolete libdhcp4client <= 12:4.0.0-34.fc10 (#499290) + * Mon Apr 20 2009 David Cantrell - 12:4.1.0-19 - Restrict interface names given on the dhcpd command line to length IFNAMSIZ or shorter (#441524) From s4504kr at fedoraproject.org Wed May 6 17:38:49 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Wed, 6 May 2009 17:38:49 +0000 (UTC) Subject: rpms/pdftk/F-11 pdftk.spec,1.18,1.19 Message-ID: <20090506173849.6B82F70108@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19763 Modified Files: pdftk.spec Log Message: Remove workaround for broken gcj Index: pdftk.spec =================================================================== RCS file: /cvs/extras/rpms/pdftk/F-11/pdftk.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- pdftk.spec 29 Apr 2009 16:12:54 -0000 1.18 +++ pdftk.spec 6 May 2009 17:38:18 -0000 1.19 @@ -3,7 +3,7 @@ Summary: The PDF Tool Kit Name: pdftk Version: 1.41 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: http://www.pdfhacks.com/pdftk/ # Remove java-lib/com because it's contains licensing issue @@ -53,7 +53,7 @@ rm -rf java_libs %build # Requires as a workaround for gcc BZ #39380 -export CFLAGS="${RPM_OPT_FLAGS} -O0" +export CFLAGS="${RPM_OPT_FLAGS}" jar tf %{_javadir}/itext-%{itextvers}.jar | grep '\.class$' | sed 's/\.class//' | sed 's|/|\.|g' > classes gjavah -d java_libs -cni -classpath=%{_javadir}/itext-%{itextvers}.jar \ `cat classes` @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Wed May 6 2009 Jochen Schmitt 1.41-19 +- Remove workaround for broken gcj + * Wed Apr 29 2009 Jochen Schmitt 1.41-18 - Add bcprov and bcmail to classpath patch (BZ #497986) From s4504kr at fedoraproject.org Wed May 6 17:48:09 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Wed, 6 May 2009 17:48:09 +0000 (UTC) Subject: rpms/pdftk/F-10 pdftk.spec,1.18,1.19 Message-ID: <20090506174809.410DB70108@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21069 Modified Files: pdftk.spec Log Message: Remove workaround for broken gcj Index: pdftk.spec =================================================================== RCS file: /cvs/extras/rpms/pdftk/F-10/pdftk.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- pdftk.spec 29 Apr 2009 20:25:14 -0000 1.18 +++ pdftk.spec 6 May 2009 17:47:38 -0000 1.19 @@ -3,7 +3,7 @@ Summary: The PDF Tool Kit Name: pdftk Version: 1.41 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: http://www.pdfhacks.com/pdftk/ # Remove java-lib/com because it's contains licensing issue @@ -53,7 +53,7 @@ rm -rf java_libs %build # Requires as a workaround for gcc BZ #39380 -export CFLAGS="${RPM_OPT_FLAGS} -O0" +export CFLAGS="${RPM_OPT_FLAGS}" jar tf %{_javadir}/itext-%{itextvers}.jar | grep '\.class$' | sed 's/\.class//' | sed 's|/|\.|g' > classes gjavah -d java_libs -cni -classpath=%{_javadir}/itext-%{itextvers}.jar \ `cat classes` @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Wed May 6 2009 Jochen Schmitt 1.41-19 +- Remove workaround for broken gcj + * Wed Apr 29 2009 Jochen Schmitt 1.41-18 - Add bcprov and bcmail to classpath patch (BZ #497986) From rstrode at fedoraproject.org Wed May 6 17:50:04 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Wed, 6 May 2009 17:50:04 +0000 (UTC) Subject: comps comps-f11.xml.in,1.215,1.216 Message-ID: <20090506175004.EEAF870108@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21320 Modified Files: comps-f11.xml.in Log Message: Add gdm fingerprint plugin by default This is to address the last part of bug 481273 Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.215 retrieving revision 1.216 diff -u -p -r1.215 -r1.216 --- comps-f11.xml.in 5 May 2009 19:01:07 -0000 1.215 +++ comps-f11.xml.in 6 May 2009 17:49:34 -0000 1.216 @@ -2260,6 +2260,7 @@ file-roller gcalctool gdm + gdm-plugin-fingerprint gdm-user-switch-applet gedit gnome-backgrounds From ajax at fedoraproject.org Wed May 6 17:52:17 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Wed, 6 May 2009 17:52:17 +0000 (UTC) Subject: rpms/lshw/devel lshw.spec,1.12,1.13 Message-ID: <20090506175217.C11AD70108@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/lshw/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21705 Modified Files: lshw.spec Log Message: * Wed May 06 2009 Adam Jackson B.02.14-2 - Requires: hwdata - Drop redundant copies of pci.ids and friends, since we'll pick up the copies in hwdata at runtime. Index: lshw.spec =================================================================== RCS file: /cvs/pkgs/rpms/lshw/devel/lshw.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- lshw.spec 1 Mar 2009 09:52:43 -0000 1.12 +++ lshw.spec 6 May 2009 17:51:47 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Hardware lister Name: lshw Version: B.02.14 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://ezix.org/project/wiki/HardwareLiSter @@ -11,6 +11,8 @@ Source2: lshw.consolehelper Source3: lshw.pam BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: hwdata + %description lshw is a small tool to provide detailed informaton on the hardware configuration of the machine. It can report exact memory configuration, @@ -24,6 +26,7 @@ Information can be output in plain text, Summary: Graphical hardware lister Group: Applications/System Requires: usermode +Requires: hwdata Requires: %{name} = %{version}-%{release} BuildRequires: gtk2-devel >= 2.4 BuildRequires: desktop-file-utils @@ -66,6 +69,14 @@ pushd src %{__ln_s} -f gtk-lshw %{buildroot}%{_sbindir}/lshw-gui +# don't package these copies, use the ones from hwdata instead +rm -f %{buildroot}%{_datadir}/%{name}/pci.ids +rm -f %{buildroot}%{_datadir}/%{name}/usb.ids +# don't package these copies, they're not actually used by the app, +# and even if they were, should use the hwdata versions +rm -f %{buildroot}%{_datadir}/%{name}/oui.txt +rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt + # desktop icon %{__install} -D -m 0644 -p ./src/gui/artwork/logo.svg \ %{buildroot}%{_datadir}/pixmaps/%{name}-logo.svg @@ -89,9 +100,6 @@ desktop-file-install --vendor fedora \ %doc COPYING README docs/* %doc %{_mandir}/man1/lshw.1* %{_sbindir}/%{name} -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/*.txt -%{_datadir}/%{name}/*.ids %files gui %defattr(-, root, root, -) @@ -106,6 +114,11 @@ desktop-file-install --vendor fedora \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 06 2009 Adam Jackson B.02.14-2 +- Requires: hwdata +- Drop redundant copies of pci.ids and friends, since we'll pick up the + copies in hwdata at runtime. + * Sun Mar 1 2009 Terje Rosten - B.02.14-1 - B.02.14 - Drop gcc43 patch now upstream From ertzing at fedoraproject.org Wed May 6 17:52:47 2009 From: ertzing at fedoraproject.org (Ralf Ertzinger) Date: Wed, 6 May 2009 17:52:47 +0000 (UTC) Subject: rpms/audacious-plugins/devel audacious-plugins-1.5.1-neon-reader-error-crash.patch, NONE, 1.1 audacious-plugins.spec, 1.34, 1.35 Message-ID: <20090506175247.E8BC570108@cvs1.fedora.phx.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21789 Modified Files: audacious-plugins.spec Added Files: audacious-plugins-1.5.1-neon-reader-error-crash.patch Log Message: * Wed May 06 2009 Ralf Ertzinger 1.5.1-5 - Fix possible crash on neon buffer underrun (BZ#496413) audacious-plugins-1.5.1-neon-reader-error-crash.patch: --- NEW FILE audacious-plugins-1.5.1-neon-reader-error-crash.patch --- diff -r e6034a500e27 -r 617cd51dfee5 src/neon/neon.c --- a/src/neon/neon.c Wed May 06 12:11:06 2009 -0400 +++ b/src/neon/neon.c Wed May 06 12:10:28 2009 -0500 @@ -990,7 +990,7 @@ } if (NULL == h->reader) { - if (NEON_READER_EOF != h->reader_status.status) { + if (NEON_READER_EOF != h->reader_status.status && NEON_READER_ERROR != h->reader_status.status) { /* * There is no reader thread yet. Read the first bytes from * the network ourselves, and then fire up the reader thread Index: audacious-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- audacious-plugins.spec 1 May 2009 13:13:59 -0000 1.34 +++ audacious-plugins.spec 6 May 2009 17:52:17 -0000 1.35 @@ -2,7 +2,7 @@ Name: audacious-plugins Version: 1.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plugins for the Audacious media player Group: Applications/Multimedia @@ -21,6 +21,7 @@ Patch3: audacious-plugins-1.5.1- Patch4: audacious-plugins-1.5.1-vorbis-oga.patch Patch5: audacious-plugins-1.5.1-timidity-cfg.patch Patch6: audacious-plugins-1.5.1-amidi-symbol.patch +Patch7: audacious-plugins-1.5.1-neon-reader-error-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: audacious-devel >= %{aud_ver}, esound-devel >= 0.2, libvorbis-devel >= 1.0 @@ -169,6 +170,9 @@ vortex compressed files. # fix missing symbols in amidi %patch6 -p1 -b amidi-symbols +# Patch possible neon crash on buffer underrun +%patch7 -p1 -b neon-reader-error-crash + perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in %build @@ -265,6 +269,9 @@ update-desktop-database %{_datadir}/appl %changelog +* Wed May 06 2009 Ralf Ertzinger 1.5.1-5 +- Fix possible crash on neon buffer underrun (BZ#496413) + * Fri May 01 2009 Ralf Ertzinger 1.5.1-4 - Accept .oga files (BZ#479120) - Look for timitidy.cfg in /etc (BZ#450933) From hadess at fedoraproject.org Wed May 6 17:54:44 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 6 May 2009 17:54:44 +0000 (UTC) Subject: rpms/totem/devel .cvsignore, 1.74, 1.75 sources, 1.74, 1.75 totem.spec, 1.235, 1.236 totem-bin-backend-ondemand.sh, 1.4, NONE totem-use-pulsesink-volume.patch, 1.5, NONE Message-ID: <20090506175444.ED11A70108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22184 Modified Files: .cvsignore sources totem.spec Removed Files: totem-bin-backend-ondemand.sh totem-use-pulsesink-volume.patch Log Message: * Wed May 06 2009 Bastien Nocera 2.27.1-1 - Update to 2.27.1 - Remove xine-lib backend Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- .cvsignore 1 Apr 2009 22:18:29 -0000 1.74 +++ .cvsignore 6 May 2009 17:54:14 -0000 1.75 @@ -1 +1 @@ -totem-2.26.1.tar.bz2 +totem-2.27.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- sources 1 Apr 2009 22:18:30 -0000 1.74 +++ sources 6 May 2009 17:54:14 -0000 1.75 @@ -1 +1 @@ -410d14957f48ae179c03e5c663607536 totem-2.26.1.tar.bz2 +586d08291bdd5e0673baeae0f93ab790 totem-2.27.1.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.235 retrieving revision 1.236 diff -u -p -r1.235 -r1.236 --- totem.spec 28 Apr 2009 09:42:03 -0000 1.235 +++ totem.spec 6 May 2009 17:54:14 -0000 1.236 @@ -1,22 +1,16 @@ -%define with_xine 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 xine_version 1.1.7 Summary: Movie player for GNOME Name: totem -Version: 2.26.1 -Release: 3%{?dist} +Version: 2.27.1 +Release: 1%{?dist} License: GPLv2+ with exceptions Group: Applications/Multimedia URL: http://projects.gnome.org/totem/ Source0: http://download.gnome.org/sources/totem/2.25/totem-%{version}.tar.bz2 -Source1: totem-bin-backend-ondemand.sh -# Will be removed when we switch to playbin2 -Patch0: totem-use-pulsesink-volume.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): GConf2 >= 2.14 @@ -33,9 +27,6 @@ Requires: gnome-themes Requires: pyxdg # For all the Python plugins Requires: pygtk2 -# FIXME? -#Requires: %{name}-backend = %{version}-%{release} -Requires: %{name}-gstreamer BuildRequires: gcc-c++, pkgconfig, gettext BuildRequires: perl(XML::Parser) intltool @@ -65,6 +56,8 @@ BuildRequires: libepc-devel Obsoletes: nautilus-media Obsoletes: totem-galago +Obsoletes: totem-gstreamer < 2.27.1 +Obsoletes: totem-xine < 2.27.1 %description Totem is simple movie player for the GNOME desktop. It features a @@ -73,39 +66,6 @@ a pretty complete keyboard navigation. Totem is extensible through a plugin system. -%package gstreamer -Summary: Gstreamer backend for Totem -Group: Applications/Multimedia -Provides: %{name}-backend = %{version}-%{release} -Obsoletes: totem-gstreamer < 2.23.0 -Requires: %{name} = %{version} -Requires: gstreamer >= %gstreamer_version -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 -BuildRequires: liboil >= 0.3.13-5 - -%description gstreamer -This package provides the gstreamer backend for the Totem media player. - -%if %{with_xine} -%package xine -Summary: Xine backend for Totem -Group: Applications/Multimedia -Provides: %{name}-backend = %{version}-%{release} -Requires: %{name} = %{version} -Requires: xine-lib >= %{xine_version} -Requires: gvfs-fuse -BuildRequires: xine-lib-devel >= %{xine_version} - -%description xine -This package provides the xine backend for the Totem media player. -%endif - %package mozplugin Summary: Mozilla plugin for Totem Group: Applications/Internet @@ -134,7 +94,7 @@ a remote MythTV server. %package youtube Summary: YouTube plugin for Totem Group: Applications/Multimedia -Requires: python-gdata +Requires: python-gdata gnome-python2-gconf Requires: %{name} = %{version}-%{release} %description youtube @@ -206,23 +166,10 @@ This package provides a Nautilus extensi audio and video files in the properties dialog. %prep -%setup -q -c -pushd totem-%{version}/ -%patch0 -p0 -b .pulsesink-vol -popd -# Whatever needs to be changed in both copies do here -## remember to update me when changing %doc -for i in AUTHORS COPYING NEWS README TODO;do - cp totem-%{version}/$i . -done - -# duplicate sources -cp -a totem-%{version} xine -mv totem-%{version} gstreamer +%setup -q %build -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 @@ -235,46 +182,13 @@ export MOZILLA_PLUGINDIR=%{_libdir}/mozi --disable-nvtv make %{?_smp_mflags} -popd - -%if %{with_xine} -# Build the xine-lib backend with minimum dependencies -pushd xine -export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins -%configure \ - --enable-xine \ - --disable-gstreamer \ - --disable-mozilla \ - --disable-nautilus \ - --disable-scrollkeeper \ - --disable-nvtv - -cd src/backend/ -make %{?_smp_mflags} -popd -%endif %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -# GSTREAMER INSTALL -pushd gstreamer/ make install DESTDIR=$RPM_BUILD_ROOT -# move the backend library away -mv $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 -# language hack %find_lang %{name} --with-gnome -mv %{name}.lang ../ -popd - -%if %{with_xine} -# XINE INSTALL -pushd xine/src/backend -make install DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget-xine.so.0.0.0 -popd -%endif rm -rf $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{a,la} \ $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.{a,la} \ @@ -285,8 +199,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/totem/p %find_lang %{name} --with-gnome -install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-backend - # save space by linking identical images in translated docs helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name} for f in $helpdir/C/figures/*.png; do @@ -321,16 +233,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ] /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi -%post gstreamer -/usr/sbin/alternatives --install %{_libdir}/libbaconvideowidget.so.0.0.0 totem-backend %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 2 -/sbin/ldconfig - -%if %{with_xine} -%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 - %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -359,20 +261,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ] /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi -%postun gstreamer -if [ "$1" -eq 0 ]; then - /usr/sbin/alternatives --remove totem-backend %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 -fi -/sbin/ldconfig - -%if %{with_xine} -%postun xine -if [ "$1" -eq 0 ]; then - /usr/sbin/alternatives --remove totem-backend %{_libdir}/libbaconvideowidget-xine.so.0.0.0 -fi -/sbin/ldconfig -%endif - %pre mythtv if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -473,15 +361,14 @@ fi %defattr(-, root, root) %{_libdir}/totem/plugins/publish -%files gstreamer -%{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 +%changelog +* Wed May 06 2009 Bastien Nocera 2.27.1-1 +- Update to 2.27.1 +- Remove xine-lib backend -%if %{with_xine} -%files xine -%{_libdir}/libbaconvideowidget-xine.so.0.0.0 -%endif +* Thu Apr 23 2009 Bastien Nocera 2.26.1-4 +- Add missing gnome-python2-gconf req (#483265) -%changelog * Tue Apr 28 2009 Bastien Nocera 2.26.1-3 - Add missing pyxdg requires for the OpenSubtitles plugin (#497787) --- totem-bin-backend-ondemand.sh DELETED --- --- totem-use-pulsesink-volume.patch DELETED --- From katzj at fedoraproject.org Wed May 6 18:05:50 2009 From: katzj at fedoraproject.org (Jeremy Katz) Date: Wed, 6 May 2009 18:05:50 +0000 (UTC) Subject: rpms/livecd-tools/F-11 .cvsignore, 1.20, 1.21 livecd-tools.spec, 1.24, 1.25 sources, 1.20, 1.21 Message-ID: <20090506180550.63AAA70108@cvs1.fedora.phx.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/livecd-tools/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23543 Modified Files: .cvsignore livecd-tools.spec sources Log Message: * Wed May 6 2009 Jeremy Katz - 024-1 - Fix ppc image creation (#497193, help from jwboyer) - Fixes for using ext[23] usb stick (wtogami) - Check filesystem after resizing and raise an error if there are problems (#497377) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/livecd-tools/F-11/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- .cvsignore 14 Apr 2009 18:01:19 -0000 1.20 +++ .cvsignore 6 May 2009 18:05:19 -0000 1.21 @@ -1 +1 @@ -livecd-tools-023.tar.bz2 +livecd-tools-024.tar.bz2 Index: livecd-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/livecd-tools/F-11/livecd-tools.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- livecd-tools.spec 14 Apr 2009 18:01:20 -0000 1.24 +++ livecd-tools.spec 6 May 2009 18:05:19 -0000 1.25 @@ -4,7 +4,7 @@ Summary: Tools for building live CD's Name: livecd-tools -Version: 023 +Version: 024 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -81,6 +81,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog +* Wed May 6 2009 Jeremy Katz - 024-1 +- Fix ppc image creation (#497193, help from jwboyer) +- Fixes for using ext[23] usb stick (wtogami) +- Check filesystem after resizing and raise an error if there are + problems (#497377) + * Tue Apr 14 2009 Jeremy Katz - 023-1 - Don't prompt about overwriting when making usb stick (#491234) - Fix up livecd-iso-to-pxeboot for new syslinux paths Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/livecd-tools/F-11/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sources 14 Apr 2009 18:01:20 -0000 1.20 +++ sources 6 May 2009 18:05:19 -0000 1.21 @@ -1 +1 @@ -27cc1df7be92b47c02e4537666ca6dc4 livecd-tools-023.tar.bz2 +9e1ffda4a6b93c53ef7964dfadce2452 livecd-tools-024.tar.bz2 From jakub at fedoraproject.org Wed May 6 18:06:50 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Wed, 6 May 2009 18:06:50 +0000 (UTC) Subject: rpms/gcc/F-11 gcc44-libstdc++-docs.patch, NONE, 1.1 gcc44-pr39666.patch, NONE, 1.1 gcc44-pr39942.patch, NONE, 1.1 gcc44-pr40035.patch, NONE, 1.1 .cvsignore, 1.273, 1.274 gcc.spec, 1.47, 1.48 gcc44-power7-2.patch, 1.3, 1.4 gcc44-power7-3.patch, 1.1, 1.2 gcc44-rh330771.patch, 1.1, 1.2 sources, 1.276, 1.277 gcc44-pr39903.patch, 1.1, NONE Message-ID: <20090506180650.4C8C170108@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23731 Modified Files: .cvsignore gcc.spec gcc44-power7-2.patch gcc44-power7-3.patch gcc44-rh330771.patch sources Added Files: gcc44-libstdc++-docs.patch gcc44-pr39666.patch gcc44-pr39942.patch gcc44-pr40035.patch Removed Files: gcc44-pr39903.patch Log Message: 4.4.0-4 gcc44-libstdc++-docs.patch: --- NEW FILE gcc44-libstdc++-docs.patch --- --- libstdc++-v3/doc/html/index.html 2009-01-14 12:06:37.000000000 +0100 +++ libstdc++-v3/doc/html/index.html 2009-05-06 09:17:30.000000000 +0200 @@ -12,7 +12,8 @@

The GNU C++ Library Documentation

-

Copyright 2008 FSF

+

Release 4.4.0

+

Copyright 2008, 2009 FSF

Permission is granted to copy, distribute and/or modify this --- libstdc++-v3/doc/html/api.html 2009-04-20 21:21:15.000000000 +0200 +++ libstdc++-v3/doc/html/api.html 2009-05-06 09:17:24.000000000 +0200 @@ -17,27 +17,12 @@ useful for examining the signatures of p the library classes, finding out what is in a particular include file, looking at inheritance diagrams, etc.

-The source-level documentation for the most recent releases can be -viewed online: -

  • - for the 3.4 release +The source-level documentation can be viewed here: +

    +

    This generated HTML collection, as above, is also available for download in the libstdc++ snapshots directory at <URL:ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/>. gcc44-pr39666.patch: --- NEW FILE gcc44-pr39666.patch --- 2009-05-05 Jakub Jelinek PR middle-end/39666 * gimplify.c (gimplify_switch_expr): If case labels cover the whole range of the type, but default label is missing, add it with one of the existing labels instead of adding a new label for it. * gcc.dg/pr39666-1.c: New test. * gcc.dg/pr39666-2.c: Likewise. * g++.dg/warn/Wuninitialized-4.C: Likewise. * g++.dg/warn/Wuninitialized-5.C: Likewise. * gfortran.dg/pr39666-1.f90: Likewise. * gfortran.dg/pr39666-2.f90: Likewise. --- gcc/gimplify.c (revision 147135) +++ gcc/gimplify.c (revision 147136) @@ -1604,20 +1604,63 @@ gimplify_switch_expr (tree *expr_p, gimp } len = i; + if (!VEC_empty (tree, labels)) + sort_case_labels (labels); + if (!default_case) { - gimple new_default; + tree type = TREE_TYPE (switch_expr); /* If the switch has no default label, add one, so that we jump - around the switch body. */ - default_case = build3 (CASE_LABEL_EXPR, void_type_node, NULL_TREE, - NULL_TREE, create_artificial_label ()); - new_default = gimple_build_label (CASE_LABEL (default_case)); - gimplify_seq_add_stmt (&switch_body_seq, new_default); - } + around the switch body. If the labels already cover the whole + range of type, add the default label pointing to one of the + existing labels. */ + if (type == void_type_node) + type = TREE_TYPE (SWITCH_COND (switch_expr)); + if (len + && INTEGRAL_TYPE_P (type) + && TYPE_MIN_VALUE (type) + && TYPE_MAX_VALUE (type) + && tree_int_cst_equal (CASE_LOW (VEC_index (tree, labels, 0)), + TYPE_MIN_VALUE (type))) + { + tree low, high = CASE_HIGH (VEC_index (tree, labels, len - 1)); + if (!high) + high = CASE_LOW (VEC_index (tree, labels, len - 1)); + if (tree_int_cst_equal (high, TYPE_MAX_VALUE (type))) + { + for (i = 1; i < len; i++) + { + high = CASE_LOW (VEC_index (tree, labels, i)); + low = CASE_HIGH (VEC_index (tree, labels, i - 1)); + if (!low) + low = CASE_LOW (VEC_index (tree, labels, i - 1)); + if ((TREE_INT_CST_LOW (low) + 1 + != TREE_INT_CST_LOW (high)) + || (TREE_INT_CST_HIGH (low) + + (TREE_INT_CST_LOW (high) == 0) + != TREE_INT_CST_HIGH (high))) + break; + } + if (i == len) + default_case = build3 (CASE_LABEL_EXPR, void_type_node, + NULL_TREE, NULL_TREE, + CASE_LABEL (VEC_index (tree, + labels, 0))); + } + } - if (!VEC_empty (tree, labels)) - sort_case_labels (labels); + if (!default_case) + { + gimple new_default; + + default_case = build3 (CASE_LABEL_EXPR, void_type_node, + NULL_TREE, NULL_TREE, + create_artificial_label ()); + new_default = gimple_build_label (CASE_LABEL (default_case)); + gimplify_seq_add_stmt (&switch_body_seq, new_default); + } + } gimple_switch = gimple_build_switch_vec (SWITCH_COND (switch_expr), default_case, labels); --- gcc/testsuite/gcc.dg/pr39666-1.c (revision 0) +++ gcc/testsuite/gcc.dg/pr39666-1.c (revision 147136) @@ -0,0 +1,22 @@ +/* PR middle-end/39666 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wuninitialized" } */ + +int +foo (int i) +{ + int j; + switch (i) + { + case -__INT_MAX__ - 1 ... -1: + j = 6; + break; + case 0: + j = 5; + break; + case 1 ... __INT_MAX__: + j = 4; + break; + } + return j; +} --- gcc/testsuite/gcc.dg/pr39666-2.c (revision 0) +++ gcc/testsuite/gcc.dg/pr39666-2.c (revision 147136) @@ -0,0 +1,22 @@ +/* PR middle-end/39666 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wuninitialized" } */ + +int +foo (int i) +{ + int j; /* { dg-warning "may be used uninitialized" } */ + switch (i) + { + case -__INT_MAX__ - 1 ... -1: + j = 6; + break; + case 0: + j = 5; + break; + case 2 ... __INT_MAX__: + j = 4; + break; + } + return j; +} --- gcc/testsuite/g++.dg/warn/Wuninitialized-5.C (revision 0) +++ gcc/testsuite/g++.dg/warn/Wuninitialized-5.C (revision 147136) @@ -0,0 +1,22 @@ +// PR middle-end/39666 +// { dg-do compile } +// { dg-options "-O2 -Wuninitialized" } + +int +foo (int i) +{ + int j; // { dg-warning "may be used uninitialized" } + switch (i) + { + case -__INT_MAX__ - 1 ... -1: + j = 6; + break; + case 0: + j = 5; + break; + case 2 ... __INT_MAX__: + j = 4; + break; + } + return j; +} --- gcc/testsuite/g++.dg/warn/Wuninitialized-4.C (revision 0) +++ gcc/testsuite/g++.dg/warn/Wuninitialized-4.C (revision 147136) @@ -0,0 +1,22 @@ +// PR middle-end/39666 +// { dg-do compile } +// { dg-options "-O2 -Wuninitialized" } + +int +foo (int i) +{ + int j; + switch (i) + { + case -__INT_MAX__ - 1 ... -1: + j = 6; + break; + case 0: + j = 5; + break; + case 1 ... __INT_MAX__: + j = 4; + break; + } + return j; +} --- gcc/testsuite/gfortran.dg/pr39666-1.f90 (revision 0) +++ gcc/testsuite/gfortran.dg/pr39666-1.f90 (revision 147136) @@ -0,0 +1,14 @@ +! PR middle-end/39666 +! { dg-do compile } +! { dg-options "-O2 -Wuninitialized" } + +FUNCTION f(n) + INTEGER, INTENT(in) :: n + REAL :: f + + SELECT CASE (n) + CASE (:-1); f = -1.0 + CASE (0); f = 0.0 + CASE (1:); f = 1.0 + END SELECT +END FUNCTION --- gcc/testsuite/gfortran.dg/pr39666-2.f90 (revision 0) +++ gcc/testsuite/gfortran.dg/pr39666-2.f90 (revision 147136) @@ -0,0 +1,14 @@ +! PR middle-end/39666 +! { dg-do compile } +! { dg-options "-O2 -Wuninitialized" } + +FUNCTION f(n) ! { dg-warning "may be used uninitialized" } + INTEGER, INTENT(in) :: n + REAL :: f + + SELECT CASE (n) + CASE (:-1); f = -1.0 + CASE (0); f = 0.0 + CASE (2:); f = 1.0 + END SELECT +END FUNCTION gcc44-pr39942.patch: --- NEW FILE gcc44-pr39942.patch --- 2009-05-05 Jakub Jelinek PR target/39942 * config/i386/x86-64.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Don't emit second .p2align 3 if MAX_SKIP is smaller than 7. * config/i386/linux.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Likewise. --- gcc/config/i386/x86-64.h.jj 2009-05-05 08:33:20.000000000 +0200 +++ gcc/config/i386/x86-64.h 2009-05-05 16:37:13.000000000 +0200 @@ -74,7 +74,9 @@ see the files COPYING3 and COPYING.RUNTI fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ /* Make sure that we have at least 8 byte alignment if > 8 byte \ alignment is preferred. */ \ - if ((LOG) > 3 && (1 << (LOG)) > ((MAX_SKIP) + 1)) \ + if ((LOG) > 3 \ + && (1 << (LOG)) > ((MAX_SKIP) + 1) \ + && (MAX_SKIP) >= 7) \ fprintf ((FILE), "\t.p2align 3\n"); \ } \ } \ --- gcc/config/i386/linux.h.jj 2009-05-05 08:33:20.000000000 +0200 +++ gcc/config/i386/linux.h 2009-05-05 16:37:13.000000000 +0200 @@ -153,7 +153,9 @@ along with GCC; see the file COPYING3. fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ /* Make sure that we have at least 8 byte alignment if > 8 byte \ alignment is preferred. */ \ - if ((LOG) > 3 && (1 << (LOG)) > ((MAX_SKIP) + 1)) \ + if ((LOG) > 3 \ + && (1 << (LOG)) > ((MAX_SKIP) + 1) \ + && (MAX_SKIP) >= 7) \ fprintf ((FILE), "\t.p2align 3\n"); \ } \ } \ gcc44-pr40035.patch: --- NEW FILE gcc44-pr40035.patch --- 2009-05-05 Jakub Jelinek Ben Elliston PR middle-end/40035 * dse.c (check_mem_read_rtx): Guard against width == -1. * gcc.target/i386/pr40035.c: New test. --- gcc/dse.c (revision 147137) +++ gcc/dse.c (working copy) @@ -2245,6 +2245,7 @@ check_mem_read_rtx (rtx *loc, void *data if (store_info->rhs && store_info->group_id == -1 && store_info->cse_base == base + && width != -1 && offset >= store_info->begin && offset + width <= store_info->end && all_positions_needed_p (store_info, --- gcc/testsuite/gcc.c-torture/compile/pr40035.c (revision 0) +++ gcc/testsuite/gcc.c-torture/compile/pr40035.c (revision 0) @@ -0,0 +1,46 @@ +/* PR middle-end/40035 */ + +typedef __SIZE_TYPE__ size_t; + +struct kernel_param { + const char *name; + unsigned int perm; +}; + +extern int parse_args(const char *name, + char *args, + struct kernel_param *params, + unsigned num, + int (*unknown)(char *param, char *val)); + +void *memmove(void *dest, const void *src, size_t count); +size_t strlen(const char *s); + +static char *static_command_line; + +static int unknown_bootoption(char *param, char *val) +{ + + if (val) { + + if (val == param+strlen(param)+1) + val[-1] = '='; + else if (val == param+strlen(param)+2) { + val[-2] = '='; + memmove(val-1, val, strlen(val)+1); + val--; + } + } + return 0; +} + + +void start_kernel(void) +{ + char * command_line; + extern struct kernel_param __start___param[], __stop___param[]; + + parse_args("Booting kernel", static_command_line, __start___param, + __stop___param - __start___param, + &unknown_bootoption); +} Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/F-11/.cvsignore,v retrieving revision 1.273 retrieving revision 1.274 diff -u -p -r1.273 -r1.274 --- .cvsignore 27 Apr 2009 12:43:31 -0000 1.273 +++ .cvsignore 6 May 2009 18:06:19 -0000 1.274 @@ -1,2 +1,2 @@ fastjar-0.97.tar.gz -gcc-4.4.0-20090427.tar.bz2 +gcc-4.4.0-20090506.tar.bz2 Index: gcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -r1.47 -r1.48 --- gcc.spec 27 Apr 2009 12:43:31 -0000 1.47 +++ gcc.spec 6 May 2009 18:06:19 -0000 1.48 @@ -1,9 +1,9 @@ -%define DATE 20090427 -%define SVNREV 146836 +%define DATE 20090506 +%define SVNREV 147193 %define gcc_version 4.4.0 # Note, gcc_release must be integer, if you want to add suffixes to # %{release}, append them after %{gcc_release} on Release: line. -%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 @@ -18,6 +18,7 @@ %else %define build_cloog 1 %endif +%define build_libstdcxx_docs 1 # If you don't have already a usable gcc-java and libgcj for your arch, # do on some arch which has it rpmbuild -bc --with java_tar gcc41.spec # which creates libjava-classes-%{version}-%{release}.tar.bz2 @@ -99,6 +100,10 @@ BuildRequires: libunwind >= 0.98 %if %{build_cloog} BuildRequires: ppl >= 0.10, ppl-devel >= 0.10, cloog-ppl >= 0.15, cloog-ppl-devel >= 0.15 %endif +%if %{build_libstdcxx_docs} +BuildRequires: doxygen +BuildRequires: graphviz +%endif Requires: cpp = %{version}-%{release} # Need .eh_frame ld optimizations # Need proper visibility support @@ -152,7 +157,10 @@ Patch26: gcc44-power7-2.patch Patch27: gcc44-power7-3.patch Patch28: gcc44-pr38757.patch Patch29: gcc44-pr39856.patch -Patch30: gcc44-pr39903.patch +Patch30: gcc44-libstdc++-docs.patch +Patch31: gcc44-pr39666.patch +Patch32: gcc44-pr40035.patch +Patch33: gcc44-pr39942.patch Patch1000: fastjar-0.97-segfault.patch @@ -217,6 +225,15 @@ This is the GNU implementation of the st package includes the header files and libraries needed for C++ development. This includes rewritten implementation of STL. +%package -n libstdc++-docs +Summary: Documentation for the GNU standard C++ library +Group: Development/Libraries +Autoreq: true + +%description -n libstdc++-docs +Manual, doxygen generated API information and Frequently Asked Questions +for the GNU standard C++ library. + %package objc Summary: Objective-C support for GCC Group: Development/Languages @@ -443,7 +460,12 @@ which are required to compile with the G %patch27 -p0 -b .power7-3~ %patch28 -p0 -b .pr38757~ %patch29 -p0 -b .pr39856~ -%patch30 -p0 -b .pr39903~ +%if %{build_libstdcxx_docs} +%patch30 -p0 -b .libstdc++-docs~ +%endif +%patch31 -p0 -b .pr39666~ +%patch32 -p0 -b .pr40035~ +%patch33 -p0 -b .pr39942~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* @@ -660,6 +682,14 @@ done make -C gcc generated-manpages for i in ../gcc/doc/*.texi; do mv -f $i.orig $i; done +# Make generated doxygen pages. +%if %{build_libstdcxx_docs} +cd %{gcc_target_platform}/libstdc++-v3 +make doc-html-doxygen +make doc-man-doxygen +cd ../.. +%endif + # Copy various doc files here and there cd .. mkdir -p rpm.doc/gfortran rpm.doc/objc @@ -710,10 +740,6 @@ tar cf - -T libjava-classes.list | bzip2 %install rm -fr $RPM_BUILD_ROOT -perl -pi -e \ - 's~href="l(ibstdc|atest)~href="http://gcc.gnu.org/onlinedocs/libstdc++/l\1~' \ - libstdc++-v3/doc/html/api.html - cd obj-%{gcc_target_platform} %if %{build_java} @@ -794,6 +820,16 @@ done # shipping this for everybody is unnecessary. rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_version}/%{gcc_target_platform}/bits/stdc++.h.gch +%if %{build_libstdcxx_docs} +libstdcxx_doc_builddir=%{gcc_target_platform}/libstdc++-v3/doc/doxygen +mkdir -p ../rpm.doc/libstdc++-v3 +cp -r -p ../libstdc++-v3/doc/html ../rpm.doc/libstdc++-v3/html +mv $libstdcxx_doc_builddir/html ../rpm.doc/libstdc++-v3/html/api +mkdir -p $RPM_BUILD_ROOT%{_mandir} +mv $libstdcxx_doc_builddir/man/man3 $RPM_BUILD_ROOT%{_mandir}/man3/ +find ../rpm.doc/libstdc++-v3 -name \*~ | xargs rm +%endif + %ifarch sparcv9 sparc64 ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \ $RPM_BUILD_ROOT%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc @@ -1441,7 +1477,14 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a %endif -%doc rpm.doc/changelogs/libstdc++-v3/ChangeLog* libstdc++-v3/README* libstdc++-v3/doc/html/ +%doc rpm.doc/changelogs/libstdc++-v3/ChangeLog* libstdc++-v3/README* + +%if %{build_libstdcxx_docs} +%files -n libstdc++-docs +%defattr(-,root,root) +%{_mandir}/man3/* +%doc rpm.doc/libstdc++-v3/html +%endif %files objc %defattr(-,root,root) @@ -1754,6 +1797,25 @@ fi %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Wed May 6 2009 Jakub Jelinek 4.4.0-4 +- update from gcc-4_4-branch + - PRs c++/40013, libgcj/39899, libstdc++/39868, libstdc++/39880, + libstdc++/39881, libstdc++/39882, libstdc++/39909, middle-end/39937, + rtl-optimization/39914, target/39565, testsuite/39769, + testsuite/39776, testsuite/39790, testsuite/39807, + tree-optimization/39941 + - fix phiprop tuplification (#496400, PR tree-optimization/40022) +- don't add artificial default case label if switch labels already + cover the whole range (PR middle-end/39666) +- fix DSE with block reads (PR middle-end/40035) +- fix debuginfo for C++ typedef struct {...} T (PR debug/35463) +- remove some unnecessary padding on x86_64/i386 added for >= 4 control + flow insns in a 16-byte block (PR target/39942) +- don't create invalid DWARF location lists containing DW_OP_reg* + followed by DW_OP_deref*, instead use DW_OP_breg* 0 (#481675) +- add libstdc++-docs subpackage, move html manual to it, add doxygen + generated html and man pages + * Mon Apr 27 2009 Jakub Jelinek 4.4.0-3 - update from gcc-4_4-branch - PR bootstrap/39739 gcc44-power7-2.patch: Index: gcc44-power7-2.patch =================================================================== RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc44-power7-2.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- gcc44-power7-2.patch 27 Apr 2009 12:43:31 -0000 1.3 +++ gcc44-power7-2.patch 6 May 2009 18:06:19 -0000 1.4 @@ -9,67 +9,6 @@ (vec_reload_and_reg_): Allow for and of register indirect to not generate insn not found message. - PR testsuite/39769 - * gcc.dg/vmx/3a-04.c (test): Don't rely on floating point equality - for testing the results of estimate instructions. - * gcc.dg/vmx/3a-04m.c (test): Ditto. - * gcc.dg/vmx/3a-05.c (test): Ditto. - ---- gcc/testsuite/gcc.dg/vmx/3a-05.c (revision 146069) -+++ gcc/testsuite/gcc.dg/vmx/3a-05.c (revision 146118) -@@ -14,9 +14,13 @@ f(vector float a, vector float b, vector - - static void test() - { -- check(vec_all_eq(f(((vector float){2,3,5,7}), -+ check(vec_all_gt(f(((vector float){2,3,5,7}), - ((vector float){11,13,17,19}), - ((vector float){23,29,31,37})), -- ((vector float){16.9092026, 18.7693329, -2.8233242, -92.9472198})), -- "f"); -+ ((vector float){16.90, 18.76, -2.83, -92.95})) -+ && vec_all_lt(f(((vector float){2,3,5,7}), -+ ((vector float){11,13,17,19}), -+ ((vector float){23,29,31,37})), -+ ((vector float){16.91, 18.77, -2.82, -92.94})), -+ "f"); - } ---- gcc/testsuite/gcc.dg/vmx/3a-04m.c (revision 146069) -+++ gcc/testsuite/gcc.dg/vmx/3a-04m.c (revision 146118) -@@ -10,9 +10,13 @@ f(vector float a, vector float b, vector - - static void test() - { -- check(vec_all_eq(f(((vector float){2,3,5,7}), -+ check(vec_all_gt(f(((vector float){2,3,5,7}), - ((vector float){11,13,17,19}), - ((vector float){23,29,31,37})), -- ((vector float){23.1818085, 29.2307587, 32.2940826, 128.368393})), -+ ((vector float){23.18, 29.23, 32.29, 128.36})) -+ && vec_all_lt(f(((vector float){2,3,5,7}), -+ ((vector float){11,13,17,19}), -+ ((vector float){23,29,31,37})), -+ ((vector float){23.19, 29.24, 32.30, 128.37})), - "f"); - } ---- gcc/testsuite/gcc.dg/vmx/3a-04.c (revision 146069) -+++ gcc/testsuite/gcc.dg/vmx/3a-04.c (revision 146118) -@@ -10,9 +10,13 @@ f(vector float a, vector float b, vector - - static void test() - { -- check(vec_all_eq(f(((vector float){2,3,5,7}), -+ check(vec_all_gt(f(((vector float){2,3,5,7}), - ((vector float){11,13,17,19}), - ((vector float){23,29,31,37})), -- ((vector float){23.1818085, 29.2307587, 32.2940826, 128.368393})), -+ ((vector float){23.18, 29.23, 32.29, 128.36})) -+ && vec_all_lt(f(((vector float){2,3,5,7}), -+ ((vector float){11,13,17,19}), -+ ((vector float){23,29,31,37})), -+ ((vector float){23.19, 29.24, 32.30, 128.37})), - "f"); - } --- gcc/config/rs6000/vector.md (revision 146069) +++ gcc/config/rs6000/vector.md (revision 146118) @@ -129,14 +129,15 @@ (define_expand "reload__ + + * config/rs6000/vector.md (vector_vsel): Generate the insns + directly instead of calling VSX/Altivec expanders. + + * config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Map VSX + builtins that are identical to Altivec, to the Altivec vesion. + (altivec_overloaded_builtins): Add V2DF/V2DI sel, perm support. + (altivec_resolve_overloaded_builtin): Add V2DF/V2DI support. + + * config/rs6000/rs6000.c (rs6000_expand_vector_init): Rename VSX + splat functions. + (expand_vector_set): Merge V2DF/V2DI code. + (expand_vector_extract): Ditto. + (bdesc_3arg): Add more VSX builtins. + (bdesc_2arg): Ditto. + (bdesc_1arg): Ditto. + (rs6000_expand_ternop_builtin): Require xxpermdi 3rd argument to + be 2 bit-constant, and V2DF/V2DI set to be a 1 bit-constant. + (altivec_expand_builtin): Add support for VSX overloaded builtins. + (altivec_init_builtins): Ditto. + (rs6000_common_init_builtins): Ditto. + (rs6000_init_builtins): Add V2DI types and vector long support. + (rs6000_handle_altivec_attribute): Ditto. + (rs6000_mange_type): Ditto. + + * config/rs6000/vsx.md (UNSPEC_*): Add new UNSPEC constants. + (vsx_vsel): Add support for all vector types, including + Altivec types. + (vsx_ftrunc2): Emit the correct instruction. + (vsx_xri): New builtin rounding mode insns. + (vsx_xric): Ditto. + (vsx_concat_): Key off of VSX memory instructions being + generated instead of the vector arithmetic unit to enable V2DI + mode. + (vsx_extract_): Ditto. + (vsx_set_): Rewrite as an unspec. + (vsx_xxpermdi2_): Rename old vsx_xxpermdi_ here. Key + off of VSX memory instructions instead of arithmetic unit. + (vsx_xxpermdi_): New insn for __builtin_vsx_xxpermdi. + (vsx_splat_): Rename from vsx_splat. + (vsx_xxspltw_): Change from V4SF only to V4SF/V4SI modes. + Fix up constraints. Key off of memory instructions instead of + arithmetic instructions to allow use with V4SI. + (vsx_xxmrghw_): Ditto. + (vsx_xxmrglw_): Ditto. + (vsx_xxsldwi_): Implement vector shift double by word + immediate. + + * config/rs6000/rs6000.h (VSX_BUILTIN_*): Update for current + builtins being generated. + (RS6000_BTI_unsigned_V2DI): Add vector long support. + (RS6000_BTI_bool_long): Ditto. + (RS6000_BTI_bool_V2DI): Ditto. + (unsigned_V2DI_type_node): Ditto. + (bool_long_type_node): Ditto. + (bool_V2DI_type_node): Ditto. + + * config/rs6000/altivec.md (altivec_vsel): Add '*' since we + don't need the generator function now. Use VSX instruction if + -mvsx. + (altivec_vmrghw): Use VSX instruction if -mvsx. + (altivec_vmrghsf): Ditto. + (altivec_vmrglw): Ditto. + (altivec_vmrglsf): Ditto. + + * doc/extend.texi (PowerPC AltiVec/VSX Built-in Functions): + Document that under VSX, vector double/long are available. + +testsuite/ + * gcc.target/powerpc/vsx-builtin-3.c: New test for VSX builtins. + +2009-04-23 Michael Meissner + + * config/rs6000/vector.md (VEC_E): New iterator to add V2DImode. + (vec_init): Use VEC_E instead of VEC_C iterator, to add + V2DImode support. + (vec_set): Ditto. + (vec_extract): Ditto. + + * config/rs6000/predicates.md (easy_vector_constant): Add support + for setting TImode to 0. + + * config/rs6000/rs6000.opt (-mvsx-vector-memory): Delete old debug + switch that is no longer used. + (-mvsx-vector-float): Ditto. + (-mvsx-vector-double): Ditto. + (-mvsx-v4sf-altivec-regs): Ditto. + (-mreload-functions): Ditto. + (-mallow-timode): New debug switch. + + * config/rs6000/rs6000.c (rs6000_ira_cover_classes): New target + hook for IRA cover classes, to know that under VSX the float and + altivec registers are part of the same register class, but before + they weren't. + (TARGET_IRA_COVER_CLASSES): Set ira cover classes target hookd. + (rs6000_hard_regno_nregs): Key off of whether VSX/Altivec memory + instructions are supported, and not whether the vector unit has + arithmetic support to enable V2DI/TI mode. + (rs6000_hard_regno_mode_ok): Ditto. + (rs6000_init_hard_regno_mode_ok): Add V2DImode, TImode support. + Drop several of the debug switches. + (rs6000_emit_move): Force TImode constants to memory if we have + either Altivec or VSX. + (rs6000_builtin_conversion): Use correct insns for V2DI<->V2DF + conversions. + (rs6000_expand_vector_init): Add V2DI support. + (rs6000_expand_vector_set): Ditto. + (avoiding_indexed_address_p): Simplify tests to say if the mode + uses VSX/Altivec memory instructions we can't eliminate reg+reg + addressing. + (rs6000_legitimize_address): Move VSX/Altivec REG+REG support + before the large integer support. + (rs6000_legitimate_address): Add support for TImode in VSX/Altivec + registers. + (rs6000_emit_move): Ditto. + (def_builtin): Change internal error message to provide more + information. + (bdesc_2arg): Add conversion builtins. + (builtin_hash_function): New function for hashing all of the types + for builtin functions. + (builtin_hash_eq): Ditto. + (builtin_function_type): Ditto. + (builtin_mode_to_type): New static for builtin argument hashing. + (builtin_hash_table): Ditto. + (rs6000_common_init_builtins): Rewrite so that types for builtin + functions are only created when we need them, and use a hash table + to store all of the different argument combinations that are + created. Add support for VSX conversion builtins. + (rs6000_preferred_reload_class): Add TImode support. + (reg_classes_cannot_change_mode_class): Be stricter about VSX and + Altivec vector types. + (rs6000_emit_vector_cond_expr): Use VSX_MOVE_MODE, not + VSX_VECTOR_MOVE_MODE. + (rs6000_handle_altivec_attribute): Allow __vector long on VSX. + + * config/rs6000/vsx.md (VSX_D): New iterator for vectors with + 64-bit elements. + (VSX_M): New iterator for 128 bit types for moves, except for + TImode. + (VSm, VSs, VSr): Add TImode. + (VSr4, VSr5): New mode attributes for float<->double conversion. + (VSX_SPDP): New iterator for float<->double conversion. + (VS_spdp_*): New mode attributes for float<->double conversion. + (UNSPEC_VSX_*): Rename unspec constants to remove XV from the + names. Change all users. + (vsx_mov): Drop TImode support here. + (vsx_movti): New TImode support, allow GPRs, but favor VSX + registers. + (vsx_): New support for float<->double conversions. + (vsx_xvcvdpsp): Delete, move into vsx_. + (vsx_xvcvspdp): Ditto. + (vsx_xvcvuxdsp): New conversion insn. + (vsx_xvcvspsxds): Ditto. + (vsx_xvcvspuxds): Ditto. + (vsx_concat_): Generalize V2DF permute/splat operations to + include V2DI. + (vsx_set_): Ditto. + (vsx_extract_): Ditto. + (vsx_xxpermdi_): Ditto. + (vsx_splat): Ditto. + + * config/rs6000/rs6000.h (VSX_VECTOR_MOVE_MODE): Delete. + (VSX_MOVE_MODE): Add TImode. + (IRA_COVER_CLASSES): Delete. + (IRA_COVER_CLASSES_PRE_VSX): New cover classes for machines + without VSX where float and altivec are different registers. + (IRA_COVER_CLASS_VSX): New cover classes for machines with VSX + where float and altivec are part of the same register class. + + * config/rs6000/altivec.md (VM2): New iterator for 128-bit types, + except TImode. + (altivec_mov): Drop movti mode here. + (altivec_movti): Add movti insn, and allow GPRs, but favor altivec + registers. + +2009-04-16 Michael Meissner + + * config/rs6000/rs6000-protos.h (rs6000_has_indirect_jump_p): New + declaration. + (rs6000_set_indirect_jump): Ditto. + + * config/rs6000/rs6000.c (struct machine_function): Add + indirect_jump_p field. + (rs6000_override_options): Wrap warning messages in N_(). If + -mvsx was implicitly set, don't give a warning for -msoft-float, + just silently turn off vsx. + (rs6000_secondary_reload_inner): Don't use strict register + checking, since pseudos may still be present. + (register_move_cost): If -mdebug=cost, print out cost information. + (rs6000_memory_move_cost): Ditto. + (rs6000_has_indirect_jump_p): New function, return true if + current function has an indirect jump. + (rs6000_set_indirect_jump): New function, note that an indirect + jump has been generated. + + * config/rs6000/rs6000.md (indirect_jump): Note that we've + generated an indirect jump. + (tablejump): Ditto. + (doloop_end): Do not generate decrement ctr and branch + instructions if an indirect jump has been generated. + --- gcc/doc/extend.texi (revision 146119) +++ gcc/doc/extend.texi (revision 146798) @@ -7094,7 +7094,7 @@ instructions, but allow the compiler to @@ -253,208 +455,6 @@ + d[i][0] = __builtin_vsx_xxsldwi (d[i][1], d[i][2], 3); i++; + return i; +} -2009-04-26 Michael Meissner - - * config/rs6000/vector.md (vector_vsel): Generate the insns - directly instead of calling VSX/Altivec expanders. - - * config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Map VSX - builtins that are identical to Altivec, to the Altivec vesion. - (altivec_overloaded_builtins): Add V2DF/V2DI sel, perm support. - (altivec_resolve_overloaded_builtin): Add V2DF/V2DI support. - - * config/rs6000/rs6000.c (rs6000_expand_vector_init): Rename VSX - splat functions. - (expand_vector_set): Merge V2DF/V2DI code. - (expand_vector_extract): Ditto. - (bdesc_3arg): Add more VSX builtins. - (bdesc_2arg): Ditto. - (bdesc_1arg): Ditto. - (rs6000_expand_ternop_builtin): Require xxpermdi 3rd argument to - be 2 bit-constant, and V2DF/V2DI set to be a 1 bit-constant. - (altivec_expand_builtin): Add support for VSX overloaded builtins. - (altivec_init_builtins): Ditto. - (rs6000_common_init_builtins): Ditto. - (rs6000_init_builtins): Add V2DI types and vector long support. - (rs6000_handle_altivec_attribute): Ditto. - (rs6000_mange_type): Ditto. - - * config/rs6000/vsx.md (UNSPEC_*): Add new UNSPEC constants. - (vsx_vsel): Add support for all vector types, including - Altivec types. - (vsx_ftrunc2): Emit the correct instruction. - (vsx_xri): New builtin rounding mode insns. - (vsx_xric): Ditto. - (vsx_concat_): Key off of VSX memory instructions being - generated instead of the vector arithmetic unit to enable V2DI - mode. - (vsx_extract_): Ditto. - (vsx_set_): Rewrite as an unspec. - (vsx_xxpermdi2_): Rename old vsx_xxpermdi_ here. Key - off of VSX memory instructions instead of arithmetic unit. - (vsx_xxpermdi_): New insn for __builtin_vsx_xxpermdi. - (vsx_splat_): Rename from vsx_splat. - (vsx_xxspltw_): Change from V4SF only to V4SF/V4SI modes. - Fix up constraints. Key off of memory instructions instead of - arithmetic instructions to allow use with V4SI. - (vsx_xxmrghw_): Ditto. - (vsx_xxmrglw_): Ditto. - (vsx_xxsldwi_): Implement vector shift double by word - immediate. - - * config/rs6000/rs6000.h (VSX_BUILTIN_*): Update for current - builtins being generated. - (RS6000_BTI_unsigned_V2DI): Add vector long support. - (RS6000_BTI_bool_long): Ditto. - (RS6000_BTI_bool_V2DI): Ditto. - (unsigned_V2DI_type_node): Ditto. - (bool_long_type_node): Ditto. - (bool_V2DI_type_node): Ditto. - - * config/rs6000/altivec.md (altivec_vsel): Add '*' since we - don't need the generator function now. Use VSX instruction if - -mvsx. - (altivec_vmrghw): Use VSX instruction if -mvsx. - (altivec_vmrghsf): Ditto. - (altivec_vmrglw): Ditto. - (altivec_vmrglsf): Ditto. - - * doc/extend.texi (PowerPC AltiVec/VSX Built-in Functions): - Document that under VSX, vector double/long are available. - -testsuite/ - * gcc.target/powerpc/vsx-builtin-3.c: New test for VSX builtins. - -2009-04-23 Michael Meissner - - * config/rs6000/vector.md (VEC_E): New iterator to add V2DImode. - (vec_init): Use VEC_E instead of VEC_C iterator, to add - V2DImode support. - (vec_set): Ditto. - (vec_extract): Ditto. - - * config/rs6000/predicates.md (easy_vector_constant): Add support - for setting TImode to 0. - - * config/rs6000/rs6000.opt (-mvsx-vector-memory): Delete old debug - switch that is no longer used. - (-mvsx-vector-float): Ditto. - (-mvsx-vector-double): Ditto. - (-mvsx-v4sf-altivec-regs): Ditto. - (-mreload-functions): Ditto. - (-mallow-timode): New debug switch. - - * config/rs6000/rs6000.c (rs6000_ira_cover_classes): New target - hook for IRA cover classes, to know that under VSX the float and - altivec registers are part of the same register class, but before - they weren't. - (TARGET_IRA_COVER_CLASSES): Set ira cover classes target hookd. - (rs6000_hard_regno_nregs): Key off of whether VSX/Altivec memory - instructions are supported, and not whether the vector unit has - arithmetic support to enable V2DI/TI mode. - (rs6000_hard_regno_mode_ok): Ditto. - (rs6000_init_hard_regno_mode_ok): Add V2DImode, TImode support. - Drop several of the debug switches. - (rs6000_emit_move): Force TImode constants to memory if we have - either Altivec or VSX. - (rs6000_builtin_conversion): Use correct insns for V2DI<->V2DF - conversions. - (rs6000_expand_vector_init): Add V2DI support. - (rs6000_expand_vector_set): Ditto. - (avoiding_indexed_address_p): Simplify tests to say if the mode - uses VSX/Altivec memory instructions we can't eliminate reg+reg - addressing. - (rs6000_legitimize_address): Move VSX/Altivec REG+REG support - before the large integer support. - (rs6000_legitimate_address): Add support for TImode in VSX/Altivec - registers. - (rs6000_emit_move): Ditto. - (def_builtin): Change internal error message to provide more - information. - (bdesc_2arg): Add conversion builtins. - (builtin_hash_function): New function for hashing all of the types - for builtin functions. - (builtin_hash_eq): Ditto. - (builtin_function_type): Ditto. - (builtin_mode_to_type): New static for builtin argument hashing. - (builtin_hash_table): Ditto. - (rs6000_common_init_builtins): Rewrite so that types for builtin - functions are only created when we need them, and use a hash table - to store all of the different argument combinations that are - created. Add support for VSX conversion builtins. - (rs6000_preferred_reload_class): Add TImode support. - (reg_classes_cannot_change_mode_class): Be stricter about VSX and - Altivec vector types. - (rs6000_emit_vector_cond_expr): Use VSX_MOVE_MODE, not - VSX_VECTOR_MOVE_MODE. - (rs6000_handle_altivec_attribute): Allow __vector long on VSX. - - * config/rs6000/vsx.md (VSX_D): New iterator for vectors with - 64-bit elements. - (VSX_M): New iterator for 128 bit types for moves, except for - TImode. - (VSm, VSs, VSr): Add TImode. - (VSr4, VSr5): New mode attributes for float<->double conversion. - (VSX_SPDP): New iterator for float<->double conversion. - (VS_spdp_*): New mode attributes for float<->double conversion. - (UNSPEC_VSX_*): Rename unspec constants to remove XV from the - names. Change all users. - (vsx_mov): Drop TImode support here. - (vsx_movti): New TImode support, allow GPRs, but favor VSX - registers. - (vsx_): New support for float<->double conversions. - (vsx_xvcvdpsp): Delete, move into vsx_. - (vsx_xvcvspdp): Ditto. - (vsx_xvcvuxdsp): New conversion insn. - (vsx_xvcvspsxds): Ditto. - (vsx_xvcvspuxds): Ditto. - (vsx_concat_): Generalize V2DF permute/splat operations to - include V2DI. - (vsx_set_): Ditto. - (vsx_extract_): Ditto. - (vsx_xxpermdi_): Ditto. - (vsx_splat): Ditto. - - * config/rs6000/rs6000.h (VSX_VECTOR_MOVE_MODE): Delete. - (VSX_MOVE_MODE): Add TImode. - (IRA_COVER_CLASSES): Delete. - (IRA_COVER_CLASSES_PRE_VSX): New cover classes for machines - without VSX where float and altivec are different registers. - (IRA_COVER_CLASS_VSX): New cover classes for machines with VSX - where float and altivec are part of the same register class. - - * config/rs6000/altivec.md (VM2): New iterator for 128-bit types, - except TImode. - (altivec_mov): Drop movti mode here. - (altivec_movti): Add movti insn, and allow GPRs, but favor altivec - registers. - -2009-04-16 Michael Meissner - - * config/rs6000/rs6000-protos.h (rs6000_has_indirect_jump_p): New - declaration. - (rs6000_set_indirect_jump): Ditto. - - * config/rs6000/rs6000.c (struct machine_function): Add - indirect_jump_p field. - (rs6000_override_options): Wrap warning messages in N_(). If - -mvsx was implicitly set, don't give a warning for -msoft-float, - just silently turn off vsx. - (rs6000_secondary_reload_inner): Don't use strict register - checking, since pseudos may still be present. - (register_move_cost): If -mdebug=cost, print out cost information. - (rs6000_memory_move_cost): Ditto. - (rs6000_has_indirect_jump_p): New function, return true if - current function has an indirect jump. - (rs6000_set_indirect_jump): New function, note that an indirect - jump has been generated. - - * config/rs6000/rs6000.md (indirect_jump): Note that we've - generated an indirect jump. - (tablejump): Ditto. - (doloop_end): Do not generate decrement ctr and branch - instructions if an indirect jump has been generated. - --- gcc/config/rs6000/vector.md (revision 146119) +++ gcc/config/rs6000/vector.md (revision 146798) @@ -39,6 +39,9 @@ (define_mode_iterator VEC_M [V16QI V8HI gcc44-rh330771.patch: Index: gcc44-rh330771.patch =================================================================== RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc44-rh330771.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- gcc44-rh330771.patch 16 Jan 2009 18:34:38 -0000 1.1 +++ gcc44-rh330771.patch 6 May 2009 18:06:19 -0000 1.2 @@ -3,20 +3,20 @@ * Makefile.am (libgcj_tools_la_LIBADD): Add. * Makefile.in: Regenerated. ---- libjava/Makefile.am.jj 2007-03-17 09:20:30.000000000 +0100 -+++ libjava/Makefile.am 2007-10-16 15:45:14.000000000 +0200 -@@ -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 +--- libjava/Makefile.am.jj 2009-05-06 08:14:50.000000000 +0200 ++++ libjava/Makefile.am 2009-05-06 10:26:43.000000000 +0200 +@@ -314,6 +314,8 @@ libgcj_tools_la_SOURCES = classpath/tool + libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \ + -fno-bootstrap-classes -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_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 -@@ -153,7 +153,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt +--- libjava/Makefile.in.jj 2009-05-06 08:14:49.000000000 +0200 ++++ libjava/Makefile.in 2009-05-06 10:27:18.000000000 +0200 +@@ -160,7 +160,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) @@ -24,10 +24,10 @@ am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS) @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 +@@ -1041,6 +1040,7 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS + -fno-bootstrap-classes -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` \ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/F-11/sources,v retrieving revision 1.276 retrieving revision 1.277 diff -u -p -r1.276 -r1.277 --- sources 27 Apr 2009 12:43:32 -0000 1.276 +++ sources 6 May 2009 18:06:19 -0000 1.277 @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -373986714230ac85e2d6d6e4abb107e0 gcc-4.4.0-20090427.tar.bz2 +6c9913dfb6fffdf023f8de836e6b9043 gcc-4.4.0-20090506.tar.bz2 --- gcc44-pr39903.patch DELETED --- From hadess at fedoraproject.org Wed May 6 18:12:43 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 6 May 2009 18:12:43 +0000 (UTC) Subject: rpms/totem/devel totem.spec,1.236,1.237 Message-ID: <20090506181243.DEE2370108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25205 Modified Files: totem.spec Log Message: * Wed May 06 2009 Bastien Nocera 2.27.1-1 - Update to 2.27.1 - Remove xine-lib backend Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -p -r1.236 -r1.237 --- totem.spec 6 May 2009 17:54:14 -0000 1.236 +++ totem.spec 6 May 2009 18:12:13 -0000 1.237 @@ -366,12 +366,12 @@ fi - Update to 2.27.1 - Remove xine-lib backend -* Thu Apr 23 2009 Bastien Nocera 2.26.1-4 -- Add missing gnome-python2-gconf req (#483265) - * Tue Apr 28 2009 Bastien Nocera 2.26.1-3 - Add missing pyxdg requires for the OpenSubtitles plugin (#497787) +* Thu Apr 23 2009 Bastien Nocera 2.26.1-4 +- Add missing gnome-python2-gconf req (#483265) + * Thu Apr 02 2009 - Bastien Nocera - 2.26.1-2 - Update patch to set the PA stream volume, avoids setting the volume when pulsesink isn't in a state where it has a stream From timj at fedoraproject.org Wed May 6 18:14:02 2009 From: timj at fedoraproject.org (Tim Jackson) Date: Wed, 6 May 2009 18:14:02 +0000 (UTC) Subject: rpms/rapidsvn/devel .cvsignore, 1.6, 1.7 rapidsvn.spec, 1.18, 1.19 sources, 1.6, 1.7 rapidsvn-gcc43.patch, 1.1, NONE Message-ID: <20090506181402.92C5370108@cvs1.fedora.phx.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25171 Modified Files: .cvsignore rapidsvn.spec sources Removed Files: rapidsvn-gcc43.patch Log Message: Update to 0.9.8 (#495694) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 16 Mar 2008 11:21:43 -0000 1.6 +++ .cvsignore 6 May 2009 18:13:31 -0000 1.7 @@ -1 +1 @@ -rapidsvn-0.9.6.tar.gz +rapidsvn-0.9.8.tar.gz Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- rapidsvn.spec 14 Apr 2009 12:55:45 -0000 1.18 +++ rapidsvn.spec 6 May 2009 18:13:32 -0000 1.19 @@ -1,13 +1,12 @@ Name: rapidsvn -Version: 0.9.6 -Release: 5%{?dist} +Version: 0.9.8 +Release: 1%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools -License: GPLv2+ +License: GPLv3+ URL: http://www.rapidsvn.org/ Source0: http://rapidsvn.org/download/release/%{version}/rapidsvn-%{version}.tar.gz -Patch0: rapidsvn-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,7 +34,7 @@ interface. %package -n svncpp Summary: C++ bindings for the Subversion client library Group: Development/Libraries -License: LGPLv2+ +License: GPLv3+ BuildRequires: subversion-devel # for test framework BuildRequires: cppunit-devel @@ -50,7 +49,7 @@ many parts of the C API and provides an %package -n svncpp-devel Summary: Development resources for the 'svncpp' library Group: Development/Libraries -License: LGPLv2+ +License: GPLv3+ Requires: svncpp = %{version}-%{release} %description -n svncpp-devel @@ -60,7 +59,6 @@ Install this package if you need to comp %prep %setup -q -%patch0 -p1 %{__cat} <rapidsvn.desktop [Desktop Entry] @@ -93,19 +91,19 @@ EOF make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool pushd doc/manpage +make manpage iconv --from-code ISO-8859-1 --to-code UTF-8 --output rapidsvn.1.utf8 rapidsvn.1 mv rapidsvn.1.utf8 rapidsvn.1 popd %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool # Install desktop file and icon %{__install} -D -m 644 src/res/bitmaps/rapidsvn_48x48.xpm %{buildroot}%{_datadir}/pixmaps/rapidsvn.xpm %{__install} -d -m 755 %{buildroot}%{_datadir}/applications/ desktop-file-install --vendor fedora \ - --add-category X-Fedora \ --dir %{buildroot}%{_datadir}/applications \ rapidsvn.desktop @@ -139,16 +137,17 @@ rm -rf %{buildroot} %{_mandir}/man1/* %files -n svncpp -%doc LGPL.txt %{_libdir}/libsvncpp.so.* %files -n svncpp-devel -%doc LGPL.txt doc/svncpp/html +%doc doc/svncpp/html %{_includedir}/svncpp/ %{_libdir}/libsvncpp.so %changelog -* Tue Apr 14 2009 Tim Jackson 0.9.6-4 +* Tue Apr 14 2009 Tim Jackson 0.9.8-1 +- Update to v0.9.8 +- License is now GPLv3+ - Update .desktop file categories (#487867) * Wed Feb 25 2009 Fedora Release Engineering - 0.9.6-4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 16 Mar 2008 11:21:43 -0000 1.6 +++ sources 6 May 2009 18:13:32 -0000 1.7 @@ -1 +1 @@ -d1465492e67998582e7c1767dc9e7352 rapidsvn-0.9.6.tar.gz +1b49d893027ae83dbcff3d7508b3f42f rapidsvn-0.9.8.tar.gz --- rapidsvn-gcc43.patch DELETED --- From ensc at fedoraproject.org Wed May 6 18:32:51 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Wed, 6 May 2009 18:32:51 +0000 (UTC) Subject: rpms/tor/devel tor.spec,1.30,1.31 Message-ID: <20090506183251.84A3470108@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27469 Modified Files: tor.spec Log Message: updated Index: tor.spec =================================================================== RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- tor.spec 7 Mar 2009 13:17:05 -0000 1.30 +++ tor.spec 6 May 2009 18:32:20 -0000 1.31 @@ -1,5 +1,6 @@ ## This package understands the following switches: %bcond_without fedora +%bcond_without noarch %global username toranon @@ -7,11 +8,12 @@ %global homedir %_var/lib/%name %global logdir %_var/log/%name +%{?with_noarch:%global noarch BuildArch: noarch} %{!?release_func:%global release_func() %1%{?dist}} Name: tor Version: 0.2.0.34 -Release: %release_func 3 +Release: %release_func 4 Group: System Environment/Daemons License: BSD Summary: Anonymizing overlay network for TCP (The onion router) @@ -50,11 +52,11 @@ Group: System Environment/Daemons Provides: init(%name) = lsb Requires: %name-core = %version-%release Source10: tor.lsb -BuildArch: noarch Requires(pre): %name-core Requires(postun): lsb-core-noarch %name-core Requires(post): lsb-core-noarch Requires(preun): lsb-core-noarch +%{?noarch} %package upstart @@ -67,7 +69,7 @@ Requires: %name = %version-%release Requires(pre): /etc/event.d Requires(post): /usr/bin/killall Requires(postun): /sbin/initctl -BuildArch: noarch +%{?noarch} %description @@ -232,6 +234,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 6 2009 Enrico Scholz - 0.2.0.34-4 +- made it easy to rebuild package in RHEL by adding a 'noarch' + conditional to enable/disable noarch subpackages + * Sat Mar 7 2009 Enrico Scholz - 0.2.0.34-3 - added -upstart subpackage (-lsb still wins by default as there exists no end-user friendly solution for managing upstart initscripts) From wart at fedoraproject.org Wed May 6 18:36:38 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Wed, 6 May 2009 18:36:38 +0000 (UTC) Subject: rpms/manaworld/F-11 .cvsignore, 1.13, 1.14 manaworld.spec, 1.17, 1.18 sources, 1.13, 1.14 Message-ID: <20090506183638.3AAD870108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/manaworld/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27840 Modified Files: .cvsignore manaworld.spec sources Log Message: Update to 0.0.28.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/F-11/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- .cvsignore 27 Jan 2009 19:01:21 -0000 1.13 +++ .cvsignore 6 May 2009 18:36:07 -0000 1.14 @@ -1 +1 @@ -tmw-0.0.28.tar.gz +tmw-0.0.28.1.tar.gz Index: manaworld.spec =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/F-11/manaworld.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- manaworld.spec 25 Feb 2009 23:18:11 -0000 1.17 +++ manaworld.spec 6 May 2009 18:36:07 -0000 1.18 @@ -1,6 +1,6 @@ Name: manaworld -Version: 0.0.28 -Release: 2%{?dist} +Version: 0.0.28.1 +Release: 1%{?dist} Summary: 2D MMORPG world Group: Amusements/Games @@ -80,6 +80,9 @@ fi %changelog +* Tue May 5 2009 Wart 0.0.28.1-1 +- Update to 0.0.28.1 + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/F-11/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 27 Jan 2009 19:01:22 -0000 1.13 +++ sources 6 May 2009 18:36:07 -0000 1.14 @@ -1 +1 @@ -7d157a95e761ef7bee6f6a04645355ba tmw-0.0.28.tar.gz +d92b06bb580df72587a668f97b8fd6a7 tmw-0.0.28.1.tar.gz From notting at fedoraproject.org Wed May 6 18:47:57 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Wed, 6 May 2009 18:47:57 +0000 (UTC) Subject: rpms/mash/devel .cvsignore, 1.40, 1.41 mash.spec, 1.46, 1.47 sources, 1.42, 1.43 Message-ID: <20090506184757.DB95E70108@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/mash/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29642 Modified Files: .cvsignore mash.spec sources Log Message: 0.5.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- .cvsignore 8 Jan 2009 18:16:46 -0000 1.40 +++ .cvsignore 6 May 2009 18:47:27 -0000 1.41 @@ -1 +1 @@ -mash-0.4.9.tar.gz +mash-0.5.4.tar.gz Index: mash.spec =================================================================== RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -r1.46 -r1.47 --- mash.spec 10 Mar 2009 05:36:41 -0000 1.46 +++ mash.spec 6 May 2009 18:47:27 -0000 1.47 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: mash -Version: 0.4.9 -Release: 3%{?dist} +Version: 0.5.4 +Release: 1%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPL @@ -13,7 +13,6 @@ Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 BuildRequires: python-devel BuildArch: noarch -Patch0: 0001-Add-the-F11-Test-key-to-the-rawhide-config.patch %description mash is a tool that queries a koji buildsystem for the latest RPMs for @@ -22,7 +21,6 @@ any multlib RPMs that are necessary. %prep %setup -q -%patch0 -p1 %build %{__python} setup.py build @@ -46,11 +44,25 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog -* Mon Mar 09 2009 Jesse Keating - 0.4.9-3 -- Add an upstream patch for F11 test key - -* Wed Feb 25 2009 Fedora Release Engineering - 0.4.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed May 6 2009 Bill Nottingham 0.5.4-1 +- allow configuring createrepo hash type +- remove old config files + +* Mon Apr 27 2009 Bill Nottingham 0.5.3-1 +- when copying in old deltas, make sure the signatures match current packages +- don't delta source and debuginfo packages + +* Fri Apr 17 2009 Bill Nottingham 0.5.2-1 +- set a max size for deltarpm-able packages (#496242) + +* Thu Apr 16 2009 Bill Nottingham 0.5.1-1 +- delta fixes +- handle qt/kde plugins better (#495947) + +* Wed Apr 15 2009 Bill Nottingham 0.5.0-1 +- Add support for generating deltas with createrepo +- add F11 key to config () +- various multlib updates (#485242, etc.) * Thu Jan 8 2009 Bill Nottingham 0.4.9-1 - error out if strict_keys is set and we can't download the signed package Index: sources =================================================================== RCS file: /cvs/extras/rpms/mash/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -p -r1.42 -r1.43 --- sources 8 Jan 2009 18:16:46 -0000 1.42 +++ sources 6 May 2009 18:47:27 -0000 1.43 @@ -1 +1 @@ -7306348a2a2dec270bc03e348817683b mash-0.4.9.tar.gz +39e727aebb1bf68d4b6c23cb35067b63 mash-0.5.4.tar.gz From wart at fedoraproject.org Wed May 6 18:49:50 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Wed, 6 May 2009 18:49:50 +0000 (UTC) Subject: rpms/manaworld/F-10 .cvsignore, 1.13, 1.14 manaworld.spec, 1.16, 1.17 sources, 1.13, 1.14 Message-ID: <20090506184950.DE64270108@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/manaworld/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30011 Modified Files: .cvsignore manaworld.spec sources Log Message: Update to 0.0.28.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/F-10/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- .cvsignore 27 Jan 2009 19:50:33 -0000 1.13 +++ .cvsignore 6 May 2009 18:49:20 -0000 1.14 @@ -1 +1 @@ -tmw-0.0.28.tar.gz +tmw-0.0.28.1.tar.gz Index: manaworld.spec =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/F-10/manaworld.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- manaworld.spec 27 Jan 2009 19:50:33 -0000 1.16 +++ manaworld.spec 6 May 2009 18:49:20 -0000 1.17 @@ -1,5 +1,5 @@ Name: manaworld -Version: 0.0.28 +Version: 0.0.28.1 Release: 1%{?dist} Summary: 2D MMORPG world @@ -80,6 +80,9 @@ fi %changelog +* Tue May 5 2009 Wart 0.0.28.1-1 +- Update to 0.0.28.1 + * Tue Jan 27 2009 Wart 0.0.28-1 - Update to 0.0.28 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/manaworld/F-10/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 27 Jan 2009 19:50:33 -0000 1.13 +++ sources 6 May 2009 18:49:20 -0000 1.14 @@ -1 +1 @@ -7d157a95e761ef7bee6f6a04645355ba tmw-0.0.28.tar.gz +d92b06bb580df72587a668f97b8fd6a7 tmw-0.0.28.1.tar.gz From langel at fedoraproject.org Wed May 6 18:56:29 2009 From: langel at fedoraproject.org (Lillian Angel) Date: Wed, 6 May 2009 18:56:29 +0000 (UTC) Subject: rpms/java-1.6.0-openjdk/F-11 java-1.6.0-openjdk.spec,1.118,1.119 Message-ID: <20090506185629.B068E70108@cvs1.fedora.phx.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30827 Modified Files: java-1.6.0-openjdk.spec Log Message: * Wed May 6 2009 Lillian Angel - 1:1.6.0.0-20.b14 - Added devel requirement for netbeans-platform Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -p -r1.118 -r1.119 --- java-1.6.0-openjdk.spec 27 Apr 2009 23:49:15 -0000 1.118 +++ java-1.6.0-openjdk.spec 6 May 2009 18:55:59 -0000 1.119 @@ -276,6 +276,8 @@ Group: Development/Tools # Require base package. Requires: %{name} = %{epoch}:%{version}-%{release} +# For visualvm +Requires: netbeans-platform # Post requires alternatives to install tool alternatives. Requires(post): %{_sbindir}/alternatives # Postun requires alternatives to uninstall tool alternatives. @@ -929,6 +931,9 @@ exit 0 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so %changelog +* Wed May 6 2009 Lillian Angel - 1:1.6.0.0-20.b14 +- Added devel requirement for netbeans-platform + * Mon Apr 27 2009 Christopher Aillon - 1:1.6.0.0-20.b14 - Rebuild against newer gecko From lennart at fedoraproject.org Wed May 6 18:57:28 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Wed, 6 May 2009 18:57:28 +0000 (UTC) Subject: rpms/libatasmart/F-11 libatasmart.spec,1.16,1.17 Message-ID: <20090506185728.D0DF270108@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libatasmart/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30976 Modified Files: libatasmart.spec Log Message: Update handling of one ST drive, add another quirk for a weird FUJITSU drive (rhbz 498284) Index: libatasmart.spec =================================================================== RCS file: /cvs/pkgs/rpms/libatasmart/F-11/libatasmart.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- libatasmart.spec 22 Apr 2009 23:37:01 -0000 1.16 +++ libatasmart.spec 6 May 2009 18:56:58 -0000 1.17 @@ -1,6 +1,6 @@ Name: libatasmart Version: 0.12 -Release: 2%{?dist} +Release: 3%{?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 @@ -11,6 +11,8 @@ BuildRequires: libudev-devel Patch1: 0001-don-t-claim-we-would-know-what-reallocated-event-cou.patch Patch2: 0001-Seagate-s-ST9160821AS-drive-encodes-something-strang.patch Patch3: 0001-use-only-uppermost-32-bits-for-reallocated-sectors-c.patch +Patch4: 0001-Get-rid-of-qurik-9_UNKNOWN-again.patch +Patch5: 0001-black-list-a-few-attributes-on-FUJITSU-MHY2120BH-008.patch %description A small and lightweight parser library for ATA S.M.A.R.T. hard disk @@ -33,6 +35,8 @@ Development Files for libatasmart Client %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %configure --disable-static @@ -61,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* %changelog +* Wed May 6 2009 Lennart Poettering 0.12-3 +- Update handling of one ST drive, add another quirk for a weird FUJITSU drive (rhbz 498284) + * Wed Apr 22 2009 Lennart Poettering 0.12-2 - Properly handle some ST and FUJITSU drive attributes. (rhbz 496087, 497107) From langel at fedoraproject.org Wed May 6 18:57:45 2009 From: langel at fedoraproject.org (Lillian Angel) Date: Wed, 6 May 2009 18:57:45 +0000 (UTC) Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.117,1.118 Message-ID: <20090506185745.22A5170108@cvs1.fedora.phx.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31022 Modified Files: java-1.6.0-openjdk.spec Log Message: * Wed May 6 2009 Lillian Angel - 1:1.6.0.0-20.b14 - Added devel requirement for netbeans-platform 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.117 retrieving revision 1.118 diff -u -p -r1.117 -r1.118 --- java-1.6.0-openjdk.spec 28 Apr 2009 03:26:56 -0000 1.117 +++ java-1.6.0-openjdk.spec 6 May 2009 18:57:14 -0000 1.118 @@ -276,6 +276,8 @@ Group: Development/Tools # Require base package. Requires: %{name} = %{epoch}:%{version}-%{release} +# For visualvm +Requires: netbeans-platform # Post requires alternatives to install tool alternatives. Requires(post): %{_sbindir}/alternatives # Postun requires alternatives to uninstall tool alternatives. @@ -929,6 +931,9 @@ exit 0 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so %changelog +* Wed May 6 2009 Lillian Angel - 1:1.6.0.0-20.b14 +- Added devel requirement for netbeans-platform + * Mon Apr 27 2009 Christopher Aillon - 1:1.6.0.0-20.b14 - Rebuild against newer gecko From lennart at fedoraproject.org Wed May 6 19:01:30 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Wed, 6 May 2009 19:01:30 +0000 (UTC) Subject: rpms/libatasmart/F-11 0001-Get-rid-of-qurik-9_UNKNOWN-again.patch, NONE, 1.1 0001-black-list-a-few-attributes-on-FUJITSU-MHY2120BH-008.patch, NONE, 1.1 Message-ID: <20090506190130.EC99070108@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libatasmart/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31614 Added Files: 0001-Get-rid-of-qurik-9_UNKNOWN-again.patch 0001-black-list-a-few-attributes-on-FUJITSU-MHY2120BH-008.patch Log Message: add missing patches 0001-Get-rid-of-qurik-9_UNKNOWN-again.patch: --- NEW FILE 0001-Get-rid-of-qurik-9_UNKNOWN-again.patch --- >From e9e9be9def29ecf57c5d6c1187c7e7e00f165e47 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Apr 2009 00:52:02 +0200 Subject: [PATCH] Get rid of qurik 9_UNKNOWN again Apparently Seagate seems to use the MSB's of the raw data of the power-on-time field for something else on some disks, so let's just look at the lower 32bits of that field and we get a value that works on all disks including those from Seagate. 32bit should be more than enough to encode the power-on-time for almost all disks so this should not be much of a limitation. --- atasmart.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/atasmart.c b/atasmart.c index 5cf6c30..8e21adb 100644 --- a/atasmart.c +++ b/atasmart.c @@ -1128,7 +1128,7 @@ static void make_pretty(SkSmartAttributeParsedData *a) { else if (!strcmp(a->name, "power-on-hours") || !strcmp(a->name, "loaded-hours") || !strcmp(a->name, "head-flying-hours")) - a->pretty_value = fourtyeight * 60 * 60 * 1000; + a->pretty_value = (fourtyeight & 0xFFFFFFFFU) * 60 * 60 * 1000; else if (!strcmp(a->name, "reallocated-sector-count")) a->pretty_value = fourtyeight & 0xFFFFFFFFU; else @@ -1204,8 +1204,7 @@ typedef enum SkSmartQuirk { SK_SMART_QUIRK_194_10XCELSIUS = 32, SK_SMART_QUIRK_194_UNKNOWN = 64, SK_SMART_QUIRK_200_WRITEERRORCOUNT = 128, - SK_SMART_QUIRK_201_DETECTEDTACOUNT = 256, - SK_SMART_QUIRK_9_UNKNOWN = 512 + SK_SMART_QUIRK_201_DETECTEDTACOUNT = 256 } SkSmartQuirk; /* %STRINGPOOLSTART% */ @@ -1219,7 +1218,6 @@ static const char *quirk_name[] = { "194_UNKNOWN", "200_WRITEERRORCOUNT", "201_DETECTEDTACOUNT", - "9_UNKNOWN", NULL }; /* %STRINGPOOLSTOP% */ @@ -1232,12 +1230,6 @@ typedef struct SkSmartQuirkDatabase { static const SkSmartQuirkDatabase quirk_database[] = { { - /*** Seagate */ - "^ST9160821AS$", - NULL, - SK_SMART_QUIRK_9_UNKNOWN - }, { - /*** Fujitsu */ "^FUJITSU MHR2040AT$", NULL, @@ -1459,8 +1451,7 @@ static const SkSmartAttributeInfo *lookup_attribute(SkDisk *d, uint8_t id) { "power-on-half-minutes", SK_SMART_ATTRIBUTE_UNIT_MSECONDS }; return &a; - } else if (quirk & SK_SMART_QUIRK_9_UNKNOWN) - return NULL; + } /* %STRINGPOOLSTOP% */ break; -- 1.6.2.2 0001-black-list-a-few-attributes-on-FUJITSU-MHY2120BH-008.patch: --- NEW FILE 0001-black-list-a-few-attributes-on-FUJITSU-MHY2120BH-008.patch --- >From 15ffa130b985fb057d49d9b2ae287420c42ff980 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 May 2009 20:29:50 +0200 Subject: [PATCH] black list a few attributes on FUJITSU MHY2120BH/0085000B --- atasmart.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/atasmart.c b/atasmart.c index bd78c9f..d0ead75 100644 --- a/atasmart.c +++ b/atasmart.c @@ -1205,7 +1205,10 @@ typedef enum SkSmartQuirk { SK_SMART_QUIRK_194_10XCELSIUS = 32, SK_SMART_QUIRK_194_UNKNOWN = 64, SK_SMART_QUIRK_200_WRITEERRORCOUNT = 128, - SK_SMART_QUIRK_201_DETECTEDTACOUNT = 256 + SK_SMART_QUIRK_201_DETECTEDTACOUNT = 256, + SK_SMART_QUIRK_9_UNKNOWN = 512, + SK_SMART_QUIRK_197_UNKNOWN = 1024, + SK_SMART_QUIRK_198_UNKNOWN = 2048, } SkSmartQuirk; /* %STRINGPOOLSTART% */ @@ -1219,6 +1222,9 @@ static const char *quirk_name[] = { "194_UNKNOWN", "200_WRITEERRORCOUNT", "201_DETECTEDTACOUNT", + "9_UNKNOWN", + "197_UNKNOWN", + "198_UNKNOWN", NULL }; /* %STRINGPOOLSTOP% */ @@ -1232,6 +1238,12 @@ typedef struct SkSmartQuirkDatabase { static const SkSmartQuirkDatabase quirk_database[] = { { /*** Fujitsu */ + "^FUJITSU MHY2120BH$", + "^0085000B$", /* seems to be specific to this firmware */ + SK_SMART_QUIRK_9_UNKNOWN| + SK_SMART_QUIRK_197_UNKNOWN| + SK_SMART_QUIRK_198_UNKNOWN + }, { "^FUJITSU MHR2040AT$", NULL, SK_SMART_QUIRK_9_POWERONSECONDS| @@ -1452,7 +1464,8 @@ static const SkSmartAttributeInfo *lookup_attribute(SkDisk *d, uint8_t id) { "power-on-half-minutes", SK_SMART_ATTRIBUTE_UNIT_MSECONDS }; return &a; - } + } else if (quirk & SK_SMART_QUIRK_9_UNKNOWN) + return NULL; /* %STRINGPOOLSTOP% */ break; @@ -1482,6 +1495,18 @@ static const SkSmartAttributeInfo *lookup_attribute(SkDisk *d, uint8_t id) { break; + case 197: + if (quirk & SK_SMART_QUIRK_197_UNKNOWN) + return NULL; + + break; + + case 198: + if (quirk & SK_SMART_QUIRK_198_UNKNOWN) + return NULL; + + break; + case 200: /* %STRINGPOOLSTART% */ if (quirk & SK_SMART_QUIRK_200_WRITEERRORCOUNT) { -- 1.6.2.2 From krh at fedoraproject.org Wed May 6 19:01:55 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Wed, 6 May 2009 19:01:55 +0000 (UTC) Subject: rpms/xorg-x11-drv-intel/F-11 xorg-x11-drv-intel.spec,1.15,1.16 Message-ID: <20090506190155.12C1070108@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31586 Modified Files: xorg-x11-drv-intel.spec Log Message: * Wed May 6 2009 - 2.7.0-3 - Pull in fixes from the 2.7 branch. Index: xorg-x11-drv-intel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/xorg-x11-drv-intel.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- xorg-x11-drv-intel.spec 23 Apr 2009 14:55:06 -0000 1.15 +++ xorg-x11-drv-intel.spec 6 May 2009 19:01:24 -0000 1.16 @@ -7,7 +7,7 @@ Summary: Xorg X11 Intel video driver Name: xorg-x11-drv-intel Version: 2.7.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -21,8 +21,8 @@ Source3: intel-gpu-tools-%{gputoolsda Patch1: kill-svideo.patch Patch2: copy-fb.patch -# not in 2.7 but in master, http://bugs.freedesktop.org/21254 -Patch10: intel-2.7-kms-output-properties.patch +# patches from 2.7 branch +Patch10: intel-2.7-fixes.patch # needs to be upstreamed Patch20: intel-2.6.99.902-kms-get-crtc.patch @@ -69,7 +69,7 @@ Debugging tools for Intel graphics chips %setup -q -n xf86-video-intel-%{version} -b3 %patch1 -p1 -b .svideo %patch2 -p1 -b .copy-fb -%patch10 -p1 -b .kms-props +%patch10 -p1 -b .2.7-fixes %patch20 -p1 -b .get-crtc # notyet. we don't handle switching in and out of tiled front buffer # correctly yet, so let's not have people stumble into it more than @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/intel_* %changelog +* Wed May 6 2009 - 2.7.0-3 +- Pull in fixes from the 2.7 branch. + * Thu Apr 23 2009 Adam Jackson 2.7.0-2 - Add intel-gpu-tools subpackage From krh at fedoraproject.org Wed May 6 19:14:54 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Wed, 6 May 2009 19:14:54 +0000 (UTC) Subject: rpms/xorg-x11-drv-intel/F-11 intel-2.7-fixes.patch, NONE, 1.1 xorg-x11-drv-intel.spec, 1.16, 1.17 intel-2.7-kms-output-properties.patch, 1.1, NONE Message-ID: <20090506191454.1747B70108@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1683 Modified Files: xorg-x11-drv-intel.spec Added Files: intel-2.7-fixes.patch Removed Files: intel-2.7-kms-output-properties.patch Log Message: * Wed May 6 2009 - 2.7.0-4 - Pull in fixes from the 2.7 branch. intel-2.7-fixes.patch: --- NEW FILE intel-2.7-fixes.patch --- commit efda7c776b95f8634cd6a2fed88d526de80176bc Author: Carl Worth Date: Wed May 6 09:37:34 2009 -0700 Split i915 textured video commands to fit into batch buffers. i915 textured video commands are quite long, but must be contained in the same batch buffer as the 3D setup commands. When the number of clip rects for the video becomes too large for the associated commands to fit in the same batch buffer, this change breaks the sequence into pieces, ensuring that each batch contains the necessary setup sequence. Signed-off-by: Keith Packard (cherry picked from commit 8255cca2c9092f7ecb798944aa8f03fa3efcfa6c) Conflicts: src/i915_video.c commit a066cfb0be6e6b20a27eb4ba17f503f13e65e082 Author: Carl Worth Date: Wed May 6 09:17:46 2009 -0700 Hold reference to video binding table until all rects are painted. The optimization of unreferencing the binding table when the relocation is posted causes the object to be dereferenced for each box in the clip list, causing general chaos in the buffer manager. It's easier to just hold a reference to the object until all of the boxes are painted and then drop it. Signed-off-by: Keith Packard (cherry picked from commit 11a853bd8e5d907fe7f5bd907453bcdac9032861) Conflicts: src/i965_video.c commit 115fc9a7d79da07301b96d9fc5c513d33734d273 Author: Keith Packard Date: Fri May 1 11:44:13 2009 -0700 intel_batch_start_atomic: fix size passed to intel_batch_require_space (*4) intel_batch_start_atomic takes an argument in 32-bit units, and so it must multiply that by 4 before passing it to intel_batch_require_space, which takes an argument in bytes. We should figure out what units we want to use and use the same everywhere... Signed-off-by: Keith Packard (cherry picked from commit 1142353b487c155a31011923fbd08ec67e60f505) commit 296a986e5258e2fd13ec494071b7063bd639cd68 Author: Zhenyu Wang Date: Mon Mar 23 19:19:58 2009 +0800 KMS: hook up output properties for randr This gets output properties from kernel, then hook them up for randr. So we can control output properties through randr like in UMS. Signed-off-by: Zhenyu Wang diff --git a/src/drmmode_display.c b/src/drmmode_display.c index a276ff7..7b97a64 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -35,6 +35,7 @@ #include "i830.h" #include "intel_bufmgr.h" #include "xf86drmMode.h" +#include "X11/Xatom.h" typedef struct { int fd; @@ -52,11 +53,20 @@ typedef struct { } drmmode_crtc_private_rec, *drmmode_crtc_private_ptr; typedef struct { + drmModePropertyPtr mode_prop; + uint64_t value; + int num_atoms; /* if range prop, num_atoms == 1; if enum prop, num_atoms == num_enums + 1 */ + Atom *atoms; +} drmmode_prop_rec, *drmmode_prop_ptr; + +typedef struct { drmmode_ptr drmmode; int output_id; drmModeConnectorPtr mode_output; drmModeEncoderPtr mode_encoder; drmModePropertyBlobPtr edid_blob; + int num_props; + drmmode_prop_ptr props; } drmmode_output_private_rec, *drmmode_output_private_ptr; static void @@ -508,9 +518,15 @@ static void drmmode_output_destroy(xf86OutputPtr output) { drmmode_output_private_ptr drmmode_output = output->driver_private; + int i; if (drmmode_output->edid_blob) drmModeFreePropertyBlob(drmmode_output->edid_blob); + for (i = 0; i < drmmode_output->num_props; i++) { + drmModeFreeProperty(drmmode_output->props[i].mode_prop); + xfree(drmmode_output->props[i].atoms); + } + xfree(drmmode_output->props); drmModeFreeConnector(drmmode_output->mode_output); xfree(drmmode_output); output->driver_private = NULL; @@ -542,7 +558,162 @@ drmmode_output_dpms(xf86OutputPtr output, int mode) } } +static Bool +drmmode_property_ignore(drmModePropertyPtr prop) +{ + if (!prop) + return TRUE; + /* ignore blob prop */ + if (prop->flags & DRM_MODE_PROP_BLOB) + return TRUE; + /* ignore standard property */ + if (!strcmp(prop->name, "EDID") || + !strcmp(prop->name, "DPMS")) + return TRUE; + + return FALSE; +} + +static void +drmmode_output_create_resources(xf86OutputPtr output) +{ + drmmode_output_private_ptr drmmode_output = output->driver_private; + drmModeConnectorPtr mode_output = drmmode_output->mode_output; + drmmode_ptr drmmode = drmmode_output->drmmode; + drmModePropertyPtr drmmode_prop; + int i, j, err; + + drmmode_output->props = xcalloc(mode_output->count_props, sizeof(drmmode_prop_rec)); + if (!drmmode_output->props) + return; + + drmmode_output->num_props = 0; + for (i = 0, j = 0; i < mode_output->count_props; i++) { + drmmode_prop = drmModeGetProperty(drmmode->fd, mode_output->props[i]); + if (drmmode_property_ignore(drmmode_prop)) { + drmModeFreeProperty(drmmode_prop); + continue; + } + drmmode_output->props[j].mode_prop = drmmode_prop; + drmmode_output->props[j].value = mode_output->prop_values[i]; + drmmode_output->num_props++; + j++; + } + + for (i = 0; i < drmmode_output->num_props; i++) { + drmmode_prop_ptr p = &drmmode_output->props[i]; + drmmode_prop = p->mode_prop; + + if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) { + INT32 range[2]; + + p->num_atoms = 1; + p->atoms = xcalloc(p->num_atoms, sizeof(Atom)); + if (!p->atoms) + continue; + p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE); + range[0] = drmmode_prop->values[0]; + range[1] = drmmode_prop->values[1]; + err = RRConfigureOutputProperty(output->randr_output, p->atoms[0], + FALSE, TRUE, + drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE, + 2, range); + if (err != 0) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, + "RRConfigureOutputProperty error, %d\n", err); + } + err = RRChangeOutputProperty(output->randr_output, p->atoms[0], + XA_INTEGER, 32, PropModeReplace, 1, &p->value, FALSE, TRUE); + if (err != 0) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, + "RRChangeOutputProperty error, %d\n", err); + } + } else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) { + p->num_atoms = drmmode_prop->count_enums + 1; + p->atoms = xcalloc(p->num_atoms, sizeof(Atom)); + if (!p->atoms) + continue; + p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE); + for (j = 1; j <= drmmode_prop->count_enums; j++) { + struct drm_mode_property_enum *e = &drmmode_prop->enums[j-1]; + p->atoms[j] = MakeAtom(e->name, strlen(e->name), TRUE); + } + err = RRConfigureOutputProperty(output->randr_output, p->atoms[0], + FALSE, FALSE, + drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE, + p->num_atoms - 1, (INT32 *)&p->atoms[1]); + if (err != 0) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, + "RRConfigureOutputProperty error, %d\n", err); + } + for (j = 0; j < drmmode_prop->count_enums; j++) + if (drmmode_prop->enums[j].value == p->value) + break; + /* there's always a matching value */ + err = RRChangeOutputProperty(output->randr_output, p->atoms[0], + XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1], FALSE, TRUE); + if (err != 0) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, + "RRChangeOutputProperty error, %d\n", err); + } + } + } +} + +static Bool +drmmode_output_set_property(xf86OutputPtr output, Atom property, + RRPropertyValuePtr value) +{ + drmmode_output_private_ptr drmmode_output = output->driver_private; + drmmode_ptr drmmode = drmmode_output->drmmode; + int i; + + for (i = 0; i < drmmode_output->num_props; i++) { + drmmode_prop_ptr p = &drmmode_output->props[i]; + + if (p->atoms[0] != property) + continue; + + if (p->mode_prop->flags & DRM_MODE_PROP_RANGE) { + uint32_t val; + + if (value->type != XA_INTEGER || value->format != 32 || + value->size != 1) + return FALSE; + val = *(uint32_t *)value->data; + + drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id, + p->mode_prop->prop_id, (uint64_t)val); + return TRUE; + } else if (p->mode_prop->flags & DRM_MODE_PROP_ENUM) { + Atom atom; + const char *name; + int j; + + if (value->type != XA_ATOM || value->format != 32 || value->size != 1) + return FALSE; + memcpy(&atom, value->data, 4); + name = NameForAtom(atom); + + /* search for matching name string, then set its value down */ + for (j = 0; j < p->mode_prop->count_enums; j++) { + if (!strcmp(p->mode_prop->enums[j].name, name)) { + drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id, + p->mode_prop->prop_id, p->mode_prop->enums[j].value); + return TRUE; + } + } + } + } + /* no property found? */ + return FALSE; +} + static const xf86OutputFuncsRec drmmode_output_funcs = { + .create_resources = drmmode_output_create_resources, +#ifdef RANDR_12_INTERFACE + .set_property = drmmode_output_set_property, +#endif .dpms = drmmode_output_dpms, #if 0 diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h index a72786e..ec87084 100644 --- a/src/i830_batchbuffer.h +++ b/src/i830_batchbuffer.h @@ -56,7 +56,7 @@ intel_batch_start_atomic(ScrnInfoPtr pScrn, unsigned int sz) I830Ptr pI830 = I830PTR(pScrn); assert(!pI830->in_batch_atomic); - intel_batch_require_space(pScrn, pI830, sz); + intel_batch_require_space(pScrn, pI830, sz * 4); pI830->in_batch_atomic = TRUE; pI830->batch_atomic_limit = pI830->batch_used + sz * 4; diff --git a/src/i915_video.c b/src/i915_video.c index 93e0c86..afa1055 100644 --- a/src/i915_video.c +++ b/src/i915_video.c @@ -50,7 +50,8 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, I830Ptr pI830 = I830PTR(pScrn); uint32_t format, ms3, s5; BoxPtr pbox = REGION_RECTS(dstRegion); - int nbox = REGION_NUM_RECTS(dstRegion); + int nbox_total = REGION_NUM_RECTS(dstRegion); + int nbox_this_time; int dxo, dyo, pix_xoff, pix_yoff; Bool planar; @@ -73,7 +74,17 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, return; } - intel_batch_start_atomic(pScrn, 200 + 20 * nbox); +#define BYTES_FOR_BOXES(n) ((200 + (n) * 20) * 4) +#define BOXES_IN_BYTES(s) ((((s)/4) - 200) / 20) +#define BATCH_BYTES(p) ((p)->batch_bo->size - 16) + + while (nbox_total) { + nbox_this_time = nbox_total; + if (BYTES_FOR_BOXES(nbox_this_time) > BATCH_BYTES(pI830)) + nbox_this_time = BOXES_IN_BYTES(BATCH_BYTES(pI830)); + nbox_total -= nbox_this_time; + + intel_batch_start_atomic(pScrn, 200 + 20 * nbox_this_time); IntelEmitInvarientState(pScrn); pI830->last_3d = LAST_3D_VIDEO; @@ -366,7 +377,7 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, dxo = dstRegion->extents.x1; dyo = dstRegion->extents.y1; - while (nbox--) + while (nbox_this_time--) { int box_x1 = pbox->x1; int box_y1 = pbox->y1; @@ -415,6 +426,7 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, } intel_batch_end_atomic(pScrn); + } i830MarkSync(pScrn); } diff --git a/src/i965_video.c b/src/i965_video.c index f6020d4..c0a69fd 100644 --- a/src/i965_video.c +++ b/src/i965_video.c @@ -795,7 +795,6 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo *bind_bo, int n_src_surf) OUT_BATCH(0); /* sf */ /* Only the PS uses the binding table */ OUT_RELOC(bind_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0); - drm_intel_bo_unreference(bind_bo); /* Blend constant color (magenta is fun) */ OUT_BATCH(BRW_3DSTATE_CONSTANT_COLOR | 3); @@ -1161,6 +1160,10 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, } i830MarkSync(pScrn); + + /* release reference once we're finished */ + drm_intel_bo_unreference(bind_bo); + #if WATCH_STATS i830_dump_error_state(pScrn); #endif Index: xorg-x11-drv-intel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/xorg-x11-drv-intel.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- xorg-x11-drv-intel.spec 6 May 2009 19:01:24 -0000 1.16 +++ xorg-x11-drv-intel.spec 6 May 2009 19:14:23 -0000 1.17 @@ -7,7 +7,7 @@ Summary: Xorg X11 Intel video driver Name: xorg-x11-drv-intel Version: 2.7.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -127,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/intel_* %changelog -* Wed May 6 2009 - 2.7.0-3 +* Wed May 6 2009 - 2.7.0-4 - Pull in fixes from the 2.7 branch. * Thu Apr 23 2009 Adam Jackson 2.7.0-2 --- intel-2.7-kms-output-properties.patch DELETED --- From pwouters at fedoraproject.org Wed May 6 19:19:31 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Wed, 6 May 2009 19:19:31 +0000 (UTC) Subject: rpms/xl2tpd/EL-5 sources,1.5,1.6 xl2tpd.spec,1.7,1.8 Message-ID: <20090506191931.862C970108@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2282 Modified Files: sources xl2tpd.spec Log Message: * Wed May 06 2009 Paul Wouters - 1.2.4-1 - Upgraded to 1.2.4 - Fix initscript for https://bugzilla.redhat.com/show_bug.cgi?id=247100 - Merged spec file with upstream - Fix license tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 28 Jul 2007 17:26:06 -0000 1.5 +++ sources 6 May 2009 19:19:00 -0000 1.6 @@ -1,4 +1 @@ -44e5a85ecce622a0f55aafc42ce589a8 xl2tpd-1.1.06.tar.gz -d0c310b7a135b385ab5a61325e56566a xl2tpd-1.1.08.tar.gz -7782de2b3a37631bcf83305127aca9ac xl2tpd-1.1.09.tar.gz -ab5656eb5a3d1973f7f69b039675332e xl2tpd-1.1.11.tar.gz +d94fc8a13596f12a561240dfcea9f977 xl2tpd-1.2.4.tar.gz Index: xl2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/EL-5/xl2tpd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- xl2tpd.spec 28 Jul 2007 17:30:39 -0000 1.7 +++ xl2tpd.spec 6 May 2009 19:19:01 -0000 1.8 @@ -1,14 +1,14 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.1.11 -Release: 2%{?dist} -License: GPL +Version: 1.2.4 +Release: 1%{?dist} +License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ Group: System Environment/Daemons Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp -#BuildRequires: +BuildRequires: libpcap-devel Obsoletes: l2tpd <= 0.69-0.6.20051030.fc6 Provides: l2tpd = 0.69-0.6.20051030.fc7 Requires(post): /sbin/chkconfig @@ -39,12 +39,13 @@ sed -i -e 's|chkconfig:[ \t][ \t]*|chkco %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install -p -D -m644 examples/xl2tpd.conf %{buildroot}%{_sysconfdir}/xl2tpd/xl2tpd.conf install -p -D -m644 examples/ppp-options.xl2tpd %{buildroot}%{_sysconfdir}/ppp/options.xl2tpd install -p -D -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/xl2tpd/l2tp-secrets install -p -D -m600 examples/chapsecrets.sample %{buildroot}%{_sysconfdir}/ppp/chap-secrets.sample install -p -D -m755 packaging/fedora/xl2tpd.init %{buildroot}%{_initrddir}/xl2tpd +install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd %clean @@ -82,14 +83,22 @@ fi %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt %doc doc/README.patents examples/chapsecrets.sample %{_sbindir}/xl2tpd +%{_bindir}/pfc %{_mandir}/*/* %dir %{_sysconfdir}/xl2tpd %config(noreplace) %{_sysconfdir}/xl2tpd/* %config(noreplace) %{_sysconfdir}/ppp/* %attr(0755,root,root) %{_initrddir}/xl2tpd - +%dir %{_localstatedir}/run/xl2tpd %changelog +* Wed May 06 2009 Paul Wouters - 1.2.4-1 +- Upgraded to 1.2.4 +- Fix initscript for https://bugzilla.redhat.com/show_bug.cgi?id=247100 +- Merged spec file with upstream +- Fix license tag + + * Sat Jul 28 2007 Paul Wouters 1.1.11-2 - Upgraded to 1.1.11 - Include new split README.* From pwouters at fedoraproject.org Wed May 6 19:20:59 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Wed, 6 May 2009 19:20:59 +0000 (UTC) Subject: rpms/xl2tpd/EL-5 xl2tpd.spec,1.8,1.9 Message-ID: <20090506192059.4C12C70108@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2515 Modified Files: xl2tpd.spec Log Message: bump version Index: xl2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/EL-5/xl2tpd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- xl2tpd.spec 6 May 2009 19:19:01 -0000 1.8 +++ xl2tpd.spec 6 May 2009 19:20:29 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ Group: System Environment/Daemons @@ -92,6 +92,9 @@ fi %dir %{_localstatedir}/run/xl2tpd %changelog +* Wed May 06 2009 Paul Wouters - 1.2.4-2 +- bump verson + * Wed May 06 2009 Paul Wouters - 1.2.4-1 - Upgraded to 1.2.4 - Fix initscript for https://bugzilla.redhat.com/show_bug.cgi?id=247100 From nalin at fedoraproject.org Wed May 6 19:25:08 2009 From: nalin at fedoraproject.org (Nalin Dahyabhai) Date: Wed, 6 May 2009 19:25:08 +0000 (UTC) Subject: rpms/slapi-nis/F-10 slapi-nis.spec,1.9,1.10 sources,1.9,1.10 Message-ID: <20090506192508.711DC70108@cvs1.fedora.phx.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/slapi-nis/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3133/F-10 Modified Files: slapi-nis.spec sources Log Message: update to 0.14 to correctly handle being loaded but disabled (#499404) Index: slapi-nis.spec =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/F-10/slapi-nis.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- slapi-nis.spec 30 Apr 2009 20:15:30 -0000 1.9 +++ slapi-nis.spec 6 May 2009 19:24:38 -0000 1.10 @@ -1,5 +1,5 @@ Name: slapi-nis -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: NIS Server and Schema Compatibility plugins for Directory Server Group: System Environment/Daemons @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/nisserver-plugin-defs %changelog +* Wed May 6 2009 Nalin Dahyabhai - 0.14-1 +- correctly handle being loaded but disabled (#499404) + * Thu Apr 30 2009 Nalin Dahyabhai - 0.13-1 - update to 0.13, reworking %link() to correct some bugs (#498432) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 30 Apr 2009 20:15:31 -0000 1.9 +++ sources 6 May 2009 19:24:38 -0000 1.10 @@ -1 +1 @@ -d1f8642e2b544fc526d46cb7a4e82145 slapi-nis-0.13.tar.gz +c5b2851cbb62da56a59e695d168572eb slapi-nis-0.14.tar.gz From nalin at fedoraproject.org Wed May 6 19:25:08 2009 From: nalin at fedoraproject.org (Nalin Dahyabhai) Date: Wed, 6 May 2009 19:25:08 +0000 (UTC) Subject: rpms/slapi-nis/F-11 slapi-nis.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <20090506192508.A8BCF70108@cvs1.fedora.phx.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/slapi-nis/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3133/F-11 Modified Files: slapi-nis.spec sources Log Message: update to 0.14 to correctly handle being loaded but disabled (#499404) Index: slapi-nis.spec =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/F-11/slapi-nis.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- slapi-nis.spec 30 Apr 2009 20:15:31 -0000 1.7 +++ slapi-nis.spec 6 May 2009 19:24:38 -0000 1.8 @@ -1,5 +1,5 @@ Name: slapi-nis -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: NIS Server and Schema Compatibility plugins for Directory Server Group: System Environment/Daemons @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/nisserver-plugin-defs %changelog +* Wed May 6 2009 Nalin Dahyabhai - 0.14-1 +- correctly handle being loaded but disabled (#499404) + * Thu Apr 30 2009 Nalin Dahyabhai - 0.13-1 - update to 0.13, reworking %link() to correct some bugs (#498432) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/F-11/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 30 Apr 2009 20:15:31 -0000 1.7 +++ sources 6 May 2009 19:24:38 -0000 1.8 @@ -1 +1 @@ -d1f8642e2b544fc526d46cb7a4e82145 slapi-nis-0.13.tar.gz +c5b2851cbb62da56a59e695d168572eb slapi-nis-0.14.tar.gz From nalin at fedoraproject.org Wed May 6 19:25:09 2009 From: nalin at fedoraproject.org (Nalin Dahyabhai) Date: Wed, 6 May 2009 19:25:09 +0000 (UTC) Subject: rpms/slapi-nis/F-9 slapi-nis.spec,1.9,1.10 sources,1.10,1.11 Message-ID: <20090506192509.2295370108@cvs1.fedora.phx.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/slapi-nis/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3133/F-9 Modified Files: slapi-nis.spec sources Log Message: update to 0.14 to correctly handle being loaded but disabled (#499404) Index: slapi-nis.spec =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/F-9/slapi-nis.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- slapi-nis.spec 30 Apr 2009 20:15:31 -0000 1.9 +++ slapi-nis.spec 6 May 2009 19:24:38 -0000 1.10 @@ -1,5 +1,5 @@ Name: slapi-nis -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: NIS Server and Schema Compatibility plugins for Directory Server Group: System Environment/Daemons @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/nisserver-plugin-defs %changelog +* Wed May 6 2009 Nalin Dahyabhai - 0.14-1 +- correctly handle being loaded but disabled (#499404) + * Thu Apr 30 2009 Nalin Dahyabhai - 0.13-1 - update to 0.13, reworking %link() to correct some bugs (#498432) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 30 Apr 2009 20:15:31 -0000 1.10 +++ sources 6 May 2009 19:24:38 -0000 1.11 @@ -1 +1 @@ -d1f8642e2b544fc526d46cb7a4e82145 slapi-nis-0.13.tar.gz +c5b2851cbb62da56a59e695d168572eb slapi-nis-0.14.tar.gz From nalin at fedoraproject.org Wed May 6 19:25:09 2009 From: nalin at fedoraproject.org (Nalin Dahyabhai) Date: Wed, 6 May 2009 19:25:09 +0000 (UTC) Subject: rpms/slapi-nis/devel .cvsignore, 1.7, 1.8 slapi-nis.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <20090506192509.90D3B70108@cvs1.fedora.phx.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/slapi-nis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3133/devel Modified Files: .cvsignore slapi-nis.spec sources Log Message: update to 0.14 to correctly handle being loaded but disabled (#499404) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 30 Apr 2009 20:15:32 -0000 1.7 +++ .cvsignore 6 May 2009 19:24:39 -0000 1.8 @@ -4,3 +4,4 @@ slapi-nis-0.9.tar.gz slapi-nis-0.10.tar.gz slapi-nis-0.11.tar.gz slapi-nis-0.13.tar.gz +slapi-nis-0.14.tar.gz Index: slapi-nis.spec =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/devel/slapi-nis.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- slapi-nis.spec 30 Apr 2009 20:15:32 -0000 1.8 +++ slapi-nis.spec 6 May 2009 19:24:39 -0000 1.9 @@ -1,5 +1,5 @@ Name: slapi-nis -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: NIS Server and Schema Compatibility plugins for Directory Server Group: System Environment/Daemons @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/nisserver-plugin-defs %changelog +* Wed May 6 2009 Nalin Dahyabhai - 0.14-1 +- correctly handle being loaded but disabled (#499404) + * Thu Apr 30 2009 Nalin Dahyabhai - 0.13-1 - update to 0.13, reworking %link() to correct some bugs (#498432) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 30 Apr 2009 20:15:32 -0000 1.7 +++ sources 6 May 2009 19:24:39 -0000 1.8 @@ -1 +1 @@ -d1f8642e2b544fc526d46cb7a4e82145 slapi-nis-0.13.tar.gz +c5b2851cbb62da56a59e695d168572eb slapi-nis-0.14.tar.gz From rdieter at fedoraproject.org Wed May 6 19:46:44 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 19:46:44 +0000 (UTC) Subject: rpms/qt/devel qt-x11-opensource-src-4.5.1-kde4_plugins.patch, NONE, 1.1 qt.spec, 1.276, 1.277 Message-ID: <20090506194644.77D4770108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6363 Modified Files: qt.spec Added Files: qt-x11-opensource-src-4.5.1-kde4_plugins.patch Log Message: * Wed May 06 2009 Rex Dieter - 4.5.1-9 - include kde4 plugin path by default (#498809) qt-x11-opensource-src-4.5.1-kde4_plugins.patch: --- NEW FILE qt-x11-opensource-src-4.5.1-kde4_plugins.patch --- diff -up qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp --- qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins 2009-04-21 18:57:41.000000000 -0500 +++ qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp 2009-05-06 13:53:40.258081854 -0500 @@ -2061,6 +2061,15 @@ QStringList QCoreApplication::libraryPat app_libpaths->append(installPathPlugins); } + // hack in support for kde4 plugin paths -- Rex + QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins"); + if (QFile::exists(kde4PathPlugins)) { + // Make sure we convert from backslashes to slashes. + kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath(); + if (!app_libpaths->contains(kde4PathPlugins)) + app_libpaths->append(kde4PathPlugins); + } + // If QCoreApplication is not yet instantiated, // make sure we add the application path when we construct the QCoreApplication if (self) self->d_func()->appendApplicationPathToLibraryPaths(); Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.276 retrieving revision 1.277 diff -u -p -r1.276 -r1.277 --- qt.spec 4 May 2009 14:40:25 -0000 1.276 +++ qt.spec 6 May 2009 19:46:13 -0000 1.277 @@ -12,7 +12,7 @@ Epoch: 1 Name: qt4 %endif Version: 4.5.1 -Release: 8%{?dist} +Release: 9%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -42,6 +42,8 @@ Patch13: qt-x11-opensource-src-4.5.0-gcc # qt fails to build on ia64: http://bugzilla.redhat.com/492174 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch +# include kde4 plugin path, http://bugzilla.redhat.com/498809 +Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch ## upstreamable bits # http://bugzilla.redhat.com/485677 @@ -347,6 +349,7 @@ test -x apply_patches && ./apply_patches %patch13 -p1 -b .gcc_hack %patch14 -p1 -b .ia64_boilerplate %patch15 -p1 -b .enable_ft_lcdfilter +%patch16 -p1 -b .kde4_plugins %patch51 -p1 -b .qdoc3 %patch52 -p1 -b .sparc64 %patch53 -p1 -b .qatomic-inline-asm @@ -825,6 +828,9 @@ gtk-update-icon-cache -q %{_datadir}/ico %changelog +* Wed May 06 2009 Rex Dieter - 4.5.1-9 +- include kde4 plugin path by default (#498809) + * Mon May 04 2009 Rex Dieter - 4.5.1-8 - fix invalid assumptions about mysql_config --libs (bug #440673) - fix %%files breakage from 4.5.1-5 From than at fedoraproject.org Wed May 6 19:49:48 2009 From: than at fedoraproject.org (Than Ngo) Date: Wed, 6 May 2009 19:49:48 +0000 (UTC) Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec,1.218,1.219 Message-ID: <20090506194948.406D670108@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6293 Modified Files: kdebase-workspace.spec Log Message: bump release Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v retrieving revision 1.218 retrieving revision 1.219 diff -u -p -r1.218 -r1.219 --- kdebase-workspace.spec 4 May 2009 20:18:50 -0000 1.218 +++ kdebase-workspace.spec 6 May 2009 19:49:17 -0000 1.219 @@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa Name: kdebase-workspace Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -513,6 +513,9 @@ fi %changelog +* Wed May 06 2009 Than Ngo - 4.2.3-2 +- Requires: oxygen-icon-theme >= 4.2.2 + * Sun May 03 2009 Than Ngo - 4.2.3-1 - 4.2.3 From pghmcfc at fedoraproject.org Wed May 6 19:52:26 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Wed, 6 May 2009 19:52:26 +0000 (UTC) Subject: rpms/libglade/F-11 libglade-0.17-cleanlibs.patch, NONE, 1.1 Makefile, 1.1, 1.2 libglade.spec, 1.5, 1.6 Message-ID: <20090506195226.D2C4770108@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/libglade/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7379 Modified Files: Makefile libglade.spec Added Files: libglade-0.17-cleanlibs.patch Log Message: * Mon Apr 20 2009 Paul Howarth 1:0.17-23 - use an alternative approach to rpath-fixing - hacking the supplied libtool rather than trying to use the system one - specify Instruction Set Architecture (%{?_isa}) in devel package requires - link against the libs that are needed, and only those libs libglade-0.17-cleanlibs.patch: --- NEW FILE libglade-0.17-cleanlibs.patch --- --- libglade-0.17/glade/Makefile.am 2009-04-20 20:54:24.000000000 +0100 +++ libglade-0.17/glade/Makefile.am 2009-04-20 20:59:54.000000000 +0100 @@ -43,12 +43,14 @@ $(build_glade_gnomedb) libglade_la_SOURCES = $(the_sources) -libglade_la_LIBADD = $(GTK_LIBS) $(XML_LIBS) +libglade_la_LIBADD = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS)) libglade_la_LDFLAGS = -version-info $(LTVERSION) +libglade_la_DEPENDENCIES = libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h -libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS) +libglade_gnome_la_LIBADD = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)) libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION) +libglade_gnome_la_DEPENDENCIES = libglade.la libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h libglade_bonobo_la_LIBADD = $(BONOBO_LIBS) $(XML_LIBS) --- libglade-0.17/glade/Makefile.in 2009-04-20 20:54:30.000000000 +0100 +++ libglade-0.17/glade/Makefile.in 2009-04-20 21:00:09.000000000 +0100 @@ -172,12 +172,14 @@ libglade_la_SOURCES = $(the_sources) -libglade_la_LIBADD = $(GTK_LIBS) $(XML_LIBS) +libglade_la_LIBADD = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS)) libglade_la_LDFLAGS = -version-info $(LTVERSION) +libglade_la_DEPENDENCIES = libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h -libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS) +libglade_gnome_la_LIBADD = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)) libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION) +libglade_gnome_la_DEPENDENCIES = libglade.la libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h libglade_bonobo_la_LIBADD = $(BONOBO_LIBS) $(XML_LIBS) @@ -203,13 +205,11 @@ libglade_bonobo_la_DEPENDENCIES = am_libglade_bonobo_la_OBJECTS = glade-bonobo.lo libglade_bonobo_la_OBJECTS = $(am_libglade_bonobo_la_OBJECTS) -libglade_gnome_la_DEPENDENCIES = am_libglade_gnome_la_OBJECTS = glade-gnome.lo libglade_gnome_la_OBJECTS = $(am_libglade_gnome_la_OBJECTS) libglade_gnomedb_la_DEPENDENCIES = am_libglade_gnomedb_la_OBJECTS = glade-gnomedb.lo libglade_gnomedb_la_OBJECTS = $(am_libglade_gnomedb_la_OBJECTS) -libglade_la_DEPENDENCIES = am_libglade_la_OBJECTS = glade-init.lo glade-sax.lo glade-xml.lo \ glade-gtk.lo glade-tree.lo libglade_la_OBJECTS = $(am_libglade_la_OBJECTS) --- libglade-0.17/ltmain.sh 2001-09-05 03:58:41.000000000 +0100 +++ libglade-0.17/ltmain.sh 2009-04-20 17:09:38.000000000 +0100 @@ -754,6 +757,7 @@ linker_flags= dllsearchpath= lib_search_path=`pwd` + inst_prefix_dir= avoid_version=no dlfiles= @@ -884,6 +888,11 @@ prev= continue ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; release) release="-$arg" prev= @@ -985,6 +994,11 @@ continue ;; + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) @@ -1872,7 +1885,16 @@ if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + add_dir= + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + add_dir="$add_dir -L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in @@ -1882,11 +1904,21 @@ add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + add_dir= + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + add_dir="$add_dir -L$libdir" + add="-l$name" fi - if test $linkmode = prog; then + if test "$linkmode" = prog; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -3856,7 +3888,7 @@ fi done # Quote the link command for shipping. - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" + relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. @@ -4157,12 +4189,30 @@ dir="$dir$objdir" if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + if test "$inst_prefix_dir" = "$destdir"; then + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 + exit 1 + fi + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` + fi + $echo "$modename: warning: relinking \`$file'" 1>&2 $show "$relink_command" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue + exit 1 fi fi Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/libglade/F-11/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- Makefile 2 Oct 2006 12:13:51 -0000 1.1 +++ Makefile 6 May 2009 19:51:56 -0000 1.2 @@ -10,7 +10,7 @@ endef 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: libglade.spec =================================================================== RCS file: /cvs/pkgs/rpms/libglade/F-11/libglade.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- libglade.spec 25 Feb 2009 15:08:33 -0000 1.5 +++ libglade.spec 6 May 2009 19:51:56 -0000 1.6 @@ -1,22 +1,23 @@ Summary: Gnome-1 support library for loading user interfaces Name: libglade Version: 0.17 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries URL: http://www.jamesh.id.au/software/libglade/ Source0: http://ftp.gnome.org/pub/GNOME/sources/libglade/%{version}/libglade-%{version}.tar.gz -Patch: libglade-0.16-fixquote.patch +Patch0: libglade-0.16-fixquote.patch Patch1: libglade-0.17-gtkdoc.patch Patch2: libglade-0.17-clist-gettext.patch Patch3: libglade-0.17-underquoted.patch Patch4: libglade-0.17-non-weak-symbols.patch Patch5: libglade-0.17-no-local-intl.patch Patch6: libglade-0.17-multiarch.patch +Patch7: libglade-0.17-cleanlibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gnome-libs-devel >= 1:1.4.1.2 -BuildRequires: libxml-devel >= 1:1.8.16 +BuildRequires: gnome-libs-devel%{?_isa} >= 1:1.4.1.2 +BuildRequires: libxml-devel%{?_isa} >= 1:1.8.16 BuildRequires: autoconf, gettext, gtk-doc, libtool %description @@ -33,9 +34,9 @@ interface loading time, there is no perf %package devel Summary: The files needed for libglade application development Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: gnome-libs-devel >= 1:1.4.1.2 -Requires: libxml-devel >= 1:1.8.16 +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: gnome-libs-devel%{?_isa} >= 1:1.4.1.2 +Requires: libxml-devel%{?_isa} >= 1:1.8.16 Requires: pkgconfig %description devel @@ -43,8 +44,8 @@ The libglade-devel package contains the that you can use to develop libglade applications. %prep -%setup -q -n %{name}-%{version} -%patch -p1 -b ".fixquote" +%setup -q +%patch0 -p1 -b .fixquote %patch1 -p1 -b .gtkdoc %patch2 -p1 -b .clist-gettext %patch3 -p1 -b .underquoted @@ -57,22 +58,28 @@ that you can use to develop libglade app # Patch libglade-config for multiarch compatibility (#342131) %patch6 -p1 -b .multiarch +# Link against the libs that are needed, and only those libs +%patch7 -p1 -b .clean-libs + # Convert docs to UTF-8 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf8 %{__mv} -f ChangeLog.utf8 ChangeLog %build %{__autoconf} -%configure --without-bonobo -%{__make} LIBTOOL=/usr/bin/libtool +%configure --without-bonobo --disable-static + +# Kill bogus RPATHs +%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool + +%{__make} %install %{__rm} -rf %{buildroot} -%{__make} DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool INSTALL="%{__install} -p" install +%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install -# remove unpackaged files from the buildroot -%{__rm} -f %{buildroot}%{_libdir}/{libglade.a,libglade.la} -%{__rm} -f %{buildroot}%{_libdir}/{libglade-gnome.a,libglade-gnome.la} +# Don't package libtool archives +%{__rm} %{buildroot}%{_libdir}/libglade{,-gnome}.la %clean %{__rm} -rf %{buildroot} @@ -102,8 +109,14 @@ that you can use to develop libglade app %doc %{_datadir}/gnome/html/ %changelog +* Mon Apr 20 2009 Paul Howarth 1:0.17-23 +- use an alternative approach to rpath-fixing - hacking the supplied libtool + rather than trying to use the system one +- specify Instruction Set Architecture (%%{?_isa}) in devel package requires +- link against the libs that are needed, and only those libs + * Wed Feb 25 2009 Fedora Release Engineering - 1:0.17-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Feb 13 2008 Paul Howarth 1:0.17-21 - rebuild with gcc 4.3.0 for Fedora 9 From pghmcfc at fedoraproject.org Wed May 6 19:56:48 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Wed, 6 May 2009 19:56:48 +0000 (UTC) Subject: rpms/libglade/F-10 libglade-0.17-cleanlibs.patch, NONE, 1.1 Makefile, 1.1, 1.2 libglade.spec, 1.4, 1.5 Message-ID: <20090506195648.97D8B70108@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/libglade/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8008 Modified Files: Makefile libglade.spec Added Files: libglade-0.17-cleanlibs.patch Log Message: * Mon Apr 20 2009 Paul Howarth 1:0.17-23 - use an alternative approach to rpath-fixing - hacking the supplied libtool rather than trying to use the system one - specify Instruction Set Architecture (%{?_isa}) in devel package requires - link against the libs that are needed, and only those libs libglade-0.17-cleanlibs.patch: --- NEW FILE libglade-0.17-cleanlibs.patch --- --- libglade-0.17/glade/Makefile.am 2009-04-20 20:54:24.000000000 +0100 +++ libglade-0.17/glade/Makefile.am 2009-04-20 20:59:54.000000000 +0100 @@ -43,12 +43,14 @@ $(build_glade_gnomedb) libglade_la_SOURCES = $(the_sources) -libglade_la_LIBADD = $(GTK_LIBS) $(XML_LIBS) +libglade_la_LIBADD = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS)) libglade_la_LDFLAGS = -version-info $(LTVERSION) +libglade_la_DEPENDENCIES = libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h -libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS) +libglade_gnome_la_LIBADD = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)) libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION) +libglade_gnome_la_DEPENDENCIES = libglade.la libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h libglade_bonobo_la_LIBADD = $(BONOBO_LIBS) $(XML_LIBS) --- libglade-0.17/glade/Makefile.in 2009-04-20 20:54:30.000000000 +0100 +++ libglade-0.17/glade/Makefile.in 2009-04-20 21:00:09.000000000 +0100 @@ -172,12 +172,14 @@ libglade_la_SOURCES = $(the_sources) -libglade_la_LIBADD = $(GTK_LIBS) $(XML_LIBS) +libglade_la_LIBADD = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS)) libglade_la_LDFLAGS = -version-info $(LTVERSION) +libglade_la_DEPENDENCIES = libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h -libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS) +libglade_gnome_la_LIBADD = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)) libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION) +libglade_gnome_la_DEPENDENCIES = libglade.la libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h libglade_bonobo_la_LIBADD = $(BONOBO_LIBS) $(XML_LIBS) @@ -203,13 +205,11 @@ libglade_bonobo_la_DEPENDENCIES = am_libglade_bonobo_la_OBJECTS = glade-bonobo.lo libglade_bonobo_la_OBJECTS = $(am_libglade_bonobo_la_OBJECTS) -libglade_gnome_la_DEPENDENCIES = am_libglade_gnome_la_OBJECTS = glade-gnome.lo libglade_gnome_la_OBJECTS = $(am_libglade_gnome_la_OBJECTS) libglade_gnomedb_la_DEPENDENCIES = am_libglade_gnomedb_la_OBJECTS = glade-gnomedb.lo libglade_gnomedb_la_OBJECTS = $(am_libglade_gnomedb_la_OBJECTS) -libglade_la_DEPENDENCIES = am_libglade_la_OBJECTS = glade-init.lo glade-sax.lo glade-xml.lo \ glade-gtk.lo glade-tree.lo libglade_la_OBJECTS = $(am_libglade_la_OBJECTS) --- libglade-0.17/ltmain.sh 2001-09-05 03:58:41.000000000 +0100 +++ libglade-0.17/ltmain.sh 2009-04-20 17:09:38.000000000 +0100 @@ -754,6 +757,7 @@ linker_flags= dllsearchpath= lib_search_path=`pwd` + inst_prefix_dir= avoid_version=no dlfiles= @@ -884,6 +888,11 @@ prev= continue ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; release) release="-$arg" prev= @@ -985,6 +994,11 @@ continue ;; + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) @@ -1872,7 +1885,16 @@ if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + add_dir= + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + add_dir="$add_dir -L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in @@ -1882,11 +1904,21 @@ add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + add_dir= + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + add_dir="$add_dir -L$libdir" + add="-l$name" fi - if test $linkmode = prog; then + if test "$linkmode" = prog; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -3856,7 +3888,7 @@ fi done # Quote the link command for shipping. - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" + relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. @@ -4157,12 +4189,30 @@ dir="$dir$objdir" if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + if test "$inst_prefix_dir" = "$destdir"; then + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 + exit 1 + fi + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` + fi + $echo "$modename: warning: relinking \`$file'" 1>&2 $show "$relink_command" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue + exit 1 fi fi Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/libglade/F-10/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- Makefile 2 Oct 2006 12:13:51 -0000 1.1 +++ Makefile 6 May 2009 19:56:18 -0000 1.2 @@ -10,7 +10,7 @@ endef 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: libglade.spec =================================================================== RCS file: /cvs/pkgs/rpms/libglade/F-10/libglade.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- libglade.spec 13 Feb 2008 12:35:28 -0000 1.4 +++ libglade.spec 6 May 2009 19:56:18 -0000 1.5 @@ -1,22 +1,23 @@ Summary: Gnome-1 support library for loading user interfaces Name: libglade Version: 0.17 -Release: 21%{?dist} +Release: 23%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries URL: http://www.jamesh.id.au/software/libglade/ Source0: http://ftp.gnome.org/pub/GNOME/sources/libglade/%{version}/libglade-%{version}.tar.gz -Patch: libglade-0.16-fixquote.patch +Patch0: libglade-0.16-fixquote.patch Patch1: libglade-0.17-gtkdoc.patch Patch2: libglade-0.17-clist-gettext.patch Patch3: libglade-0.17-underquoted.patch Patch4: libglade-0.17-non-weak-symbols.patch Patch5: libglade-0.17-no-local-intl.patch Patch6: libglade-0.17-multiarch.patch +Patch7: libglade-0.17-cleanlibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gnome-libs-devel >= 1:1.4.1.2 -BuildRequires: libxml-devel >= 1:1.8.16 +BuildRequires: gnome-libs-devel%{?_isa} >= 1:1.4.1.2 +BuildRequires: libxml-devel%{?_isa} >= 1:1.8.16 BuildRequires: autoconf, gettext, gtk-doc, libtool %description @@ -33,9 +34,9 @@ interface loading time, there is no perf %package devel Summary: The files needed for libglade application development Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: gnome-libs-devel >= 1:1.4.1.2 -Requires: libxml-devel >= 1:1.8.16 +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: gnome-libs-devel%{?_isa} >= 1:1.4.1.2 +Requires: libxml-devel%{?_isa} >= 1:1.8.16 Requires: pkgconfig %description devel @@ -43,8 +44,8 @@ The libglade-devel package contains the that you can use to develop libglade applications. %prep -%setup -q -n %{name}-%{version} -%patch -p1 -b ".fixquote" +%setup -q +%patch0 -p1 -b .fixquote %patch1 -p1 -b .gtkdoc %patch2 -p1 -b .clist-gettext %patch3 -p1 -b .underquoted @@ -57,22 +58,28 @@ that you can use to develop libglade app # Patch libglade-config for multiarch compatibility (#342131) %patch6 -p1 -b .multiarch +# Link against the libs that are needed, and only those libs +%patch7 -p1 -b .clean-libs + # Convert docs to UTF-8 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf8 %{__mv} -f ChangeLog.utf8 ChangeLog %build %{__autoconf} -%configure --without-bonobo -%{__make} LIBTOOL=/usr/bin/libtool +%configure --without-bonobo --disable-static + +# Kill bogus RPATHs +%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool + +%{__make} %install %{__rm} -rf %{buildroot} -%{__make} DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool INSTALL="%{__install} -p" install +%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install -# remove unpackaged files from the buildroot -%{__rm} -f %{buildroot}%{_libdir}/{libglade.a,libglade.la} -%{__rm} -f %{buildroot}%{_libdir}/{libglade-gnome.a,libglade-gnome.la} +# Don't package libtool archives +%{__rm} %{buildroot}%{_libdir}/libglade{,-gnome}.la %clean %{__rm} -rf %{buildroot} @@ -102,6 +109,15 @@ that you can use to develop libglade app %doc %{_datadir}/gnome/html/ %changelog +* Mon Apr 20 2009 Paul Howarth 1:0.17-23 +- use an alternative approach to rpath-fixing - hacking the supplied libtool + rather than trying to use the system one +- specify Instruction Set Architecture (%%{?_isa}) in devel package requires +- link against the libs that are needed, and only those libs + +* Wed Feb 25 2009 Fedora Release Engineering - 1:0.17-22 +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 13 2008 Paul Howarth 1:0.17-21 - rebuild with gcc 4.3.0 for Fedora 9 From msnitzer at fedoraproject.org Wed May 6 20:01:31 2009 From: msnitzer at fedoraproject.org (Mike Snitzer) Date: Wed, 6 May 2009 20:01:31 +0000 (UTC) Subject: rpms/device-mapper-multipath/devel lib64_multipath.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 device-mapper-multipath.spec, 1.55, 1.56 directio_message_cleanup.patch, 1.1, 1.2 mpath_wait.patch, 1.1, 1.2 multipath_rules.patch, 1.2, 1.3 redhatification.patch, 1.2, 1.3 sources, 1.17, 1.18 config_files.patch, 1.1, NONE config_space_fix.patch, 1.2, NONE fix_devt.patch, 1.1, NONE fix_umask.patch, 1.1, NONE linking_change.patch, 1.4, NONE scsi_id_change.patch, 1.1, NONE sparc64fix.patch, 1.1, NONE uevent_fix.patch, 1.2, NONE Message-ID: <20090506200131.B2CFA70108@cvs1.fedora.phx.redhat.com> Author: msnitzer Update of /cvs/pkgs/rpms/device-mapper-multipath/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8154 Modified Files: .cvsignore device-mapper-multipath.spec directio_message_cleanup.patch mpath_wait.patch multipath_rules.patch redhatification.patch sources Added Files: lib64_multipath.patch Removed Files: config_files.patch config_space_fix.patch fix_devt.patch fix_umask.patch linking_change.patch scsi_id_change.patch sparc64fix.patch uevent_fix.patch Log Message: Updated to latest upstream 0.4.9 code: multipath-tools-090429.tgz (git commit id: 7395bcda3a218df2eab1617df54628af0dc3456e) lib64_multipath.patch: --- NEW FILE lib64_multipath.patch --- diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h index d7f93cb..357c519 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h @@ -1,6 +1,6 @@ #define DEFAULT_GETUID "/lib/udev/scsi_id --whitelisted --device=/dev/%n" #define DEFAULT_UDEVDIR "/dev" -#define DEFAULT_MULTIPATHDIR "/lib/multipath" +#define DEFAULT_MULTIPATHDIR "/lib64/multipath" #define DEFAULT_SELECTOR "round-robin 0" #define DEFAULT_FEATURES "0" #define DEFAULT_HWHANDLER "0" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 20 Aug 2008 21:48:41 -0000 1.16 +++ .cvsignore 6 May 2009 20:01:00 -0000 1.17 @@ -1 +1 @@ -multipath-tools-080804.tgz +multipath-tools-090429.tgz Index: device-mapper-multipath.spec =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -p -r1.55 -r1.56 --- device-mapper-multipath.spec 7 Apr 2009 19:39:27 -0000 1.55 +++ device-mapper-multipath.spec 6 May 2009 20:01:00 -0000 1.56 @@ -1,31 +1,29 @@ Summary: Tools to manage multipath devices using device-mapper Name: device-mapper-multipath -Version: 0.4.8 -Release: 10%{?dist} +Version: 0.4.9 +Release: 1%{?dist} License: GPL+ Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ -Source0: multipath-tools-080804.tgz -Patch0: linking_change.patch -Patch1: uevent_fix.patch -Patch2: sparc64fix.patch -Patch3: config_files.patch -Patch4: redhatification.patch -Patch5: mpath_wait.patch -Patch6: multipath_rules.patch -Patch7: cciss_id.patch -Patch8: scsi_id_change.patch -Patch9: config_space_fix.patch -Patch10: fix_devt.patch -Patch11: directio_message_cleanup.patch -Patch12: binding_error.patch -Patch13: fix_kpartx.patch -Patch14: fix_umask.patch -Requires: kpartx = %{version}-%{release} + +Source0: multipath-tools-090429.tgz +Patch0: lib64_multipath.patch +Patch1: redhatification.patch +Patch2: mpath_wait.patch +Patch3: multipath_rules.patch +Patch4: cciss_id.patch +Patch5: directio_message_cleanup.patch +Patch6: binding_error.patch +Patch7: fix_kpartx.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: %{name}-libs = %{version}-%{release} +Requires: kpartx = %{version}-%{release} +Requires: device-mapper >= 1.02.02-2 Requires(post): chkconfig Requires(preun): chkconfig -Requires: device-mapper >= 1.02.02-2 +Requires(preun): initscripts +Requires(postun): initscripts BuildRequires: libaio-devel, device-mapper-devel BuildRequires: libselinux-devel, libsepol-devel BuildRequires: readline-devel, ncurses-devel @@ -37,6 +35,15 @@ The tools are : * multipath : Scan the system for multipath devices and assemble them. * multipathd : Detects when paths fail and execs multipath to update things. +%package libs +Summary: %{name} modules and shared library +License: GPL+ +Group: System Environment/Libraries + +%description libs +%{name}-libs provides the path checker and prioritizer modules. It also +contains the multipath shared library, libmultipath. + %package -n kpartx Summary: Partition device manager for device-mapper devices Group: System Environment/Base @@ -47,28 +54,29 @@ kpartx manages partition creation and re %prep %setup -q -n multipath-tools -%patch0 -p1 -b .linking_change -%patch1 -p1 -b .uevent_fix -%patch2 -p1 -b .sparc64fix -%patch3 -p1 -b .config_files -%patch4 -p1 -b .redhatification -%patch5 -p1 -b .mpath_wait -%patch6 -p1 -b .multipath_rules -%patch7 -p1 -b .cciss_id -%patch8 -p1 -b .scsi_id_change -%patch9 -p1 -b .config_space_fix -%patch10 -p1 -b .fix_devt -%patch11 -p1 -b .directio_message -%patch12 -p1 -b .binding_error -%patch13 -p1 -b .ext_part -%patch14 -p1 -b .umask +%if %{_lib} == "lib64" +%patch0 -p1 -b .lib64_multipath +%endif +%patch1 -p1 -b .redhatification +%patch2 -p1 -b .mpath_wait +%patch3 -p1 -b .multipath_rules +%patch4 -p1 -b .cciss_id +%patch5 -p1 -b .directio_message +%patch6 -p1 -b .binding_error +%patch7 -p1 -b .fix_kpartx %build -make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT +%define _sbindir /sbin +%define _libdir /%{_lib} +%define _libmpathdir %{_libdir}/multipath +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT bindir=/sbin rcdir=/etc/rc.d/init.d +make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir} syslibdir=%{_libdir} libdir=%{_libmpathdir} rcdir=%{_initrddir} +install -m 0644 multipath/multipath.conf.redhat $RPM_BUILD_ROOT/etc/multipath.conf +install -m 0755 multipathd/multipathd.init.redhat $RPM_BUILD_ROOT/%{_initrddir}/multipathd +install -d $RPM_BUILD_ROOT/var/lib/multipath %clean rm -rf $RPM_BUILD_ROOT @@ -79,25 +87,23 @@ rm -rf $RPM_BUILD_ROOT %preun if [ "$1" = 0 ]; then - /sbin/service multipathd stop /dev/null 2>&1 + /sbin/service multipathd stop /dev/null 2>&1 /sbin/chkconfig --del multipathd fi %postun /sbin/ldconfig if [ "$1" -ge "1" ]; then - /sbin/service multipathd condrestart >/dev/null 2>&1 || : + /sbin/service multipathd condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) -/sbin/multipath -/sbin/multipathd -/sbin/cciss_id -/sbin/mpath_wait -/lib/libmultipath.so -/lib/multipath -/etc/rc.d/init.d/multipathd +%{_sbindir}/multipath +%{_sbindir}/multipathd +%{_sbindir}/cciss_id +%{_sbindir}/mpath_wait +%{_initrddir}/multipathd %{_mandir}/man5/multipath.conf.5.gz %{_mandir}/man8/multipath.8.gz %{_mandir}/man8/multipathd.8.gz @@ -106,6 +112,11 @@ fi %doc AUTHOR COPYING README* FAQ multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic %dir /var/lib/multipath +%files libs +%defattr(-,root,root,-) +%{_libdir}/libmultipath.so +%{_libmpathdir} +%dir %{_libmpathdir} %files -n kpartx %defattr(-,root,root,-) @@ -113,6 +124,12 @@ fi %{_mandir}/man8/kpartx.8.gz %changelog +* Thu Apr 29 2009 Mike Snitzer - 0.4.9-1 +- Updated to latest upstream 0.4.9 code: multipath-tools-090429.tgz + (git commit id: 7395bcda3a218df2eab1617df54628af0dc3456e) +- split the multipath libs out to a device-mapper-multipath-libs package +- if appropriate, install multipath libs in /lib64 and /lib64/multipath + * Thu Apr 7 2009 Milan Broz - 0.4.8-10 - Fix insecure permissions on multipathd.sock (CVE-2009-0115) @@ -144,7 +161,7 @@ fi * Mon May 19 2008 Benjamin Marzinksi 0.4.8-3 - Fixed ownership build error. - + * Mon May 19 2008 Benjamin Marzinksi 0.4.8-2 - Forgot to commit some patches. directio_message_cleanup.patch: Index: directio_message_cleanup.patch =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/directio_message_cleanup.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- directio_message_cleanup.patch 26 Sep 2008 23:28:35 -0000 1.1 +++ directio_message_cleanup.patch 6 May 2009 20:01:01 -0000 1.2 @@ -1,15 +1,17 @@ -Index: multipath-tools/libmultipath/checkers/directio.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/directio.c -+++ multipath-tools/libmultipath/checkers/directio.c -@@ -148,8 +148,9 @@ check_state(int fd, struct directio_cont +diff --git a/libmultipath/checkers/directio.c b/libmultipath/checkers/directio.c +index 4728424..7624c4e 100644 +--- a/libmultipath/checkers/directio.c ++++ b/libmultipath/checkers/directio.c +@@ -148,10 +148,11 @@ check_state(int fd, struct directio_context *ct, int sync) } ct->running++; + errno = 0; r = io_getevents(ct->ioctx, 1L, 1L, &event, &timeout); -- LOG(3, "async io getevents returns %li (errno=%s)", r, strerror(errno)); -+ LOG(3, "async io_getevents returns %li (%s)", r, strerror(errno)); - if (r < 1L) { - if (ct->running > ASYNC_TIMEOUT_SEC || sync) { + if (r < 0 ) { +- LOG(3, "async io getevents returned %li (errno=%s)", r, ++ LOG(3, "async io getevents returned %li (%s)", r, + strerror(errno)); + rc = PATH_UNCHECKED; + } else if (r < 1L) { mpath_wait.patch: Index: mpath_wait.patch =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/mpath_wait.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- mpath_wait.patch 20 May 2008 04:37:41 -0000 1.1 +++ mpath_wait.patch 6 May 2009 20:01:01 -0000 1.2 @@ -1,8 +1,8 @@ -Index: multipath-tools-080515/multipath/Makefile -=================================================================== ---- multipath-tools-080515.orig/multipath/Makefile -+++ multipath-tools-080515/multipath/Makefile -@@ -21,7 +21,7 @@ $(EXEC): $(OBJS) +diff --git a/multipath/Makefile b/multipath/Makefile +index e0031a2..fe377d8 100644 +--- a/multipath/Makefile ++++ b/multipath/Makefile +@@ -20,7 +20,7 @@ $(EXEC): $(OBJS) install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) @@ -11,7 +11,7 @@ Index: multipath-tools-080515/multipath/ $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -@@ -36,6 +36,7 @@ install: +@@ -31,6 +31,7 @@ install: uninstall: rm $(DESTDIR)/etc/udev/rules.d/multipath.rules rm $(DESTDIR)$(bindir)/$(EXEC) @@ -19,10 +19,11 @@ Index: multipath-tools-080515/multipath/ rm $(DESTDIR)$(mandir)/$(EXEC).8.gz rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz -Index: multipath-tools-080515/multipath/mpath_wait -=================================================================== +diff --git a/multipath/mpath_wait b/multipath/mpath_wait +new file mode 100644 +index 0000000..d4047cc --- /dev/null -+++ multipath-tools-080515/multipath/mpath_wait ++++ b/multipath/mpath_wait @@ -0,0 +1,17 @@ +#!/bin/bash + multipath_rules.patch: Index: multipath_rules.patch =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/multipath_rules.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- multipath_rules.patch 26 Sep 2008 23:28:36 -0000 1.2 +++ multipath_rules.patch 6 May 2009 20:01:01 -0000 1.3 @@ -1,8 +1,8 @@ -Index: multipath-tools/multipath/Makefile -=================================================================== ---- multipath-tools.orig/multipath/Makefile -+++ multipath-tools/multipath/Makefile -@@ -23,7 +23,7 @@ install: +diff --git a/multipath/Makefile b/multipath/Makefile +index fe377d8..b2c4fa6 100644 +--- a/multipath/Makefile ++++ b/multipath/Makefile +@@ -22,14 +22,14 @@ install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) -m 755 $(EXEC) mpath_wait $(DESTDIR)$(bindir)/ $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d @@ -11,8 +11,7 @@ Index: multipath-tools/multipath/Makefil $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) -@@ -34,7 +34,7 @@ install: - $(INSTALL_PROGRAM) -d $(DESTDIR)/var/lib/multipath + $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) uninstall: - rm $(DESTDIR)/etc/udev/rules.d/multipath.rules @@ -20,10 +19,10 @@ Index: multipath-tools/multipath/Makefil rm $(DESTDIR)$(bindir)/$(EXEC) rm $(DESTDIR)$(bindir)/mpath_wait rm $(DESTDIR)$(mandir)/$(EXEC).8.gz -Index: multipath-tools/multipath/multipath.rules -=================================================================== ---- multipath-tools.orig/multipath/multipath.rules -+++ multipath-tools/multipath/multipath.rules +diff --git a/multipath/multipath.rules b/multipath/multipath.rules +index ac97749..ad2ff2a 100644 +--- a/multipath/multipath.rules ++++ b/multipath/multipath.rules @@ -1,7 +1,8 @@ -# -# udev rules for multipathing. @@ -31,10 +30,11 @@ Index: multipath-tools/multipath/multipa -# - -# socket for uevents +-SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event" +# multipath wants the devmaps presented as meaninglful device names +# so name them after their devmap name +SUBSYSTEM!="block", GOTO="end_mpath" - RUN+="socket:/org/kernel/dm/multipath_event" ++RUN+="socket:/org/kernel/dm/multipath_event" +KERNEL!="dm-[0-9]*", GOTO="end_mpath" +PROGRAM!="/sbin/mpath_wait %M %m", GOTO="end_mpath" +ACTION=="add", RUN+="/sbin/dmsetup ls --target multipath --exec '/sbin/kpartx -a -p p' -j %M -m %m" redhatification.patch: Index: redhatification.patch =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/redhatification.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- redhatification.patch 26 Sep 2008 23:28:36 -0000 1.2 +++ redhatification.patch 6 May 2009 20:01:01 -0000 1.3 @@ -1,36 +1,8 @@ -Index: multipath-tools/libmultipath/defaults.h +Index: multipath-tools-090407/libmultipath/hwtable.c =================================================================== ---- multipath-tools.orig/libmultipath/defaults.h -+++ multipath-tools/libmultipath/defaults.h -@@ -1,4 +1,4 @@ --#define DEFAULT_GETUID "/lib/udev/scsi_id -g -u -s /block/%n" -+#define DEFAULT_GETUID "/sbin/scsi_id -g -u -s /block/%n" - #define DEFAULT_UDEVDIR "/dev" - #define DEFAULT_MULTIPATHDIR "/lib/multipath" - #define DEFAULT_SELECTOR "round-robin 0" -Index: multipath-tools/libmultipath/hwtable.c -=================================================================== ---- multipath-tools.orig/libmultipath/hwtable.c -+++ multipath-tools/libmultipath/hwtable.c -@@ -172,7 +172,7 @@ static struct hwentry default_hw[] = { - /* HP Smart Array */ - .vendor = "HP", - .product = "LOGICAL VOLUME.*", -- .getuid = "/lib/udev/scsi_id -n -g -u -s /block/%n", -+ .getuid = "/sbin/scsi_id -n -g -u -s /block/%n", - .features = DEFAULT_FEATURES, - .hwhandler = DEFAULT_HWHANDLER, - .selector = DEFAULT_SELECTOR, -@@ -214,7 +214,7 @@ static struct hwentry default_hw[] = { - { - .vendor = "EMC", - .product = "SYMMETRIX", -- .getuid = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n", -+ .getuid = "/sbin/scsi_id -g -u -ppre-spc3-83 -s /block/%n", - .features = DEFAULT_FEATURES, - .hwhandler = DEFAULT_HWHANDLER, - .selector = DEFAULT_SELECTOR, -@@ -485,7 +485,7 @@ static struct hwentry default_hw[] = { +--- multipath-tools-090407.orig/libmultipath/hwtable.c 2009-04-07 15:21:33.000000000 -0500 ++++ multipath-tools-090407/libmultipath/hwtable.c 2009-04-07 09:16:31.000000000 -0500 +@@ -554,7 +554,7 @@ static struct hwentry default_hw[] = { .vendor = "IBM", .product = "S/390 DASD ECKD", .bl_product = "S/390.*", @@ -39,558 +11,21 @@ Index: multipath-tools/libmultipath/hwta .features = "1 queue_if_no_path", .hwhandler = DEFAULT_HWHANDLER, .selector = DEFAULT_SELECTOR, -@@ -722,6 +722,22 @@ static struct hwentry default_hw[] = { - .checker_name = RDAC, - .prio_name = PRIO_RDAC, - }, -+ /* DELL arrays */ -+ { -+ .vendor = "DELL", -+ .product = "MD3000", -+ .getuid = DEFAULT_GETUID, -+ .features = DEFAULT_FEATURES, -+ .hwhandler = "1 rdac", -+ .selector = DEFAULT_SELECTOR, -+ .pgpolicy = GROUP_BY_PRIO, -+ .pgfailback = -FAILBACK_MANUAL, -+ .rr_weight = RR_WEIGHT_NONE, -+ .no_path_retry = NO_PATH_RETRY_UNDEF, -+ .minio = DEFAULT_MINIO, -+ .checker_name = RDAC, -+ .prio_name = PRIO_RDAC, -+ }, - /* - * EOL - */ -Index: multipath-tools/multipath.conf.annotated -=================================================================== ---- multipath-tools.orig/multipath.conf.annotated -+++ multipath-tools/multipath.conf.annotated -@@ -55,9 +55,9 @@ - # # scope : multipath - # # desc : the default program and args to callout to obtain a unique - # # path identifier. Absolute path required --# # default : /lib/udev/scsi_id -g -u -s -+# # default : /sbin/scsi_id -g -u -s - # # --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # - # # - # # name : prio -@@ -336,7 +336,7 @@ - # # desc : the program and args to callout to obtain a unique - # # path identifier. Absolute path required - # # --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # - # # - # # name : path_selector -Index: multipath-tools/multipath.conf.defaults -=================================================================== ---- multipath-tools.orig/multipath.conf.defaults -+++ multipath-tools/multipath.conf.defaults -@@ -6,7 +6,7 @@ - # polling_interval 5 - # selector "round-robin 0" - # path_grouping_policy failover --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # prio const - # path_checker directio - # rr_min_io 1000 -@@ -26,7 +26,7 @@ - # device { - # vendor "APPLE*" - # product "Xserve RAID" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -39,7 +39,7 @@ - # device { - # vendor "3PARdata" - # product "VV" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -52,7 +52,7 @@ - # device { - # vendor "DEC" - # product "HSG80" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "1 hp-sw" - # path_selector "round-robin 0" -@@ -65,7 +65,7 @@ - # device { - # vendor "HP" - # product "A6189A" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -79,7 +79,7 @@ - # device { - # vendor "(COMPAQ|HP)" - # product "(MSA|HSV)1.0.*" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "1 hp-sw" - # path_selector "round-robin 0" -@@ -93,7 +93,7 @@ - # device { - # vendor "HP" - # product "MSA VOLUME" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -123,7 +123,7 @@ - # device { - # vendor "(COMPAQ|HP)" - # product "HSV1[01]1|HSV2[01]0|HSV300" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -138,7 +138,7 @@ - # device { - # vendor "HP" - # product "MSA2[02]12*" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -153,7 +153,7 @@ - # device { - # vendor "HP" - # product "LOGICAL VOLUME.*" --# getuid_callout "/lib/udev/scsi_id -n -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -n -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -168,7 +168,7 @@ - # device { - # vendor "DDN" - # product "SAN DataDirector" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -181,7 +181,7 @@ - # device { - # vendor "EMC" - # product "SYMMETRIX" --# getuid_callout "/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -ppre-spc3-83 -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -195,7 +195,7 @@ - # vendor "DGC" - # product ".*" - # product_blacklist "LUNZ" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # prio_callout "/sbin/mpath_prio_emc /dev/%n" - # features "1 queue_if_no_path" - # hardware_handler "1 emc" -@@ -211,7 +211,7 @@ - # device { - # vendor "FSC" - # product "CentricStor" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -224,7 +224,7 @@ - # device { - # vendor "(HITACHI|HP)" - # product "OPEN-.*" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -237,7 +237,7 @@ - # device { - # vendor "HITACHI" - # product "DF.*" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -251,7 +251,7 @@ - # device { - # vendor "IBM" - # product "ProFibre 4000R" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -264,7 +264,7 @@ - # device { - # vendor "IBM" - # product "1722-600" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -279,7 +279,7 @@ - # device { - # vendor "IBM" - # product "1742" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -294,7 +294,7 @@ - # device { - # vendor "IBM" - # product "1814" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -309,7 +309,7 @@ - # device { - # vendor "IBM" - # product "1815" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -324,7 +324,7 @@ - # device { - # vendor "IBM" - # product "3526" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -339,7 +339,7 @@ - # device { - # vendor "IBM" - # product "3542" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -352,7 +352,7 @@ - # device { - # vendor "IBM" - # product "2105(800|F20)" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -365,7 +365,7 @@ - # device { - # vendor "IBM" - # product "1750500" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -379,7 +379,7 @@ - # device { - # vendor "IBM" - # product "2107900" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -392,7 +392,7 @@ - # device { - # vendor "IBM" - # product "2145" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -407,7 +407,7 @@ - # vendor "IBM" - # product "S/390 DASD ECKD" - # product_blacklist "S/390.*" --# getuid_callout "/sbin/dasdinfo -u -b %n" -+# getuid_callout "/sbin/dasd_id /dev/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -420,7 +420,7 @@ - # device { - # vendor "NETAPP" - # product "LUN.*" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -434,7 +434,7 @@ - # device { - # vendor "IBM" - # product "Nseries.*" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "1 queue_if_no_path" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -448,7 +448,7 @@ - # device { - # vendor "Pillar" - # product "Axiom.*" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -461,7 +461,7 @@ - # device { - # vendor "SGI" - # product "TP9[13]00" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -474,7 +474,7 @@ - # device { - # vendor "SGI" - # product "TP9[45]00" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -489,7 +489,7 @@ - # device { - # vendor "SGI" - # product "IS.*" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -504,7 +504,7 @@ - # device { - # vendor "STK" - # product "OPENstorage D280" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -518,7 +518,7 @@ - # device { - # vendor "SUN" - # product "(StorEdge 3510|T4)" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "0" - # path_selector "round-robin 0" -@@ -544,7 +544,7 @@ - # device { - # vendor "SUN" - # product "CSM200_R" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -559,7 +559,7 @@ - # device { - # vendor "SUN" - # product "LCSM100_F" --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # features "0" - # hardware_handler "1 rdac" - # path_selector "round-robin 0" -@@ -571,4 +571,18 @@ - # path_checker rdac - # prio rdac - # } -+# device { -+# vendor "DELL" -+# product "MD3000" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" -+# features "0" -+# hardware_handler "1 rdac" -+# path_selector "round-robin 0" -+# path_grouping_policy group_by_prio -+# failback manual -+# rr_weight uniform -+# rr_min_io 1000 -+# path_checker rdac -+# prio rdac -+# } - #} -Index: multipath-tools/multipath.conf.synthetic -=================================================================== ---- multipath-tools.orig/multipath.conf.synthetic -+++ multipath-tools/multipath.conf.synthetic -@@ -7,7 +7,7 @@ - # polling_interval 10 - # selector "round-robin 0" - # path_grouping_policy multibus --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # prio const - # path_checker directio - # rr_min_io 100 -@@ -52,7 +52,7 @@ - # vendor "COMPAQ " - # product "HSV110 (C)COMPAQ" - # path_grouping_policy multibus --# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" - # path_checker directio - # path_selector "round-robin 0" - # hardware_handler "0" -Index: multipath-tools/Makefile.inc -=================================================================== ---- multipath-tools.orig/Makefile.inc -+++ multipath-tools/Makefile.inc -@@ -20,7 +20,7 @@ libudevdir = ${prefix}/lib/udev - multipathdir = $(TOPDIR)/libmultipath - mandir = $(prefix)/usr/share/man/man8 - man5dir = $(prefix)/usr/share/man/man5 --rcdir = $(prefix)/etc/init.d -+rcdir = $(prefix)/etc/rc.d/init.d - libdir = $(prefix)/lib/multipath - - GZIP = /bin/gzip -9 -c -Index: multipath-tools/multipathd/Makefile -=================================================================== ---- multipath-tools.orig/multipathd/Makefile -+++ multipath-tools/multipathd/Makefile -@@ -35,6 +35,7 @@ install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) -+ $(INSTALL_PROGRAM) -m 755 multipathd.init.redhat $(DESTDIR)$(rcdir)/$(EXEC) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) - -Index: multipath-tools/multipathd/multipathd.init.redhat -=================================================================== ---- multipath-tools.orig/multipathd/multipathd.init.redhat -+++ multipath-tools/multipathd/multipathd.init.redhat -@@ -1,13 +1,9 @@ - #!/bin/bash -- --# --# /etc/rc.d/init.d/multipathd - # --# Starts the multipath daemon -+# multipathd Starts the multipath daemon - # - # chkconfig: - 13 87 --# description: Manage device-mapper multipath devices --# processname: multipathd -+# description: Manages device-mapper multipath devices - - DAEMON=/sbin/multipathd - prog=`basename $DAEMON` -@@ -16,14 +12,8 @@ lockdir=/var/lock/subsys - sysconfig=/etc/sysconfig - - --system=redhat -- --if [ $system = redhat ]; then -- # Source function library. -- . $initdir/functions --fi -+. $initdir/functions - --test -x $DAEMON || exit 0 - test -r $sysconfig/$prog && . $sysconfig/$prog - - RETVAL=0 -@@ -33,6 +23,7 @@ RETVAL=0 - # - - start() { -+ test -x $DAEMON || exit 5 - echo -n $"Starting $prog daemon: " - daemon $DAEMON - RETVAL=$? -@@ -74,7 +65,7 @@ reload) - restart) - restart - ;; --condrestart) -+condrestart|try-restart) - if [ -f $lockdir/$prog ]; then - restart - fi -@@ -85,7 +76,7 @@ status) - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" -- RETVAL=1 -+ RETVAL=2 - esac - - exit $RETVAL -Index: multipath-tools/multipath/Makefile -=================================================================== ---- multipath-tools.orig/multipath/Makefile -+++ multipath-tools/multipath/Makefile -@@ -28,6 +28,10 @@ install: - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) -+ if [ ! -e $(DESTDIR)//etc/multipath.conf ]; then \ -+ $(INSTALL_PROGRAM) -m 644 multipath.conf.redhat $(DESTDIR)/etc/multipath.conf; \ -+ fi -+ $(INSTALL_PROGRAM) -d $(DESTDIR)/var/lib/multipath - - uninstall: - rm $(DESTDIR)/etc/udev/rules.d/multipath.rules -Index: multipath-tools/multipath/multipath.conf.redhat +Index: multipath-tools-090407/multipath/multipath.conf.redhat =================================================================== ---- /dev/null -+++ multipath-tools/multipath/multipath.conf.redhat +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ multipath-tools-090407/multipath/multipath.conf.redhat 2009-04-07 09:16:31.000000000 -0500 @@ -0,0 +1,97 @@ +# This is a basic configuration file with some examples, for device mapper +# multipath. +# For a complete list of the default configuration values, see -+# /usr/share/doc/device-mapper-multipath-0.4.8/multipath.conf.defaults ++# /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf.defaults +# For a list of configuration options with descriptions, see -+# /usr/share/doc/device-mapper-multipath-0.4.8/multipath.conf.annotated ++# /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf.annotated + + +# Blacklist all devices by default. Remove this to enable multipathing -+# on the default devices. ++# on the default devices. +blacklist { + devnode "*" +} @@ -618,7 +53,7 @@ Index: multipath-tools/multipath/multipa +# polling_interval 10 +# selector "round-robin 0" +# path_grouping_policy multibus -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" ++# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" +# prio alua +# path_checker readsector0 +# rr_min_io 100 @@ -664,7 +99,7 @@ Index: multipath-tools/multipath/multipa +# vendor "COMPAQ " +# product "HSV110 (C)COMPAQ" +# path_grouping_policy multibus -+# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" ++# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" +# path_checker readsector0 +# path_selector "round-robin 0" +# hardware_handler "0" @@ -678,10 +113,10 @@ Index: multipath-tools/multipath/multipa +# path_grouping_policy multibus +# } +#} -Index: multipath-tools/kpartx/Makefile +Index: multipath-tools-090407/kpartx/Makefile =================================================================== ---- multipath-tools.orig/kpartx/Makefile -+++ multipath-tools/kpartx/Makefile +--- multipath-tools-090407.orig/kpartx/Makefile 2009-04-07 15:21:33.000000000 -0500 ++++ multipath-tools-090407/kpartx/Makefile 2009-04-07 09:16:31.000000000 -0500 @@ -20,10 +20,10 @@ $(EXEC): $(OBJS) install: $(EXEC) $(EXEC).8 $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- sources 20 Aug 2008 21:48:41 -0000 1.17 +++ sources 6 May 2009 20:01:01 -0000 1.18 @@ -1 +1 @@ -3ffa9a7f768fab9749689fe2624a8551 multipath-tools-080804.tgz +450d0715048f3a8c82082ad2b9e5a2b3 multipath-tools-090429.tgz --- config_files.patch DELETED --- --- config_space_fix.patch DELETED --- --- fix_devt.patch DELETED --- --- fix_umask.patch DELETED --- --- linking_change.patch DELETED --- --- scsi_id_change.patch DELETED --- --- sparc64fix.patch DELETED --- --- uevent_fix.patch DELETED --- From rdieter at fedoraproject.org Wed May 6 20:02:30 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 6 May 2009 20:02:30 +0000 (UTC) Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec,1.219,1.220 Message-ID: <20090506200230.58FC870108@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8895 Modified Files: kdebase-workspace.spec Log Message: - fix oxygen-cursor-themes noarch'ness Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v retrieving revision 1.219 retrieving revision 1.220 diff -u -p -r1.219 -r1.220 --- kdebase-workspace.spec 6 May 2009 19:49:17 -0000 1.219 +++ kdebase-workspace.spec 6 May 2009 20:02:00 -0000 1.220 @@ -184,10 +184,10 @@ Group: System Environment/Daemons %package -n oxygen-cursor-themes Summary: Oxygen cursor themes Group: User Interface/Desktops -%description -n oxygen-cursor-themes %if 0%{?fedora} > 9 BuildArch: noarch %endif +%description -n oxygen-cursor-themes %{summary}. %package googlegadgets @@ -515,6 +515,7 @@ fi %changelog * Wed May 06 2009 Than Ngo - 4.2.3-2 - Requires: oxygen-icon-theme >= 4.2.2 +- fix oxygen-cursor-themes noarch'ness * Sun May 03 2009 Than Ngo - 4.2.3-1 - 4.2.3 From mclasen at fedoraproject.org Wed May 6 20:25:39 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Wed, 6 May 2009 20:25:39 +0000 (UTC) Subject: rpms/gnome-desktop/F-11 pnpids.patch, NONE, 1.1 gnome-desktop.spec, 1.212, 1.213 Message-ID: <20090506202540.0034770108@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-desktop/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11930 Modified Files: gnome-desktop.spec Added Files: pnpids.patch Log Message: read pnp ids from hwdata, if available pnpids.patch: --- NEW FILE pnpids.patch --- --- gnome-desktop-2.26.1/libgnome-desktop/display-name.c 2009-05-06 16:19:08.498375080 -0400 +++ hacked/libgnome-desktop/display-name.c 2009-05-06 16:17:08.483375623 -0400 @@ -182,15 +182,58 @@ { "???", "Unknown" }, }; +static GHashTable *hwdata = NULL; + +#define PNP_IDS "/usr/share/hwdata/pnp.ids" + +static void +read_hwdata (void) +{ + gchar *contents; + gchar **lines; + gchar *line; + gchar *code, *name; + gint i; + + if (hwdata) + return; + + hwdata = g_hash_table_new (g_str_hash, g_str_equal); + + if (g_file_get_contents (PNP_IDS, &contents, NULL, NULL)) { + lines = g_strsplit (contents, "\n", -1); + for (i = 0; lines[i]; i++) { + line = lines[i]; + if (line[3] == '\t') { + code = line; + line[3] = '\0'; + name = line + 4; + g_hash_table_insert (hwdata, code, name); + } + } + g_free (lines); + } + g_free (contents); +} + + static const char * find_vendor (const char *code) { int i; + const char *vendor_name; + + read_hwdata (); + + vendor_name = g_hash_table_lookup (hwdata, code); + + if (vendor_name) + return vendor_name; for (i = 0; i < sizeof (vendors) / sizeof (vendors[0]); ++i) { const Vendor *v = &(vendors[i]); - + if (strcmp (v->vendor_id, code) == 0) return v->vendor_name; } Index: gnome-desktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/F-11/gnome-desktop.spec,v retrieving revision 1.212 retrieving revision 1.213 diff -u -p -r1.212 -r1.213 --- gnome-desktop.spec 29 Apr 2009 15:11:50 -0000 1.212 +++ gnome-desktop.spec 6 May 2009 20:25:09 -0000 1.213 @@ -12,13 +12,15 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop Version: 2.26.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.26/%{name}-%{version}.tar.bz2 # fixed upstream Patch0: give-me-back-my-rotations.patch # fixed upstream Patch1: you-never-find-a-haystack-in-a-needle.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=581621 +Patch2: pnpids.patch License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +80,7 @@ libgnomedesktop. %setup -q %patch0 -p1 -b .rotations %patch1 -p1 -b .unknown-monitors +%patch2 -p1 -b .pnpids.patch %build %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper @@ -123,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Wed May 6 2009 Matthias Clasen - 2.26.1-5 +- Read vendor names from hwdata, when available + * Wed Apr 29 2009 Matthias Clasen - 2.26.1-4 - Remove debug spew From rstrode at fedoraproject.org Wed May 6 20:28:31 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Wed, 6 May 2009 20:28:31 +0000 (UTC) Subject: rpms/plymouth/devel charge.plymouth, NONE, 1.1 .cvsignore, 1.11, 1.12 plymouth.spec, 1.126, 1.127 sources, 1.52, 1.53 plymouth-0.7.0-destroy-terminal-on-detach.patch, 1.1, NONE Message-ID: <20090506202831.AC9E570108@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12448 Modified Files: .cvsignore plymouth.spec sources Added Files: charge.plymouth Removed Files: plymouth-0.7.0-destroy-terminal-on-detach.patch Log Message: - Update to "plugin-rework" branch from git --- NEW FILE charge.plymouth --- [Plymouth Theme] Name=Charge Description=A theme that features the shadowy hull of a Fedora logo charge up and and finally burst into into full form. ModuleName=two-step [two-step] ImageDir=/usr/share/plymouth/themes/charge HorizontalAlignment=.5 VerticalAlignment=.5 Transition=none TransitionDuration=0.0 BackgroundStartColor=0x416fa7 BackgroundEndColor=0x4b83c1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 6 Mar 2009 22:35:01 -0000 1.11 +++ .cvsignore 6 May 2009 20:28:00 -0000 1.12 @@ -1 +1,2 @@ plymouth-0.7.0.tar.bz2 +charge.plymouth Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- plymouth.spec 8 Apr 2009 23:07:54 -0000 1.126 +++ plymouth.spec 6 May 2009 20:28:00 -0000 1.127 @@ -5,11 +5,12 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.7.0 -Release: 0.2009.03.10.3%{?dist} +Release: 0.2009.05.06.1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 Source1: boot-duration +Source2: charge.plymouth URL: http://freedesktop.org/software/plymouth/releases BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,8 +19,6 @@ Requires: system-logos Requires(post): plymouth-scripts Requires: initscripts >= 8.83-1 -Patch0: plymouth-0.7.0-destroy-terminal-on-detach.patch - Obsoletes: plymouth-text-and-details-only < %{version}-%{release} %description @@ -28,15 +27,18 @@ place of the text messages that normally messages are instead redirected to a log file for viewing after boot. -%package system-plugin -Summary: Plymouth default plugin +%package system-theme +Summary: Plymouth default theme Group: System Environment/Base Obsoletes: rhgb < 1:10.0.0 Provides: rhgb = 1:10.0.0 -Requires: plymouth(system-plugin) = %{version}-%{release} +Obsoletes: %{name}-system-plugin < %{version}-%{release} +Provides: %{name}-system-plugin = %{version}-%{release} +Provides: rhgb = 1:10.0.0 +Requires: plymouth(system-theme) = %{version}-%{release} -%description system-plugin -This metapackage tracks the current distribution default plugin. +%description system-theme +This metapackage tracks the current distribution default theme. %package libs Summary: Plymouth libraries @@ -103,11 +105,21 @@ graphical boot splashes using pango and Summary: Plymouth "Fade-In" plugin Group: System Environment/Base Requires: %{name}-libs = %{version}-%{release} -Requires(post): %{_sbindir}/plymouth-set-default-plugin BuildRequires: libpng-devel %description plugin-fade-in This package contains the "Fade-In" boot splash plugin for +Plymouth. It features a centered image that fades in and out +while other images pulsate around during system boot up. + +%package theme-fade-in +Summary: Plymouth "Fade-In" theme +Group: System Environment/Base +Requires: %{name}-plugin-fade-in = %{version}-%{release} +Requires(post): %{_sbindir}/plymouth-set-default-theme + +%description theme-fade-in +This package contains the "Fade-In" boot splash theme for Plymouth. It features a centered logo that fades in and out while stars twinkle around the logo during system boot up. @@ -115,43 +127,94 @@ while stars twinkle around the logo duri Summary: Plymouth "Pulser" plugin Group: System Environment/Base Requires: %{name}-libs = %{version}-%{release} -Requires(post): %{_sbindir}/plymouth-set-default-plugin -BuildRequires: libpng-devel %description plugin-pulser This package contains the "Pulser" boot splash plugin for Plymouth. It features a pulsing text progress indicator centered in the screen during system boot up. +%package theme-pulser +Summary: Plymouth "Pulser" theme +Group: System Environment/Base +Requires: %{name}-plugin-pulser = %{version}-%{release} +Requires(post): %{_sbindir}/plymouth-set-default-theme + +%description theme-pulser +This package contains the "Pulser" boot splash theme for +Plymouth. It features a pulsing text progress indicator +centered in the screen during system boot up. + %package plugin-spinfinity Summary: Plymouth "Spinfinity" plugin Group: System Environment/Base Requires: %{name}-libs = %{version}-%{release} Requires: plymouth-plugin-label BuildRequires: libpng-devel -Requires(post): %{_sbindir}/plymouth-set-default-plugin %description plugin-spinfinity This package contains the "Spinfinity" boot splash plugin for Plymouth. It features a centered logo and animated spinner that spins in the shape of an infinity sign. +%package theme-spinfinity +Summary: Plymouth "Spinfinity" theme +Group: System Environment/Base +Requires: %{name}-plugin-spinfinity = %{version}-%{release} +Requires(post): %{_sbindir}/plymouth-set-default-theme + +%description theme-spinfinity +This package contains the "Spinfinity" boot splash theme for +Plymouth. It features a centered logo and animated spinner that +spins in the shape of an infinity sign. + %package plugin-solar Summary: Plymouth "Solar" plugin Group: System Environment/Base Requires: %{name}-libs = %{version}-%{release} Requires: plymouth-plugin-label -Requires(post): %{_sbindir}/plymouth-set-default-plugin BuildRequires: libpng-devel -Provides: plymouth(system-plugin) = %{version}-%{release} %description plugin-solar This package contains the "Solar" boot splash plugin for Plymouth. It features a blue flamed sun with animated solar flares. +%package theme-solar +Summary: Plymouth "Solar" theme +Group: System Environment/Base +Requires: %{name}-plugin-solar = %{version}-%{release} +Requires(post): %{_sbindir}/plymouth-set-default-theme + +%description theme-solar +This package contains the "Solar" boot splash theme for +Plymouth. It features a blue flamed sun with animated solar flares. + +%package plugin-two-step +Summary: Plymouth "two-step" plugin +Group: System Environment/Base +Requires: %{name}-libs = %{version}-%{release} +Requires: plymouth-plugin-label +BuildRequires: libpng-devel + +%description plugin-two-step +This package contains the "two-step" boot splash plugin for +Plymouth. It features a two phased boot process that starts with +a progressing animation synced to boot time and finishes with a +short, fast one-shot animation. + +%package theme-charge +Summary: Plymouth "Charge" plugin +Group: System Environment/Base +Requires: %{name}-plugin-solar = %{version}-%{release} +Requires(post): %{_sbindir}/plymouth-set-default-theme +Provides: plymouth(system-theme) = %{version}-%{release} + +%description theme-charge +This package contains the "charge" boot splash theme for +Plymouth. It features the shadowy hull of a Fedora logo charge up and +and finally burst into into full form. + %prep %setup -q -%patch0 -p1 -b .destroy-terminal-on-detach %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -185,6 +248,14 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth +# Add charge, our new default +mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge +cp $RPM_SOURCE_DIR/charge.plymouth $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge +cp $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge + +# Drop glow, it's not very Fedora-y +rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow + %clean rm -rf $RPM_BUILD_ROOT @@ -199,45 +270,53 @@ fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%post plugin-spinfinity +%postun theme-spinfinity export LIB=%{_lib} -if [ $1 -eq 1 ]; then - %{_sbindir}/plymouth-set-default-plugin spinfinity -else - if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "solar" ]; then - %{_sbindir}/plymouth-set-default-plugin spinfinity +if [ $1 -eq 0 ]; then + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then + %{_sbindir}/plymouth-set-default-theme text fi fi -%postun plugin-spinfinity +%postun theme-fade-in export LIB=%{_lib} if [ $1 -eq 0 ]; then - if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "spinfinity" ]; then - %{_sbindir}/plymouth-set-default-plugin text + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then + %{_sbindir}/plymouth-set-default-theme --reset fi fi -%postun plugin-fade-in +%postun theme-solar export LIB=%{_lib} if [ $1 -eq 0 ]; then - if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "fade-in" ]; then - %{_sbindir}/plymouth-set-default-plugin --reset + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then + %{_sbindir}/plymouth-set-default-theme --reset fi fi -%postun plugin-solar +%postun theme-pulser export LIB=%{_lib} if [ $1 -eq 0 ]; then - if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "solar" ]; then - %{_sbindir}/plymouth-set-default-plugin --reset + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "pulser" ]; then + %{_sbindir}/plymouth-set-default-theme --reset + fi +fi + +%post theme-charge +export LIB=%{_lib} +if [ $1 -eq 1 ]; then + %{_sbindir}/plymouth-set-default-theme charge +else + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then + %{_sbindir}/plymouth-set-default-theme charge fi fi -%postun plugin-pulser +%postun theme-charge export LIB=%{_lib} if [ $1 -eq 0 ]; then - if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "pulser" ]; then - %{_sbindir}/plymouth-set-default-plugin --reset + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "charge" ]; then + %{_sbindir}/plymouth-set-default-theme --reset fi fi @@ -245,6 +324,7 @@ fi %defattr(-, root, root) %doc AUTHORS NEWS README %dir %{_datadir}/plymouth +%dir %{_datadir}/plymouth/themes %dir %{_libexecdir}/plymouth %dir %{_localstatedir}/lib/plymouth %{plymouthdaemon_execdir}/plymouthd @@ -254,6 +334,8 @@ fi %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so %{_datadir}/plymouth/default-boot-duration +%{_datadir}/plymouth/themes/details/details.plymouth +%{_datadir}/plymouth/themes/text/text.plymouth %{_localstatedir}/run/plymouth %{_localstatedir}/spool/plymouth %ghost %{_localstatedir}/lib/plymouth/boot-duration @@ -273,7 +355,7 @@ fi %files scripts %defattr(-, root, root) -%{_sbindir}/plymouth-set-default-plugin +%{_sbindir}/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd %{_libexecdir}/plymouth/plymouth-populate-initrd @@ -291,37 +373,67 @@ fi %files plugin-fade-in %defattr(-, root, root) -%dir %{_datadir}/plymouth/fade-in -%{_datadir}/plymouth/fade-in/bullet.png -%{_datadir}/plymouth/fade-in/entry.png -%{_datadir}/plymouth/fade-in/lock.png -%{_datadir}/plymouth/fade-in/star.png %{_libdir}/plymouth/fade-in.so +%files theme-fade-in +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/fade-in +%{_datadir}/plymouth/themes/fade-in/bullet.png +%{_datadir}/plymouth/themes/fade-in/entry.png +%{_datadir}/plymouth/themes/fade-in/lock.png +%{_datadir}/plymouth/themes/fade-in/star.png +%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth + %files plugin-pulser %defattr(-, root, root) %{_libdir}/plymouth/pulser.so +%files theme-pulser +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/pulser +%{_datadir}/plymouth/themes/pulser/pulser.plymouth + %files plugin-spinfinity %defattr(-, root, root) -%dir %{_datadir}/plymouth/spinfinity -%{_datadir}/plymouth/spinfinity/box.png -%{_datadir}/plymouth/spinfinity/bullet.png -%{_datadir}/plymouth/spinfinity/entry.png -%{_datadir}/plymouth/spinfinity/lock.png -%{_datadir}/plymouth/spinfinity/throbber-[0-3][0-9].png %{_libdir}/plymouth/spinfinity.so +%files theme-spinfinity +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/spinfinity +%{_datadir}/plymouth/themes/spinfinity/box.png +%{_datadir}/plymouth/themes/spinfinity/bullet.png +%{_datadir}/plymouth/themes/spinfinity/entry.png +%{_datadir}/plymouth/themes/spinfinity/lock.png +%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png +%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth + %files plugin-solar %defattr(-, root, root) -%dir %{_datadir}/plymouth/solar -%{_datadir}/plymouth/solar/*.png %{_libdir}/plymouth/solar.so -%files system-plugin +%files theme-solar +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/solar +%{_datadir}/plymouth/themes/solar/*.png +%{_datadir}/plymouth/themes/solar/solar.plymouth + +%files plugin-two-step +%defattr(-, root, root) +%{_libdir}/plymouth/two-step.so + +%files theme-charge +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/charge +%{_datadir}/plymouth/themes/charge/*.png +%{_datadir}/plymouth/themes/charge/charge.plymouth + +%files system-theme %defattr(-, root, root) %changelog +* Wed May 06 2009 Ray Strode 0.7.0-0.2009.05.06.1 +- Update to "plugin-rework" branch from git + * Wed Apr 08 2009 Jesse Keating - 0.7.0-0.2009.03.10.3 - Drop the version on system-logos requires for now, causing hell with other -logos providers not having the same version. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -r1.52 -r1.53 --- sources 10 Mar 2009 18:55:58 -0000 1.52 +++ sources 6 May 2009 20:28:00 -0000 1.53 @@ -1 +1,2 @@ -bb0730684ea7b9e9c709b0644ce45750 plymouth-0.7.0.tar.bz2 +c9e4cd6a43754dbecbf8816f060da23d plymouth-0.7.0.tar.bz2 +1563eb39d87b9d25283ca33b369b751e charge.plymouth --- plymouth-0.7.0-destroy-terminal-on-detach.patch DELETED --- From grenier at fedoraproject.org Wed May 6 20:41:33 2009 From: grenier at fedoraproject.org (Christophe GRENIER) Date: Wed, 6 May 2009 20:41:33 +0000 (UTC) Subject: rpms/testdisk/EL-4 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 testdisk.spec, 1.10, 1.11 Message-ID: <20090506204133.41A4870108@cvs1.fedora.phx.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14032/EL-4 Modified Files: .cvsignore sources testdisk.spec Log Message: Use photorec_611_exif_bound_checking_v2.patch to fix the EXIF bug Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 24 Apr 2009 06:31:31 -0000 1.9 +++ .cvsignore 6 May 2009 20:41:02 -0000 1.10 @@ -1,3 +1,3 @@ testdisk-6.11.tar.bz2 testdisk-doc-6.11.tar.bz2 -photorec_611_exif_bound_checking.patch +photorec_611_exif_bound_checking_v2.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 24 Apr 2009 06:31:31 -0000 1.9 +++ sources 6 May 2009 20:41:02 -0000 1.10 @@ -1,3 +1,3 @@ 11f8fe95dcd190b69b782efa65b29ba1 testdisk-6.11.tar.bz2 8ed6b23ae64bf1cf9a15371ea7481fa5 testdisk-doc-6.11.tar.bz2 -dba57525125fbb372f470832af2d91c1 photorec_611_exif_bound_checking.patch +525350908048a5c90c932464375b08a3 photorec_611_exif_bound_checking_v2.patch Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-4/testdisk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- testdisk.spec 24 Apr 2009 06:31:31 -0000 1.10 +++ testdisk.spec 6 May 2009 20:41:02 -0000 1.11 @@ -4,12 +4,12 @@ Summary(fr.UTF8): Outil pour v??rifier e Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk Version: 6.11 -Release: 1%{?dist} +Release: 2%{?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 -Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch +Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking_v2.patch URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc %changelog +* Wed May 6 2009 Christophe Grenier 6.11-2 +- Use upstream patch v2 + * Fri Apr 24 2009 Christophe Grenier 6.11-1 - Update to latest version - Add upstream patch that add missing bound checks when parsing EXIF information From grenier at fedoraproject.org Wed May 6 20:41:33 2009 From: grenier at fedoraproject.org (Christophe GRENIER) Date: Wed, 6 May 2009 20:41:33 +0000 (UTC) Subject: rpms/testdisk/EL-5 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 testdisk.spec, 1.17, 1.18 Message-ID: <20090506204133.88EC370108@cvs1.fedora.phx.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14032/EL-5 Modified Files: .cvsignore sources testdisk.spec Log Message: Use photorec_611_exif_bound_checking_v2.patch to fix the EXIF bug Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 24 Apr 2009 06:31:32 -0000 1.12 +++ .cvsignore 6 May 2009 20:41:03 -0000 1.13 @@ -1,3 +1,3 @@ testdisk-6.11.tar.bz2 testdisk-doc-6.11.tar.bz2 -photorec_611_exif_bound_checking.patch +photorec_611_exif_bound_checking_v2.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 24 Apr 2009 06:31:32 -0000 1.12 +++ sources 6 May 2009 20:41:03 -0000 1.13 @@ -1,3 +1,3 @@ 11f8fe95dcd190b69b782efa65b29ba1 testdisk-6.11.tar.bz2 8ed6b23ae64bf1cf9a15371ea7481fa5 testdisk-doc-6.11.tar.bz2 -dba57525125fbb372f470832af2d91c1 photorec_611_exif_bound_checking.patch +525350908048a5c90c932464375b08a3 photorec_611_exif_bound_checking_v2.patch Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-5/testdisk.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- testdisk.spec 24 Apr 2009 06:31:32 -0000 1.17 +++ testdisk.spec 6 May 2009 20:41:03 -0000 1.18 @@ -4,12 +4,12 @@ Summary(fr.UTF8): Outil pour v??rifier e Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk Version: 6.11 -Release: 2%{?dist} +Release: 3%{?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 -Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch +Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking_v2.patch URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc %changelog +* Wed May 6 2009 Christophe Grenier 6.11-3 +- Use upstream patch v2 + * Fri Apr 24 2009 Christophe Grenier 6.11-2 - Add upstream patch that add missing bound checks when parsing EXIF information From grenier at fedoraproject.org Wed May 6 20:41:36 2009 From: grenier at fedoraproject.org (Christophe GRENIER) Date: Wed, 6 May 2009 20:41:36 +0000 (UTC) Subject: rpms/testdisk/devel .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 testdisk.spec, 1.26, 1.27 Message-ID: <20090506204136.1BED870108@cvs1.fedora.phx.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14032/devel Modified Files: .cvsignore sources testdisk.spec Log Message: Use photorec_611_exif_bound_checking_v2.patch to fix the EXIF bug Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 24 Apr 2009 06:31:33 -0000 1.14 +++ .cvsignore 6 May 2009 20:41:05 -0000 1.15 @@ -1,3 +1,3 @@ testdisk-6.11.tar.bz2 testdisk-doc-6.11.tar.bz2 -photorec_611_exif_bound_checking.patch +photorec_611_exif_bound_checking_v2.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 24 Apr 2009 06:31:33 -0000 1.15 +++ sources 6 May 2009 20:41:05 -0000 1.16 @@ -1,3 +1,3 @@ 11f8fe95dcd190b69b782efa65b29ba1 testdisk-6.11.tar.bz2 8ed6b23ae64bf1cf9a15371ea7481fa5 testdisk-doc-6.11.tar.bz2 -dba57525125fbb372f470832af2d91c1 photorec_611_exif_bound_checking.patch +525350908048a5c90c932464375b08a3 photorec_611_exif_bound_checking_v2.patch Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- testdisk.spec 24 Apr 2009 06:31:33 -0000 1.26 +++ testdisk.spec 6 May 2009 20:41:05 -0000 1.27 @@ -4,12 +4,12 @@ Summary(fr.UTF8): Outil pour v??rifier e Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk Version: 6.11 -Release: 2%{?dist} +Release: 3%{?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 -Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch +Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking_v2.patch URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc %changelog +* Wed May 6 2009 Christophe Grenier 6.11-3 +- Use upstream patch v2 + * Fri Apr 24 2009 Christophe Grenier 6.11-2 - Add upstream patch that add missing bound checks when parsing EXIF information From grenier at fedoraproject.org Wed May 6 20:41:35 2009 From: grenier at fedoraproject.org (Christophe GRENIER) Date: Wed, 6 May 2009 20:41:35 +0000 (UTC) Subject: rpms/testdisk/F-11 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 testdisk.spec, 1.26, 1.27 Message-ID: <20090506204135.330A370108@cvs1.fedora.phx.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14032/F-11 Modified Files: .cvsignore sources testdisk.spec Log Message: Use photorec_611_exif_bound_checking_v2.patch to fix the EXIF bug Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-11/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 24 Apr 2009 06:31:32 -0000 1.14 +++ .cvsignore 6 May 2009 20:41:04 -0000 1.15 @@ -1,3 +1,3 @@ testdisk-6.11.tar.bz2 testdisk-doc-6.11.tar.bz2 -photorec_611_exif_bound_checking.patch +photorec_611_exif_bound_checking_v2.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-11/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 24 Apr 2009 06:31:32 -0000 1.15 +++ sources 6 May 2009 20:41:04 -0000 1.16 @@ -1,3 +1,3 @@ 11f8fe95dcd190b69b782efa65b29ba1 testdisk-6.11.tar.bz2 8ed6b23ae64bf1cf9a15371ea7481fa5 testdisk-doc-6.11.tar.bz2 -dba57525125fbb372f470832af2d91c1 photorec_611_exif_bound_checking.patch +525350908048a5c90c932464375b08a3 photorec_611_exif_bound_checking_v2.patch Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-11/testdisk.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- testdisk.spec 24 Apr 2009 06:31:32 -0000 1.26 +++ testdisk.spec 6 May 2009 20:41:04 -0000 1.27 @@ -4,12 +4,12 @@ Summary(fr.UTF8): Outil pour v??rifier e Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk Version: 6.11 -Release: 2%{?dist} +Release: 3%{?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 -Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch +Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking_v2.patch URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc %changelog +* Wed May 6 2009 Christophe Grenier 6.11-3 +- Use upstream patch v2 + * Fri Apr 24 2009 Christophe Grenier 6.11-2 - Add upstream patch that add missing bound checks when parsing EXIF information From grenier at fedoraproject.org Wed May 6 20:41:34 2009 From: grenier at fedoraproject.org (Christophe GRENIER) Date: Wed, 6 May 2009 20:41:34 +0000 (UTC) Subject: rpms/testdisk/F-10 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 testdisk.spec, 1.25, 1.26 Message-ID: <20090506204134.78F6170108@cvs1.fedora.phx.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14032/F-10 Modified Files: .cvsignore sources testdisk.spec Log Message: Use photorec_611_exif_bound_checking_v2.patch to fix the EXIF bug Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-10/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 24 Apr 2009 06:31:32 -0000 1.14 +++ .cvsignore 6 May 2009 20:41:03 -0000 1.15 @@ -1,3 +1,3 @@ testdisk-6.11.tar.bz2 testdisk-doc-6.11.tar.bz2 -photorec_611_exif_bound_checking.patch +photorec_611_exif_bound_checking_v2.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-10/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 24 Apr 2009 06:31:32 -0000 1.15 +++ sources 6 May 2009 20:41:03 -0000 1.16 @@ -1,3 +1,3 @@ 11f8fe95dcd190b69b782efa65b29ba1 testdisk-6.11.tar.bz2 8ed6b23ae64bf1cf9a15371ea7481fa5 testdisk-doc-6.11.tar.bz2 -dba57525125fbb372f470832af2d91c1 photorec_611_exif_bound_checking.patch +525350908048a5c90c932464375b08a3 photorec_611_exif_bound_checking_v2.patch Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-10/testdisk.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- testdisk.spec 24 Apr 2009 06:31:32 -0000 1.25 +++ testdisk.spec 6 May 2009 20:41:04 -0000 1.26 @@ -4,12 +4,12 @@ Summary(fr.UTF8): Outil pour v??rifier e Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk Version: 6.11 -Release: 2%{?dist} +Release: 3%{?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 -Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch +Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking_v2.patch URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc %changelog +* Wed May 6 2009 Christophe Grenier 6.11-3 +- Use upstream patch v2 + * Fri Apr 24 2009 Christophe Grenier 6.11-2 - Add upstream patch that add missing bound checks when parsing EXIF information From grenier at fedoraproject.org Wed May 6 20:41:35 2009 From: grenier at fedoraproject.org (Christophe GRENIER) Date: Wed, 6 May 2009 20:41:35 +0000 (UTC) Subject: rpms/testdisk/F-9 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 testdisk.spec, 1.25, 1.26 Message-ID: <20090506204135.A6D3370108@cvs1.fedora.phx.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14032/F-9 Modified Files: .cvsignore sources testdisk.spec Log Message: Use photorec_611_exif_bound_checking_v2.patch to fix the EXIF bug Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 24 Apr 2009 06:31:33 -0000 1.14 +++ .cvsignore 6 May 2009 20:41:05 -0000 1.15 @@ -1,3 +1,3 @@ testdisk-6.11.tar.bz2 testdisk-doc-6.11.tar.bz2 -photorec_611_exif_bound_checking.patch +photorec_611_exif_bound_checking_v2.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 24 Apr 2009 06:31:33 -0000 1.15 +++ sources 6 May 2009 20:41:05 -0000 1.16 @@ -1,3 +1,3 @@ 11f8fe95dcd190b69b782efa65b29ba1 testdisk-6.11.tar.bz2 8ed6b23ae64bf1cf9a15371ea7481fa5 testdisk-doc-6.11.tar.bz2 -dba57525125fbb372f470832af2d91c1 photorec_611_exif_bound_checking.patch +525350908048a5c90c932464375b08a3 photorec_611_exif_bound_checking_v2.patch Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-9/testdisk.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- testdisk.spec 24 Apr 2009 06:31:33 -0000 1.25 +++ testdisk.spec 6 May 2009 20:41:05 -0000 1.26 @@ -4,12 +4,12 @@ Summary(fr.UTF8): Outil pour v??rifier e Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk Version: 6.11 -Release: 2%{?dist} +Release: 3%{?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 -Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch +Patch0: http://www.cgsecurity.org/photorec_611_exif_bound_checking_v2.patch URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc %changelog +* Wed May 6 2009 Christophe Grenier 6.11-3 +- Use upstream patch v2 + * Fri Apr 24 2009 Christophe Grenier 6.11-2 - Add upstream patch that add missing bound checks when parsing EXIF information From notting at fedoraproject.org Wed May 6 20:48:48 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Wed, 6 May 2009 20:48:48 +0000 (UTC) Subject: comps comps-f11.xml.in,1.216,1.217 Message-ID: <20090506204848.8670770108@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16363 Modified Files: comps-f11.xml.in Log Message: Add java plugin to graphical internet, to go along with firefox. (#499443) Index: comps-f11.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f11.xml.in,v retrieving revision 1.216 retrieving revision 1.217 diff -u -p -r1.216 -r1.217 --- comps-f11.xml.in 6 May 2009 17:49:34 -0000 1.216 +++ comps-f11.xml.in 6 May 2009 20:48:17 -0000 1.217 @@ -2462,6 +2462,7 @@ evolution-help evolution-perl firefox + java-1.6.0-openjdk-plugin nspluginwrapper pidgin transmission From notting at fedoraproject.org Wed May 6 20:52:30 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Wed, 6 May 2009 20:52:30 +0000 (UTC) Subject: comps comps-f11.xml.in,1.217,1.218 Message-ID: <20090506205230.9DC9E70108@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16978 Modified Files: comps-f11.xml.in Log Message: Add rails to web development. Index: comps-f11.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f11.xml.in,v retrieving revision 1.217 retrieving revision 1.218 diff -u -p -r1.217 -r1.218 --- comps-f11.xml.in 6 May 2009 20:48:17 -0000 1.217 +++ comps-f11.xml.in 6 May 2009 20:52:00 -0000 1.218 @@ -5546,6 +5546,7 @@ php-oauth php-xmpphp python-cherrypy + rubygem-rails TurboGears velocity From hadess at fedoraproject.org Wed May 6 20:53:35 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 6 May 2009 20:53:35 +0000 (UTC) Subject: rpms/totem/devel totem.spec,1.237,1.238 Message-ID: <20090506205335.698B070108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17127 Modified Files: totem.spec Log Message: Re-add missing BRs Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.237 retrieving revision 1.238 diff -u -p -r1.237 -r1.238 --- totem.spec 6 May 2009 18:12:13 -0000 1.237 +++ totem.spec 6 May 2009 20:53:04 -0000 1.238 @@ -1,5 +1,5 @@ -%define gstreamer_version 0.10.1 -%define gstreamer_plugins_base_version 0.10.17.2-4 +%define gstreamer_version 0.10.22 +%define gstreamer_plugins_base_version 0.10.22.4 %define gstreamer_plugins_good_version 0.10.0 %define gstreamer_plugins_flumpegdemux_version 0.10.15 @@ -28,6 +28,17 @@ Requires: pyxdg # For all the Python plugins Requires: pygtk2 +Requires: gstreamer >= %gstreamer_version +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 +BuildRequires: liboil >= 0.3.13-5 + BuildRequires: gcc-c++, pkgconfig, gettext BuildRequires: perl(XML::Parser) intltool BuildRequires: iso-codes-devel From pkgdb at fedoraproject.org Wed May 6 20:55:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:55:57 +0000 Subject: [pkgdb] xmonad was added for ynemoy Message-ID: <20090506205557.B7CC210F893@bastion2.fedora.phx.redhat.com> kevin has added Package xmonad with summary a tiling window manager written in haskell kevin has approved Package xmonad kevin has added a Fedora devel branch for xmonad with an owner of ynemoy kevin has approved xmonad in Fedora devel kevin has approved Package xmonad kevin has set commit to Approved for provenpackager on xmonad (Fedora devel) kevin has set build to Approved for provenpackager on xmonad (Fedora devel) kevin has set checkout to Approved for provenpackager on xmonad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xmonad From pkgdb at fedoraproject.org Wed May 6 20:55:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:55:58 +0000 Subject: [pkgdb] xmonad (Fedora, devel) updated by kevin Message-ID: <20090506205558.DCC6F10F8A0@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on xmonad (Fedora devel) for haskell-sig kevin approved watchcommits on xmonad (Fedora devel) for haskell-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xmonad From kevin at fedoraproject.org Wed May 6 20:56:11 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:56:11 +0000 (UTC) Subject: rpms/xmonad - New directory Message-ID: <20090506205611.6036B70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xmonad In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17690/rpms/xmonad Log Message: Directory /cvs/pkgs/rpms/xmonad added to the repository From kevin at fedoraproject.org Wed May 6 20:56:11 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:56:11 +0000 (UTC) Subject: rpms/xmonad/devel - New directory Message-ID: <20090506205611.CDFD970138@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xmonad/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17690/rpms/xmonad/devel Log Message: Directory /cvs/pkgs/rpms/xmonad/devel added to the repository From kevin at fedoraproject.org Wed May 6 20:56:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:56:25 +0000 (UTC) Subject: rpms/xmonad Makefile,NONE,1.1 Message-ID: <20090506205625.B729D70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xmonad In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17690/rpms/xmonad Added Files: Makefile Log Message: Setup of module xmonad --- NEW FILE Makefile --- # Top level Makefile for module xmonad 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 pkgdb at fedoraproject.org Wed May 6 20:55:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:55:58 +0000 Subject: [pkgdb] xmonad (Fedora, 11) updated by kevin Message-ID: <20090506205558.E43CE10F8A3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for xmonad kevin has set commit to Approved for provenpackager on xmonad (Fedora 11) kevin has set build to Approved for provenpackager on xmonad (Fedora 11) kevin has set checkout to Approved for provenpackager on xmonad (Fedora 11) kevin approved watchbugzilla on xmonad (Fedora 11) for haskell-sig kevin approved watchcommits on xmonad (Fedora 11) for haskell-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xmonad From kevin at fedoraproject.org Wed May 6 20:56:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:56:26 +0000 (UTC) Subject: rpms/xmonad/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506205626.31A2170108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xmonad/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17690/rpms/xmonad/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xmonad --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xmonad # $Id: Makefile,v 1.1 2009/05/06 20:56:25 kevin Exp $ NAME := xmonad 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 pkgdb at fedoraproject.org Wed May 6 20:56:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:56:41 +0000 Subject: [pkgdb] globus-gsi-credential was added for ellert Message-ID: <20090506205641.1E09810F8A0@bastion2.fedora.phx.redhat.com> kevin has added Package globus-gsi-credential with summary Globus Toolkit - Globus GSI Credential Library kevin has approved Package globus-gsi-credential kevin has added a Fedora devel branch for globus-gsi-credential with an owner of ellert kevin has approved globus-gsi-credential in Fedora devel kevin has approved Package globus-gsi-credential kevin has set commit to Approved for provenpackager on globus-gsi-credential (Fedora devel) kevin has set build to Approved for provenpackager on globus-gsi-credential (Fedora devel) kevin has set checkout to Approved for provenpackager on globus-gsi-credential (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-credential From pkgdb at fedoraproject.org Wed May 6 20:56:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:56:43 +0000 Subject: [pkgdb] globus-gsi-credential (Fedora, 9) updated by kevin Message-ID: <20090506205643.1E09110F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for globus-gsi-credential kevin has set commit to Approved for provenpackager on globus-gsi-credential (Fedora 9) kevin has set build to Approved for provenpackager on globus-gsi-credential (Fedora 9) kevin has set checkout to Approved for provenpackager on globus-gsi-credential (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-credential From pkgdb at fedoraproject.org Wed May 6 20:56:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:56:43 +0000 Subject: [pkgdb] globus-gsi-credential (Fedora, 10) updated by kevin Message-ID: <20090506205643.2438710F8A7@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for globus-gsi-credential kevin has set commit to Approved for provenpackager on globus-gsi-credential (Fedora 10) kevin has set build to Approved for provenpackager on globus-gsi-credential (Fedora 10) kevin has set checkout to Approved for provenpackager on globus-gsi-credential (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-credential From pkgdb at fedoraproject.org Wed May 6 20:56:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:56:43 +0000 Subject: [pkgdb] globus-gsi-credential (Fedora EPEL, 4) updated by kevin Message-ID: <20090506205643.371B810F8A9@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for globus-gsi-credential kevin has set commit to Approved for provenpackager on globus-gsi-credential (Fedora EPEL 4) kevin has set build to Approved for provenpackager on globus-gsi-credential (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on globus-gsi-credential (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-credential From pkgdb at fedoraproject.org Wed May 6 20:56:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:56:43 +0000 Subject: [pkgdb] globus-gsi-credential (Fedora, 11) updated by kevin Message-ID: <20090506205643.3A54B10F8AC@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for globus-gsi-credential kevin has set commit to Approved for provenpackager on globus-gsi-credential (Fedora 11) kevin has set build to Approved for provenpackager on globus-gsi-credential (Fedora 11) kevin has set checkout to Approved for provenpackager on globus-gsi-credential (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-credential From pkgdb at fedoraproject.org Wed May 6 20:56:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:56:43 +0000 Subject: [pkgdb] globus-gsi-credential (Fedora EPEL, 5) updated by kevin Message-ID: <20090506205643.3FF6510F8AF@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for globus-gsi-credential kevin has set commit to Approved for provenpackager on globus-gsi-credential (Fedora EPEL 5) kevin has set build to Approved for provenpackager on globus-gsi-credential (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on globus-gsi-credential (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-credential From kevin at fedoraproject.org Wed May 6 20:56:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:56:52 +0000 (UTC) Subject: rpms/globus-gsi-credential - New directory Message-ID: <20090506205652.27C7770108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-gsi-credential In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK18030/rpms/globus-gsi-credential Log Message: Directory /cvs/pkgs/rpms/globus-gsi-credential added to the repository From kevin at fedoraproject.org Wed May 6 20:56:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:56:52 +0000 (UTC) Subject: rpms/globus-gsi-credential/devel - New directory Message-ID: <20090506205652.6BFAF70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-gsi-credential/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK18030/rpms/globus-gsi-credential/devel Log Message: Directory /cvs/pkgs/rpms/globus-gsi-credential/devel added to the repository From kevin at fedoraproject.org Wed May 6 20:57:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:57:03 +0000 (UTC) Subject: rpms/globus-gsi-credential Makefile,NONE,1.1 Message-ID: <20090506205703.A330470108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-gsi-credential In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK18030/rpms/globus-gsi-credential Added Files: Makefile Log Message: Setup of module globus-gsi-credential --- NEW FILE Makefile --- # Top level Makefile for module globus-gsi-credential 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 kevin at fedoraproject.org Wed May 6 20:57:04 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:57:04 +0000 (UTC) Subject: rpms/globus-gsi-credential/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506205704.0C31D70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-gsi-credential/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK18030/rpms/globus-gsi-credential/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module globus-gsi-credential --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: globus-gsi-credential # $Id: Makefile,v 1.1 2009/05/06 20:57:03 kevin Exp $ NAME := globus-gsi-credential 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 pkgdb at fedoraproject.org Wed May 6 20:58:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:58:17 +0000 Subject: [pkgdb] l2fprod-common was added for red Message-ID: <20090506205817.A3CBF10F8A0@bastion2.fedora.phx.redhat.com> kevin has added Package l2fprod-common with summary In JavaSE missing Swing components, inspired from modern user interfaces kevin has approved Package l2fprod-common kevin has added a Fedora devel branch for l2fprod-common with an owner of red kevin has approved l2fprod-common in Fedora devel kevin has approved Package l2fprod-common kevin has set commit to Approved for provenpackager on l2fprod-common (Fedora devel) kevin has set build to Approved for provenpackager on l2fprod-common (Fedora devel) kevin has set checkout to Approved for provenpackager on l2fprod-common (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/l2fprod-common From pkgdb at fedoraproject.org Wed May 6 20:58:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:58:18 +0000 Subject: [pkgdb] l2fprod-common (Fedora, 9) updated by kevin Message-ID: <20090506205819.14A3610F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for l2fprod-common kevin has set commit to Approved for provenpackager on l2fprod-common (Fedora 9) kevin has set build to Approved for provenpackager on l2fprod-common (Fedora 9) kevin has set checkout to Approved for provenpackager on l2fprod-common (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/l2fprod-common From pkgdb at fedoraproject.org Wed May 6 20:58:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:58:18 +0000 Subject: [pkgdb] l2fprod-common (Fedora, 10) updated by kevin Message-ID: <20090506205819.1CF8710F8A5@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for l2fprod-common kevin has set commit to Approved for provenpackager on l2fprod-common (Fedora 10) kevin has set build to Approved for provenpackager on l2fprod-common (Fedora 10) kevin has set checkout to Approved for provenpackager on l2fprod-common (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/l2fprod-common From kevin at fedoraproject.org Wed May 6 20:58:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:58:34 +0000 (UTC) Subject: rpms/l2fprod-common - New directory Message-ID: <20090506205834.3C5E370108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/l2fprod-common In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18523/rpms/l2fprod-common Log Message: Directory /cvs/pkgs/rpms/l2fprod-common added to the repository From kevin at fedoraproject.org Wed May 6 20:58:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:58:34 +0000 (UTC) Subject: rpms/l2fprod-common/devel - New directory Message-ID: <20090506205834.A0CC270108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/l2fprod-common/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18523/rpms/l2fprod-common/devel Log Message: Directory /cvs/pkgs/rpms/l2fprod-common/devel added to the repository From pkgdb at fedoraproject.org Wed May 6 20:58:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:58:19 +0000 Subject: [pkgdb] l2fprod-common (Fedora, 11) updated by kevin Message-ID: <20090506205819.3075010F8A8@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for l2fprod-common kevin has set commit to Approved for provenpackager on l2fprod-common (Fedora 11) kevin has set build to Approved for provenpackager on l2fprod-common (Fedora 11) kevin has set checkout to Approved for provenpackager on l2fprod-common (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/l2fprod-common From kevin at fedoraproject.org Wed May 6 20:58:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:58:46 +0000 (UTC) Subject: rpms/l2fprod-common Makefile,NONE,1.1 Message-ID: <20090506205846.4DAFF70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/l2fprod-common In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18523/rpms/l2fprod-common Added Files: Makefile Log Message: Setup of module l2fprod-common --- NEW FILE Makefile --- # Top level Makefile for module l2fprod-common 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 kevin at fedoraproject.org Wed May 6 20:58:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:58:46 +0000 (UTC) Subject: rpms/l2fprod-common/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506205846.998B870108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/l2fprod-common/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18523/rpms/l2fprod-common/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module l2fprod-common --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: l2fprod-common # $Id: Makefile,v 1.1 2009/05/06 20:58:46 kevin Exp $ NAME := l2fprod-common 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 pkgdb at fedoraproject.org Wed May 6 20:59:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:59:19 +0000 Subject: [pkgdb] R-Biostrings was added for pingou Message-ID: <20090506205919.D204210F89C@bastion2.fedora.phx.redhat.com> kevin has added Package R-Biostrings with summary String objects representing biological sequences kevin has approved Package R-Biostrings kevin has added a Fedora devel branch for R-Biostrings with an owner of pingou kevin has approved R-Biostrings in Fedora devel kevin has approved Package R-Biostrings kevin has set commit to Approved for provenpackager on R-Biostrings (Fedora devel) kevin has set build to Approved for provenpackager on R-Biostrings (Fedora devel) kevin has set checkout to Approved for provenpackager on R-Biostrings (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-Biostrings From pkgdb at fedoraproject.org Wed May 6 20:59:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:59:21 +0000 Subject: [pkgdb] R-Biostrings (Fedora, 10) updated by kevin Message-ID: <20090506205921.4171B10F8A1@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for R-Biostrings kevin has set commit to Approved for provenpackager on R-Biostrings (Fedora 10) kevin has set build to Approved for provenpackager on R-Biostrings (Fedora 10) kevin has set checkout to Approved for provenpackager on R-Biostrings (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-Biostrings From pkgdb at fedoraproject.org Wed May 6 20:59:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 20:59:21 +0000 Subject: [pkgdb] R-Biostrings (Fedora, 11) updated by kevin Message-ID: <20090506205921.53AB410F8A4@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for R-Biostrings kevin has set commit to Approved for provenpackager on R-Biostrings (Fedora 11) kevin has set build to Approved for provenpackager on R-Biostrings (Fedora 11) kevin has set checkout to Approved for provenpackager on R-Biostrings (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-Biostrings From kevin at fedoraproject.org Wed May 6 20:59:32 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:59:32 +0000 (UTC) Subject: rpms/R-Biostrings - New directory Message-ID: <20090506205932.3757B70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/R-Biostrings In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL18883/rpms/R-Biostrings Log Message: Directory /cvs/pkgs/rpms/R-Biostrings added to the repository From kevin at fedoraproject.org Wed May 6 20:59:32 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:59:32 +0000 (UTC) Subject: rpms/R-Biostrings/devel - New directory Message-ID: <20090506205932.9FA1170108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/R-Biostrings/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL18883/rpms/R-Biostrings/devel Log Message: Directory /cvs/pkgs/rpms/R-Biostrings/devel added to the repository From kevin at fedoraproject.org Wed May 6 20:59:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:59:47 +0000 (UTC) Subject: rpms/R-Biostrings Makefile,NONE,1.1 Message-ID: <20090506205947.A221B70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/R-Biostrings In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL18883/rpms/R-Biostrings Added Files: Makefile Log Message: Setup of module R-Biostrings --- NEW FILE Makefile --- # Top level Makefile for module R-Biostrings 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 kevin at fedoraproject.org Wed May 6 20:59:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 20:59:48 +0000 (UTC) Subject: rpms/R-Biostrings/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506205948.023EA70131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/R-Biostrings/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL18883/rpms/R-Biostrings/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module R-Biostrings --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: R-Biostrings # $Id: Makefile,v 1.1 2009/05/06 20:59:47 kevin Exp $ NAME := R-Biostrings 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 pkgdb at fedoraproject.org Wed May 6 21:00:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:00:15 +0000 Subject: [pkgdb] ibus-table-yong was added for cchance Message-ID: <20090506210015.AFDA210F8A1@bastion2.fedora.phx.redhat.com> kevin has added Package ibus-table-yong with summary Yong table data for IBus Table kevin has approved Package ibus-table-yong kevin has added a Fedora devel branch for ibus-table-yong with an owner of cchance kevin has approved ibus-table-yong in Fedora devel kevin has approved Package ibus-table-yong kevin has set commit to Approved for provenpackager on ibus-table-yong (Fedora devel) kevin has set build to Approved for provenpackager on ibus-table-yong (Fedora devel) kevin has set checkout to Approved for provenpackager on ibus-table-yong (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-yong From kevin at fedoraproject.org Wed May 6 21:00:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:00:30 +0000 (UTC) Subject: rpms/ibus-table-yong - New directory Message-ID: <20090506210030.49D3F70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ibus-table-yong In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19201/rpms/ibus-table-yong Log Message: Directory /cvs/pkgs/rpms/ibus-table-yong added to the repository From kevin at fedoraproject.org Wed May 6 21:00:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:00:30 +0000 (UTC) Subject: rpms/ibus-table-yong/devel - New directory Message-ID: <20090506210030.AC8AD70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ibus-table-yong/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19201/rpms/ibus-table-yong/devel Log Message: Directory /cvs/pkgs/rpms/ibus-table-yong/devel added to the repository From pkgdb at fedoraproject.org Wed May 6 21:00:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:00:17 +0000 Subject: [pkgdb] ibus-table-yong (Fedora, devel) updated by kevin Message-ID: <20090506210017.398F710F8A7@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on ibus-table-yong (Fedora devel) for i18n-team kevin approved watchcommits on ibus-table-yong (Fedora devel) for i18n-team To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-yong From kevin at fedoraproject.org Wed May 6 21:00:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:00:43 +0000 (UTC) Subject: rpms/ibus-table-yong Makefile,NONE,1.1 Message-ID: <20090506210043.383C270108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ibus-table-yong In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19201/rpms/ibus-table-yong Added Files: Makefile Log Message: Setup of module ibus-table-yong --- NEW FILE Makefile --- # Top level Makefile for module ibus-table-yong 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 kevin at fedoraproject.org Wed May 6 21:00:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:00:43 +0000 (UTC) Subject: rpms/ibus-table-yong/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506210043.9795470108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ibus-table-yong/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19201/rpms/ibus-table-yong/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ibus-table-yong --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ibus-table-yong # $Id: Makefile,v 1.1 2009/05/06 21:00:43 kevin Exp $ NAME := ibus-table-yong 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 chkr at fedoraproject.org Wed May 6 21:00:44 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Wed, 6 May 2009 21:00:44 +0000 (UTC) Subject: rpms/anki/devel anki-0.9.9.7.8-noupdate.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 anki.spec, 1.5, 1.6 sources, 1.4, 1.5 anki-0.9.9.7.1-noupdate.patch, 1.1, NONE generate-anki-tarball.sh, 1.1, NONE Message-ID: <20090506210044.2353770108@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/anki/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18829 Modified Files: .cvsignore anki.spec sources Added Files: anki-0.9.9.7.8-noupdate.patch Removed Files: anki-0.9.9.7.1-noupdate.patch generate-anki-tarball.sh Log Message: - Update to new upstream version 0.9.9.7.8 - Updated noupdate patch - Removed unused script generate-anki-tarball.sh anki-0.9.9.7.8-noupdate.patch: --- NEW FILE anki-0.9.9.7.8-noupdate.patch --- diff -uNr anki-0.9.9.7.8.old/ankiqt/config.py anki-0.9.9.7.8/ankiqt/config.py --- anki-0.9.9.7.8.old/ankiqt/config.py 2009-05-06 08:35:07.000000000 +0200 +++ anki-0.9.9.7.8/ankiqt/config.py 2009-05-06 21:27:39.000000000 +0200 @@ -45,7 +45,7 @@ 'syncOnLoad': True, 'syncOnClose': True, 'syncInMsgBox': False, - 'checkForUpdates': True, + 'checkForUpdates': False, 'interfaceLang': "", 'syncUsername': "", 'syncPassword': "", Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anki/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 11 Apr 2009 10:11:43 -0000 1.4 +++ .cvsignore 6 May 2009 21:00:13 -0000 1.5 @@ -1 +1 @@ -anki-0.9.9.7.4.tgz +anki-0.9.9.7.8.tgz Index: anki.spec =================================================================== RCS file: /cvs/pkgs/rpms/anki/devel/anki.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- anki.spec 11 Apr 2009 10:11:43 -0000 1.5 +++ anki.spec 6 May 2009 21:00:13 -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: anki -Version: 0.9.9.7.4 +Version: 0.9.9.7.8 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning @@ -13,7 +13,7 @@ URL: http://www.ichi2.net/anki Source0: http://ichi2.net/anki/download/files/%{name}-%{version}.tgz # Config change: don't check for new updates. -Patch0: anki-0.9.9.7.1-noupdate.patch +Patch0: anki-0.9.9.7.8-noupdate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-setuptools, python-sqlalchemy BuildRequires: PyQt4-devel @@ -31,7 +31,7 @@ as possible. Anki is based on a theory c %prep %setup -q -%patch0 -p1 -b .noupdate +%patch0 -p1 -b .noupdate %build pushd libanki @@ -93,6 +93,7 @@ rm -rf %{buildroot} %lang(sv) %{python_sitelib}/*/locale/sv_*/ %lang(pt) %{python_sitelib}/*/locale/pt_*/ %lang(ee) %{python_sitelib}/*/locale/ee_*/ +%lang(ee) %{python_sitelib}/*/locale/mn_*/ %{python_sitelib}/*egg-info %{_bindir}/anki @@ -100,6 +101,9 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/%{name}.png %changelog +* Wed May 06 2009 Christian Krause - 0.9.9.7.8-1 +- Update to new upstream version 0.9.9.7.8 + * Sat Apr 11 2009 Christian Krause - 0.9.9.7.4-1 - Update to new upstream version 0.9.9.7.4 (BZ 494598) - Require python-matplotlib instead of numpy (BZ 495232) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anki/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 11 Apr 2009 10:11:43 -0000 1.4 +++ sources 6 May 2009 21:00:13 -0000 1.5 @@ -1 +1 @@ -fb2de3abcdc7ced9215215ec2c7511d0 anki-0.9.9.7.4.tgz +3d57637cb3f3080976157f19c5c3f121 anki-0.9.9.7.8.tgz --- anki-0.9.9.7.1-noupdate.patch DELETED --- --- generate-anki-tarball.sh DELETED --- From pkgdb at fedoraproject.org Wed May 6 21:02:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:02:34 +0000 Subject: [pkgdb] perl-Acme-PlayCode (Fedora, devel) updated by kevin Message-ID: <20090506210234.D358010F8A1@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Acme-PlayCode (Fedora devel) for perl-sig kevin approved watchcommits on perl-Acme-PlayCode (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Acme-PlayCode From pkgdb at fedoraproject.org Wed May 6 21:02:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:02:33 +0000 Subject: [pkgdb] perl-Acme-PlayCode was added for mmaslano Message-ID: <20090506210233.9A6B310F89C@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Acme-PlayCode with summary Perl module for enhancement of code kevin has approved Package perl-Acme-PlayCode kevin has added a Fedora devel branch for perl-Acme-PlayCode with an owner of mmaslano kevin has approved perl-Acme-PlayCode in Fedora devel kevin has approved Package perl-Acme-PlayCode kevin has set commit to Approved for provenpackager on perl-Acme-PlayCode (Fedora devel) kevin has set build to Approved for provenpackager on perl-Acme-PlayCode (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Acme-PlayCode (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Acme-PlayCode From kevin at fedoraproject.org Wed May 6 21:02:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:02:46 +0000 (UTC) Subject: rpms/perl-Acme-PlayCode - New directory Message-ID: <20090506210246.2CE3F70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Acme-PlayCode In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR19605/rpms/perl-Acme-PlayCode Log Message: Directory /cvs/pkgs/rpms/perl-Acme-PlayCode added to the repository From kevin at fedoraproject.org Wed May 6 21:02:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:02:46 +0000 (UTC) Subject: rpms/perl-Acme-PlayCode/devel - New directory Message-ID: <20090506210246.810F970108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Acme-PlayCode/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR19605/rpms/perl-Acme-PlayCode/devel Log Message: Directory /cvs/pkgs/rpms/perl-Acme-PlayCode/devel added to the repository From pkgdb at fedoraproject.org Wed May 6 21:02:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:02:34 +0000 Subject: [pkgdb] perl-Acme-PlayCode (Fedora, 11) updated by kevin Message-ID: <20090506210234.DC0EA10F8A4@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Acme-PlayCode kevin has set commit to Approved for provenpackager on perl-Acme-PlayCode (Fedora 11) kevin has set build to Approved for provenpackager on perl-Acme-PlayCode (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Acme-PlayCode (Fedora 11) kevin approved watchbugzilla on perl-Acme-PlayCode (Fedora 11) for perl-sig kevin approved watchcommits on perl-Acme-PlayCode (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Acme-PlayCode From kevin at fedoraproject.org Wed May 6 21:03:01 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:03:01 +0000 (UTC) Subject: rpms/perl-Acme-PlayCode Makefile,NONE,1.1 Message-ID: <20090506210301.8E78070108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Acme-PlayCode In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR19605/rpms/perl-Acme-PlayCode Added Files: Makefile Log Message: Setup of module perl-Acme-PlayCode --- NEW FILE Makefile --- # Top level Makefile for module perl-Acme-PlayCode 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 kevin at fedoraproject.org Wed May 6 21:03:01 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:03:01 +0000 (UTC) Subject: rpms/perl-Acme-PlayCode/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506210301.EB5F270108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Acme-PlayCode/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR19605/rpms/perl-Acme-PlayCode/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Acme-PlayCode --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Acme-PlayCode # $Id: Makefile,v 1.1 2009/05/06 21:03:01 kevin Exp $ NAME := perl-Acme-PlayCode 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 pkgdb at fedoraproject.org Wed May 6 21:03:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:03:31 +0000 Subject: [pkgdb] mb2md was added for jussilehtola Message-ID: <20090506210331.D59FE10F893@bastion2.fedora.phx.redhat.com> kevin has added Package mb2md with summary Mailbox to maildir converter kevin has approved Package mb2md kevin has added a Fedora devel branch for mb2md with an owner of jussilehtola kevin has approved mb2md in Fedora devel kevin has approved Package mb2md kevin has set commit to Approved for provenpackager on mb2md (Fedora devel) kevin has set build to Approved for provenpackager on mb2md (Fedora devel) kevin has set checkout to Approved for provenpackager on mb2md (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mb2md From pkgdb at fedoraproject.org Wed May 6 21:03:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:03:33 +0000 Subject: [pkgdb] mb2md (Fedora, 10) updated by kevin Message-ID: <20090506210333.83F9810F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for mb2md kevin has set commit to Approved for provenpackager on mb2md (Fedora 10) kevin has set build to Approved for provenpackager on mb2md (Fedora 10) kevin has set checkout to Approved for provenpackager on mb2md (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mb2md From pkgdb at fedoraproject.org Wed May 6 21:03:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:03:33 +0000 Subject: [pkgdb] mb2md (Fedora EPEL, 4) updated by kevin Message-ID: <20090506210333.8B6AF10F8A4@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for mb2md kevin has set commit to Approved for provenpackager on mb2md (Fedora EPEL 4) kevin has set build to Approved for provenpackager on mb2md (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on mb2md (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mb2md From pkgdb at fedoraproject.org Wed May 6 21:03:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:03:33 +0000 Subject: [pkgdb] mb2md (Fedora, 11) updated by kevin Message-ID: <20090506210333.9652810F8A8@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for mb2md kevin has set commit to Approved for provenpackager on mb2md (Fedora 11) kevin has set build to Approved for provenpackager on mb2md (Fedora 11) kevin has set checkout to Approved for provenpackager on mb2md (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mb2md From kevin at fedoraproject.org Wed May 6 21:03:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:03:45 +0000 (UTC) Subject: rpms/mb2md - New directory Message-ID: <20090506210345.336F670108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mb2md In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19886/rpms/mb2md Log Message: Directory /cvs/pkgs/rpms/mb2md added to the repository From kevin at fedoraproject.org Wed May 6 21:03:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:03:45 +0000 (UTC) Subject: rpms/mb2md/devel - New directory Message-ID: <20090506210345.8749F70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mb2md/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19886/rpms/mb2md/devel Log Message: Directory /cvs/pkgs/rpms/mb2md/devel added to the repository From pkgdb at fedoraproject.org Wed May 6 21:03:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:03:33 +0000 Subject: [pkgdb] mb2md (Fedora EPEL, 5) updated by kevin Message-ID: <20090506210333.9CB0110F8AA@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for mb2md kevin has set commit to Approved for provenpackager on mb2md (Fedora EPEL 5) kevin has set build to Approved for provenpackager on mb2md (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on mb2md (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mb2md From kevin at fedoraproject.org Wed May 6 21:04:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:04:03 +0000 (UTC) Subject: rpms/mb2md Makefile,NONE,1.1 Message-ID: <20090506210403.BD59E70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mb2md In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19886/rpms/mb2md Added Files: Makefile Log Message: Setup of module mb2md --- NEW FILE Makefile --- # Top level Makefile for module mb2md 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 kevin at fedoraproject.org Wed May 6 21:04:04 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:04:04 +0000 (UTC) Subject: rpms/mb2md/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506210404.42ABE70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mb2md/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19886/rpms/mb2md/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mb2md --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mb2md # $Id: Makefile,v 1.1 2009/05/06 21:04:03 kevin Exp $ NAME := mb2md 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 scop at fedoraproject.org Wed May 6 21:04:14 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Wed, 6 May 2009 21:04:14 +0000 (UTC) Subject: rpms/transfig/devel transfig-3.2.5-optflags.patch, NONE, 1.1 transfig.spec, 1.32, 1.33 Message-ID: <20090506210414.1EBD470108@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/transfig/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19895 Modified Files: transfig.spec Added Files: transfig-3.2.5-optflags.patch Log Message: * Tue May 5 2009 Ville Skytt?? - 1:3.2.5-7 - Get rid of csh dependency, add missing one on bc (#435993). - Build with $RPM_OPT_FLAGS (#329831). - Convert specfile to UTF-8. - Add URL, fix source URL. - Escape macros in changelog. - Improve summary. transfig-3.2.5-optflags.patch: --- NEW FILE transfig-3.2.5-optflags.patch --- diff -up transfig.3.2.5/Imakefile~ transfig.3.2.5/Imakefile --- transfig.3.2.5/Imakefile~ 2003-03-25 22:48:02.000000000 +0200 +++ transfig.3.2.5/Imakefile 2009-05-04 22:12:20.000000000 +0300 @@ -22,7 +22,7 @@ XCOMM to make transfig and fig2dev: XCOMM type "xmkmf", "make Makefiles", "make" then "make install" #define IHaveSubdirs -#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' +#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS) $(RPM_OPT_FLAGS)' DEPLIBS = SUBDIRS = fig2dev transfig Index: transfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/transfig/devel/transfig.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- transfig.spec 25 Feb 2009 21:46:02 -0000 1.32 +++ transfig.spec 6 May 2009 21:03:43 -0000 1.33 @@ -1,16 +1,19 @@ -Summary: A utility for converting FIG files (made by xfig) to other formats. +Summary: Utility for converting FIG files (made by xfig) to other formats Name: transfig Version: 3.2.5 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: MIT +URL: http://www.xfig.org/ Group: Applications/Multimedia -Source: ftp://www-epb.lbl.gov/xfig/%{name}.%{version}.tar.gz +Source0: http://downloads.sourceforge.net/mcj/%{name}.%{version}.tar.gz +Patch0: transfig-3.2.5-optflags.patch Patch5: transfig-3.2.5-modularX.patch Patch6: transfig-3.2.5-bitmap.patch Requires: ghostscript +Requires: bc BuildRequires: libpng-devel BuildRequires: libjpeg-devel @@ -32,6 +35,7 @@ figures into certain graphics languages. %prep %setup -q -n %{name}.%{version} +%patch0 -p1 -b .optflags %patch5 -p1 -b .modularX %patch6 -p1 -b .bitmap # fix source permissions @@ -47,11 +51,9 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install install.man -# Dunno why these are not installed -for i in fig2ps2tex fig2ps2tex.sh pic2tpic -do - install -c -m 755 fig2dev/$i.script %{buildroot}%{_bindir}/$i -done +# fig2ps2tex{,.sh} are equivalent, use the sh one +mv %{buildroot}%{_bindir}/fig2ps2tex.sh %{buildroot}%{_bindir}/fig2ps2tex +ln -s fig2ps2tex %{buildroot}%{_bindir}/fig2ps2tex.sh %clean rm -rf %{buildroot} @@ -69,6 +71,14 @@ rm -rf %{buildroot} %{_datadir}/fig2dev %changelog +* Tue May 5 2009 Ville Skytt?? - 1:3.2.5-7 +- Get rid of csh dependency, add missing one on bc (#435993). +- Build with $RPM_OPT_FLAGS (#329831). +- Convert specfile to UTF-8. +- Add URL, fix source URL. +- Escape macros in changelog. +- Improve summary. + * Wed Feb 25 2009 Fedora Release Engineering - 1:3.2.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -193,7 +203,7 @@ rm -rf %{buildroot} * Wed Jul 12 2000 Prospector - automatic rebuild -* Tue Jun 13 2000 Trond Eivind Glomsr?d +* Tue Jun 13 2000 Trond Eivind Glomsr??d - make it build as nobody. Imake sucks. - include LATEX.AND.XFIG - use %%{_tmppath} @@ -202,7 +212,7 @@ rm -rf %{buildroot} - add enable_japanese option, disable it for now. * Sun Apr 16 2000 Bryan C. Andregg -- new version to support -b and -g which xfig uses +- new version to support -b and -g which xfig uses * Mon Feb 7 2000 Bill Nottingham - handle compressed manpages @@ -217,7 +227,7 @@ rm -rf %{buildroot} - update to 3.2.1. * Sat Jun 27 1998 Jeff Johnson -- add %clean. +- add %%clean. * Mon Apr 27 1998 Prospector System - translations modified for de, fr, tr From pkgdb at fedoraproject.org Wed May 6 21:04:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:04:17 +0000 Subject: [pkgdb] perl-JSON-RPC-Common (Fedora, 9) updated by kevin Message-ID: <20090506210417.D187E10F89F@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-JSON-RPC-Common kevin has set commit to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 9) kevin has set build to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-JSON-RPC-Common (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-RPC-Common From pkgdb at fedoraproject.org Wed May 6 21:05:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:05:13 +0000 Subject: [pkgdb] grfcodec was added for iarnell Message-ID: <20090506210513.A933310F893@bastion2.fedora.phx.redhat.com> kevin has added Package grfcodec with summary A suite of programs to modify Transport Tycoon Deluxe's GRF files kevin has approved Package grfcodec kevin has added a Fedora devel branch for grfcodec with an owner of iarnell kevin has approved grfcodec in Fedora devel kevin has approved Package grfcodec kevin has set commit to Approved for provenpackager on grfcodec (Fedora devel) kevin has set build to Approved for provenpackager on grfcodec (Fedora devel) kevin has set checkout to Approved for provenpackager on grfcodec (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec From pkgdb at fedoraproject.org Wed May 6 21:05:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:05:15 +0000 Subject: [pkgdb] grfcodec (Fedora, 10) updated by kevin Message-ID: <20090506210515.5C3E710F8A0@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for grfcodec kevin has set commit to Approved for provenpackager on grfcodec (Fedora 10) kevin has set build to Approved for provenpackager on grfcodec (Fedora 10) kevin has set checkout to Approved for provenpackager on grfcodec (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec From kevin at fedoraproject.org Wed May 6 21:05:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:05:29 +0000 (UTC) Subject: rpms/grfcodec - New directory Message-ID: <20090506210529.3983370108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/grfcodec In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20405/rpms/grfcodec Log Message: Directory /cvs/pkgs/rpms/grfcodec added to the repository From kevin at fedoraproject.org Wed May 6 21:05:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:05:29 +0000 (UTC) Subject: rpms/grfcodec/devel - New directory Message-ID: <20090506210529.83B8170108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/grfcodec/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20405/rpms/grfcodec/devel Log Message: Directory /cvs/pkgs/rpms/grfcodec/devel added to the repository From pkgdb at fedoraproject.org Wed May 6 21:05:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:05:15 +0000 Subject: [pkgdb] grfcodec (Fedora, 11) updated by kevin Message-ID: <20090506210515.64A2B10F8A3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for grfcodec kevin has set commit to Approved for provenpackager on grfcodec (Fedora 11) kevin has set build to Approved for provenpackager on grfcodec (Fedora 11) kevin has set checkout to Approved for provenpackager on grfcodec (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec From kevin at fedoraproject.org Wed May 6 21:05:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:05:47 +0000 (UTC) Subject: rpms/grfcodec Makefile,NONE,1.1 Message-ID: <20090506210547.C9F6F70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/grfcodec In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20405/rpms/grfcodec Added Files: Makefile Log Message: Setup of module grfcodec --- NEW FILE Makefile --- # Top level Makefile for module grfcodec 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 kevin at fedoraproject.org Wed May 6 21:05:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:05:48 +0000 (UTC) Subject: rpms/grfcodec/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506210548.6996770108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/grfcodec/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20405/rpms/grfcodec/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module grfcodec --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: grfcodec # $Id: Makefile,v 1.1 2009/05/06 21:05:48 kevin Exp $ NAME := grfcodec 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 pkgdb at fedoraproject.org Wed May 6 21:06:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:06:04 +0000 Subject: [pkgdb] wavemon was added for fab Message-ID: <20090506210604.5DCA810F893@bastion2.fedora.phx.redhat.com> kevin has added Package wavemon with summary Ncurses-based monitoring application for wireless network devices kevin has approved Package wavemon kevin has added a Fedora devel branch for wavemon with an owner of fab kevin has approved wavemon in Fedora devel kevin has approved Package wavemon kevin has set commit to Approved for provenpackager on wavemon (Fedora devel) kevin has set build to Approved for provenpackager on wavemon (Fedora devel) kevin has set checkout to Approved for provenpackager on wavemon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wavemon From pkgdb at fedoraproject.org Wed May 6 21:06:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:06:11 +0000 Subject: [pkgdb] wavemon (Fedora, 10) updated by kevin Message-ID: <20090506210612.13A7510F8A0@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for wavemon kevin has set commit to Approved for provenpackager on wavemon (Fedora 10) kevin has set build to Approved for provenpackager on wavemon (Fedora 10) kevin has set checkout to Approved for provenpackager on wavemon (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wavemon From pkgdb at fedoraproject.org Wed May 6 21:06:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:06:12 +0000 Subject: [pkgdb] wavemon (Fedora, 11) updated by kevin Message-ID: <20090506210612.A75FF10F8A3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for wavemon kevin has set commit to Approved for provenpackager on wavemon (Fedora 11) kevin has set build to Approved for provenpackager on wavemon (Fedora 11) kevin has set checkout to Approved for provenpackager on wavemon (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wavemon From kevin at fedoraproject.org Wed May 6 21:06:24 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:06:24 +0000 (UTC) Subject: rpms/wavemon - New directory Message-ID: <20090506210624.3281670108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/wavemon In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20719/rpms/wavemon Log Message: Directory /cvs/pkgs/rpms/wavemon added to the repository From kevin at fedoraproject.org Wed May 6 21:06:24 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:06:24 +0000 (UTC) Subject: rpms/wavemon/devel - New directory Message-ID: <20090506210624.7EA4A70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/wavemon/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20719/rpms/wavemon/devel Log Message: Directory /cvs/pkgs/rpms/wavemon/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:06:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:06:39 +0000 (UTC) Subject: rpms/wavemon Makefile,NONE,1.1 Message-ID: <20090506210639.F077D70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/wavemon In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20719/rpms/wavemon Added Files: Makefile Log Message: Setup of module wavemon --- NEW FILE Makefile --- # Top level Makefile for module wavemon 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 kevin at fedoraproject.org Wed May 6 21:06:41 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:06:41 +0000 (UTC) Subject: rpms/wavemon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506210641.635B670108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/wavemon/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20719/rpms/wavemon/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module wavemon --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: wavemon # $Id: Makefile,v 1.1 2009/05/06 21:06:40 kevin Exp $ NAME := wavemon 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 pkgdb at fedoraproject.org Wed May 6 21:06:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:06:12 +0000 Subject: [pkgdb] wavemon (Fedora, 9) updated by kevin Message-ID: <20090506210613.5995F10F8A6@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for wavemon kevin has set commit to Approved for provenpackager on wavemon (Fedora 9) kevin has set build to Approved for provenpackager on wavemon (Fedora 9) kevin has set checkout to Approved for provenpackager on wavemon (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wavemon From pkgdb at fedoraproject.org Wed May 6 21:07:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:07:08 +0000 Subject: [pkgdb] klatexformula was added for nucleo Message-ID: <20090506210708.A2B7D10F893@bastion2.fedora.phx.redhat.com> kevin has added Package klatexformula with summary Application for easy image creating from a LaTeX equation kevin has approved Package klatexformula kevin has added a Fedora devel branch for klatexformula with an owner of nucleo kevin has approved klatexformula in Fedora devel kevin has approved Package klatexformula kevin has set commit to Approved for provenpackager on klatexformula (Fedora devel) kevin has set build to Approved for provenpackager on klatexformula (Fedora devel) kevin has set checkout to Approved for provenpackager on klatexformula (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/klatexformula From pkgdb at fedoraproject.org Wed May 6 21:07:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:07:09 +0000 Subject: [pkgdb] klatexformula (Fedora, 10) updated by kevin Message-ID: <20090506210709.CB1F810F8A0@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for klatexformula kevin has set commit to Approved for provenpackager on klatexformula (Fedora 10) kevin has set build to Approved for provenpackager on klatexformula (Fedora 10) kevin has set checkout to Approved for provenpackager on klatexformula (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/klatexformula From pkgdb at fedoraproject.org Wed May 6 21:07:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:07:09 +0000 Subject: [pkgdb] klatexformula (Fedora, 11) updated by kevin Message-ID: <20090506210709.DDDA210F8A6@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for klatexformula kevin has set commit to Approved for provenpackager on klatexformula (Fedora 11) kevin has set build to Approved for provenpackager on klatexformula (Fedora 11) kevin has set checkout to Approved for provenpackager on klatexformula (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/klatexformula From pkgdb at fedoraproject.org Wed May 6 21:07:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:07:09 +0000 Subject: [pkgdb] klatexformula (Fedora, 9) updated by kevin Message-ID: <20090506210709.D3A9E10F8A3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for klatexformula kevin has set commit to Approved for provenpackager on klatexformula (Fedora 9) kevin has set build to Approved for provenpackager on klatexformula (Fedora 9) kevin has set checkout to Approved for provenpackager on klatexformula (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/klatexformula From kevin at fedoraproject.org Wed May 6 21:07:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:07:22 +0000 (UTC) Subject: rpms/klatexformula - New directory Message-ID: <20090506210722.3FE2B70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/klatexformula In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm21003/rpms/klatexformula Log Message: Directory /cvs/pkgs/rpms/klatexformula added to the repository From kevin at fedoraproject.org Wed May 6 21:07:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:07:22 +0000 (UTC) Subject: rpms/klatexformula/devel - New directory Message-ID: <20090506210722.A3C5870108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/klatexformula/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm21003/rpms/klatexformula/devel Log Message: Directory /cvs/pkgs/rpms/klatexformula/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:07:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:07:43 +0000 (UTC) Subject: rpms/klatexformula Makefile,NONE,1.1 Message-ID: <20090506210743.C555370108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/klatexformula In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm21003/rpms/klatexformula Added Files: Makefile Log Message: Setup of module klatexformula --- NEW FILE Makefile --- # Top level Makefile for module klatexformula 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 kevin at fedoraproject.org Wed May 6 21:07:44 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:07:44 +0000 (UTC) Subject: rpms/klatexformula/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506210744.8030170108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/klatexformula/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm21003/rpms/klatexformula/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module klatexformula --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: klatexformula # $Id: Makefile,v 1.1 2009/05/06 21:07:44 kevin Exp $ NAME := klatexformula 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 pkgdb at fedoraproject.org Wed May 6 21:08:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:08:01 +0000 Subject: [pkgdb] perl-Text-Context was added for iarnell Message-ID: <20090506210801.3F82F10F8AD@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Text-Context with summary Handle highlighting search result context snippets kevin has approved Package perl-Text-Context kevin has added a Fedora devel branch for perl-Text-Context with an owner of iarnell kevin has approved perl-Text-Context in Fedora devel kevin has approved Package perl-Text-Context kevin has set commit to Approved for provenpackager on perl-Text-Context (Fedora devel) kevin has set build to Approved for provenpackager on perl-Text-Context (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Text-Context (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Context From pkgdb at fedoraproject.org Wed May 6 21:08:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:08:02 +0000 Subject: [pkgdb] perl-Text-Context (Fedora, 10) updated by kevin Message-ID: <20090506210802.60B5310F8B7@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Text-Context kevin has set commit to Approved for provenpackager on perl-Text-Context (Fedora 10) kevin has set build to Approved for provenpackager on perl-Text-Context (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Text-Context (Fedora 10) kevin approved watchbugzilla on perl-Text-Context (Fedora 10) for perl-sig kevin approved watchcommits on perl-Text-Context (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Context From pkgdb at fedoraproject.org Wed May 6 21:08:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:08:02 +0000 Subject: [pkgdb] perl-Text-Context (Fedora, 11) updated by kevin Message-ID: <20090506210802.6846010F8BA@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Text-Context kevin has set commit to Approved for provenpackager on perl-Text-Context (Fedora 11) kevin has set build to Approved for provenpackager on perl-Text-Context (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Text-Context (Fedora 11) kevin approved watchbugzilla on perl-Text-Context (Fedora 11) for perl-sig kevin approved watchcommits on perl-Text-Context (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Context From pkgdb at fedoraproject.org Wed May 6 21:08:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:08:02 +0000 Subject: [pkgdb] perl-Text-Context (Fedora, devel) updated by kevin Message-ID: <20090506210802.782B010F8BD@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Text-Context (Fedora devel) for perl-sig kevin approved watchcommits on perl-Text-Context (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Context From kevin at fedoraproject.org Wed May 6 21:08:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:08:13 +0000 (UTC) Subject: rpms/perl-Text-Context - New directory Message-ID: <20090506210813.5ED0A70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Context In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ21275/rpms/perl-Text-Context Log Message: Directory /cvs/pkgs/rpms/perl-Text-Context added to the repository From kevin at fedoraproject.org Wed May 6 21:08:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:08:13 +0000 (UTC) Subject: rpms/perl-Text-Context/devel - New directory Message-ID: <20090506210813.C497470108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Context/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ21275/rpms/perl-Text-Context/devel Log Message: Directory /cvs/pkgs/rpms/perl-Text-Context/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:08:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:08:29 +0000 (UTC) Subject: rpms/perl-Text-Context Makefile,NONE,1.1 Message-ID: <20090506210829.C815C70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Context In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ21275/rpms/perl-Text-Context Added Files: Makefile Log Message: Setup of module perl-Text-Context --- NEW FILE Makefile --- # Top level Makefile for module perl-Text-Context 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 kevin at fedoraproject.org Wed May 6 21:08:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:08:30 +0000 (UTC) Subject: rpms/perl-Text-Context/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506210830.45E5670108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Context/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ21275/rpms/perl-Text-Context/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Text-Context --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Text-Context # $Id: Makefile,v 1.1 2009/05/06 21:08:29 kevin Exp $ NAME := perl-Text-Context 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 pkgdb at fedoraproject.org Wed May 6 21:09:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:09:43 +0000 Subject: [pkgdb] perl-Crypt-Eksblowfish was added for iarnell Message-ID: <20090506210943.C39D810F89C@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Crypt-Eksblowfish with summary Eksblowfish block cipher kevin has approved Package perl-Crypt-Eksblowfish kevin has added a Fedora devel branch for perl-Crypt-Eksblowfish with an owner of iarnell kevin has approved perl-Crypt-Eksblowfish in Fedora devel kevin has approved Package perl-Crypt-Eksblowfish kevin has set commit to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora devel) kevin has set build to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-Eksblowfish From pkgdb at fedoraproject.org Wed May 6 21:09:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:09:45 +0000 Subject: [pkgdb] perl-Crypt-Eksblowfish (Fedora, 10) updated by kevin Message-ID: <20090506210945.7C5EC10F8A2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Crypt-Eksblowfish kevin has set commit to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora 10) kevin has set build to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora 10) kevin approved watchbugzilla on perl-Crypt-Eksblowfish (Fedora 10) for perl-sig kevin approved watchcommits on perl-Crypt-Eksblowfish (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-Eksblowfish From pkgdb at fedoraproject.org Wed May 6 21:09:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:09:45 +0000 Subject: [pkgdb] perl-Crypt-Eksblowfish (Fedora, devel) updated by kevin Message-ID: <20090506210945.895B710F8A5@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Crypt-Eksblowfish (Fedora devel) for perl-sig kevin approved watchcommits on perl-Crypt-Eksblowfish (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-Eksblowfish From pkgdb at fedoraproject.org Wed May 6 21:09:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:09:45 +0000 Subject: [pkgdb] perl-Crypt-Eksblowfish (Fedora, 11) updated by kevin Message-ID: <20090506210945.99D5B10F8A9@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Crypt-Eksblowfish kevin has set commit to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora 11) kevin has set build to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Crypt-Eksblowfish (Fedora 11) kevin approved watchbugzilla on perl-Crypt-Eksblowfish (Fedora 11) for perl-sig kevin approved watchcommits on perl-Crypt-Eksblowfish (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-Eksblowfish From kevin at fedoraproject.org Wed May 6 21:09:57 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:09:57 +0000 (UTC) Subject: rpms/perl-Crypt-Eksblowfish - New directory Message-ID: <20090506210957.53A5770108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Crypt-Eksblowfish In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF21579/rpms/perl-Crypt-Eksblowfish Log Message: Directory /cvs/pkgs/rpms/perl-Crypt-Eksblowfish added to the repository From kevin at fedoraproject.org Wed May 6 21:09:57 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:09:57 +0000 (UTC) Subject: rpms/perl-Crypt-Eksblowfish/devel - New directory Message-ID: <20090506210957.B47807013A@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Crypt-Eksblowfish/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF21579/rpms/perl-Crypt-Eksblowfish/devel Log Message: Directory /cvs/pkgs/rpms/perl-Crypt-Eksblowfish/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:10:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:10:09 +0000 (UTC) Subject: rpms/perl-Crypt-Eksblowfish Makefile,NONE,1.1 Message-ID: <20090506211009.D28F970108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Crypt-Eksblowfish In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF21579/rpms/perl-Crypt-Eksblowfish Added Files: Makefile Log Message: Setup of module perl-Crypt-Eksblowfish --- NEW FILE Makefile --- # Top level Makefile for module perl-Crypt-Eksblowfish 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 kevin at fedoraproject.org Wed May 6 21:10:10 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:10:10 +0000 (UTC) Subject: rpms/perl-Crypt-Eksblowfish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211010.5E94970108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Crypt-Eksblowfish/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF21579/rpms/perl-Crypt-Eksblowfish/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Crypt-Eksblowfish --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Crypt-Eksblowfish # $Id: Makefile,v 1.1 2009/05/06 21:10:10 kevin Exp $ NAME := perl-Crypt-Eksblowfish 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 pkgdb at fedoraproject.org Wed May 6 21:10:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:10:26 +0000 Subject: [pkgdb] perl-Locale-PO was added for iarnell Message-ID: <20090506211027.0B09110F8A5@bastion2.fedora.phx.redhat.com> kevin has added Package perl-Locale-PO with summary Perl module for manipulating .po entries from GNU gettext kevin has approved Package perl-Locale-PO kevin has added a Fedora devel branch for perl-Locale-PO with an owner of iarnell kevin has approved perl-Locale-PO in Fedora devel kevin has approved Package perl-Locale-PO kevin has set commit to Approved for provenpackager on perl-Locale-PO (Fedora devel) kevin has set build to Approved for provenpackager on perl-Locale-PO (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Locale-PO (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-PO From pkgdb at fedoraproject.org Wed May 6 21:10:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:10:29 +0000 Subject: [pkgdb] perl-Locale-PO (Fedora, 10) updated by kevin Message-ID: <20090506211029.4E42A10F8A6@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Locale-PO kevin has set commit to Approved for provenpackager on perl-Locale-PO (Fedora 10) kevin has set build to Approved for provenpackager on perl-Locale-PO (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Locale-PO (Fedora 10) kevin approved watchbugzilla on perl-Locale-PO (Fedora 10) for perl-sig kevin approved watchcommits on perl-Locale-PO (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-PO From pkgdb at fedoraproject.org Wed May 6 21:10:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:10:29 +0000 Subject: [pkgdb] perl-Locale-PO (Fedora, devel) updated by kevin Message-ID: <20090506211029.5DA4910F8A9@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Locale-PO (Fedora devel) for perl-sig kevin approved watchcommits on perl-Locale-PO (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-PO From pkgdb at fedoraproject.org Wed May 6 21:10:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:10:29 +0000 Subject: [pkgdb] perl-Locale-PO (Fedora, 11) updated by kevin Message-ID: <20090506211029.678FB10F8AD@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-Locale-PO kevin has set commit to Approved for provenpackager on perl-Locale-PO (Fedora 11) kevin has set build to Approved for provenpackager on perl-Locale-PO (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-Locale-PO (Fedora 11) kevin approved watchbugzilla on perl-Locale-PO (Fedora 11) for perl-sig kevin approved watchcommits on perl-Locale-PO (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-PO From kevin at fedoraproject.org Wed May 6 21:10:40 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:10:40 +0000 (UTC) Subject: rpms/perl-Locale-PO - New directory Message-ID: <20090506211040.2B9F370108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Locale-PO In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl21814/rpms/perl-Locale-PO Log Message: Directory /cvs/pkgs/rpms/perl-Locale-PO added to the repository From kevin at fedoraproject.org Wed May 6 21:10:40 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:10:40 +0000 (UTC) Subject: rpms/perl-Locale-PO/devel - New directory Message-ID: <20090506211040.9349970108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Locale-PO/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl21814/rpms/perl-Locale-PO/devel Log Message: Directory /cvs/pkgs/rpms/perl-Locale-PO/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:10:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:10:54 +0000 (UTC) Subject: rpms/perl-Locale-PO Makefile,NONE,1.1 Message-ID: <20090506211054.BCA5470108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Locale-PO In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl21814/rpms/perl-Locale-PO Added Files: Makefile Log Message: Setup of module perl-Locale-PO --- NEW FILE Makefile --- # Top level Makefile for module perl-Locale-PO 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 kevin at fedoraproject.org Wed May 6 21:10:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:10:55 +0000 (UTC) Subject: rpms/perl-Locale-PO/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211055.2B4A770108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Locale-PO/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl21814/rpms/perl-Locale-PO/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Locale-PO --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Locale-PO # $Id: Makefile,v 1.1 2009/05/06 21:10:54 kevin Exp $ NAME := perl-Locale-PO 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 pkgdb at fedoraproject.org Wed May 6 21:11:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:11:20 +0000 Subject: [pkgdb] perl-HTML-WikiConverter was added for iarnell Message-ID: <20090506211120.BA87B10F8A2@bastion2.fedora.phx.redhat.com> kevin has added Package perl-HTML-WikiConverter with summary Perl module to convert HTML to wiki markup kevin has approved Package perl-HTML-WikiConverter kevin has added a Fedora devel branch for perl-HTML-WikiConverter with an owner of iarnell kevin has approved perl-HTML-WikiConverter in Fedora devel kevin has approved Package perl-HTML-WikiConverter kevin has set commit to Approved for provenpackager on perl-HTML-WikiConverter (Fedora devel) kevin has set build to Approved for provenpackager on perl-HTML-WikiConverter (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-HTML-WikiConverter (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-WikiConverter From pkgdb at fedoraproject.org Wed May 6 21:11:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:11:22 +0000 Subject: [pkgdb] perl-HTML-WikiConverter (Fedora, devel) updated by kevin Message-ID: <20090506211123.8B14810F8A3@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-HTML-WikiConverter (Fedora devel) for perl-sig kevin approved watchcommits on perl-HTML-WikiConverter (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-WikiConverter From pkgdb at fedoraproject.org Wed May 6 21:11:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:11:22 +0000 Subject: [pkgdb] perl-HTML-WikiConverter (Fedora, 10) updated by kevin Message-ID: <20090506211123.9D40710F8AB@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-HTML-WikiConverter kevin has set commit to Approved for provenpackager on perl-HTML-WikiConverter (Fedora 10) kevin has set build to Approved for provenpackager on perl-HTML-WikiConverter (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-HTML-WikiConverter (Fedora 10) kevin approved watchbugzilla on perl-HTML-WikiConverter (Fedora 10) for perl-sig kevin approved watchcommits on perl-HTML-WikiConverter (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-WikiConverter From pkgdb at fedoraproject.org Wed May 6 21:11:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:11:22 +0000 Subject: [pkgdb] perl-HTML-WikiConverter (Fedora, 11) updated by kevin Message-ID: <20090506211123.B0C2810F89F@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-HTML-WikiConverter kevin has set commit to Approved for provenpackager on perl-HTML-WikiConverter (Fedora 11) kevin has set build to Approved for provenpackager on perl-HTML-WikiConverter (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-HTML-WikiConverter (Fedora 11) kevin approved watchbugzilla on perl-HTML-WikiConverter (Fedora 11) for perl-sig kevin approved watchcommits on perl-HTML-WikiConverter (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-WikiConverter From kevin at fedoraproject.org Wed May 6 21:11:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:11:33 +0000 (UTC) Subject: rpms/perl-HTML-WikiConverter - New directory Message-ID: <20090506211133.2E04770108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-WikiConverter In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22048/rpms/perl-HTML-WikiConverter Log Message: Directory /cvs/pkgs/rpms/perl-HTML-WikiConverter added to the repository From kevin at fedoraproject.org Wed May 6 21:11:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:11:33 +0000 (UTC) Subject: rpms/perl-HTML-WikiConverter/devel - New directory Message-ID: <20090506211133.80B8770108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-WikiConverter/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22048/rpms/perl-HTML-WikiConverter/devel Log Message: Directory /cvs/pkgs/rpms/perl-HTML-WikiConverter/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:11:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:11:45 +0000 (UTC) Subject: rpms/perl-HTML-WikiConverter Makefile,NONE,1.1 Message-ID: <20090506211145.2CF6B70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-WikiConverter In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22048/rpms/perl-HTML-WikiConverter Added Files: Makefile Log Message: Setup of module perl-HTML-WikiConverter --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-WikiConverter 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 kevin at fedoraproject.org Wed May 6 21:11:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:11:45 +0000 (UTC) Subject: rpms/perl-HTML-WikiConverter/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211145.82AC570108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-WikiConverter/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22048/rpms/perl-HTML-WikiConverter/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-WikiConverter --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-WikiConverter # $Id: Makefile,v 1.1 2009/05/06 21:11:45 kevin Exp $ NAME := perl-HTML-WikiConverter 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 pkgdb at fedoraproject.org Wed May 6 21:11:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:11:59 +0000 Subject: [pkgdb] perl-HTML-TreeBuilder-XPath was added for iarnell Message-ID: <20090506211159.6EE2810F8A3@bastion2.fedora.phx.redhat.com> kevin has added Package perl-HTML-TreeBuilder-XPath with summary Add XPath support to HTML::TreeBuilder kevin has approved Package perl-HTML-TreeBuilder-XPath kevin has added a Fedora devel branch for perl-HTML-TreeBuilder-XPath with an owner of iarnell kevin has approved perl-HTML-TreeBuilder-XPath in Fedora devel kevin has approved Package perl-HTML-TreeBuilder-XPath kevin has set commit to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora devel) kevin has set build to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TreeBuilder-XPath From pkgdb at fedoraproject.org Wed May 6 21:12:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:12:01 +0000 Subject: [pkgdb] perl-HTML-TreeBuilder-XPath (Fedora, 10) updated by kevin Message-ID: <20090506211201.568DD10F8AB@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-HTML-TreeBuilder-XPath kevin has set commit to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora 10) kevin has set build to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora 10) kevin approved watchbugzilla on perl-HTML-TreeBuilder-XPath (Fedora 10) for perl-sig kevin approved watchcommits on perl-HTML-TreeBuilder-XPath (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TreeBuilder-XPath From pkgdb at fedoraproject.org Wed May 6 21:12:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:12:01 +0000 Subject: [pkgdb] perl-HTML-TreeBuilder-XPath (Fedora, devel) updated by kevin Message-ID: <20090506211201.6B06B10F89F@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-HTML-TreeBuilder-XPath (Fedora devel) for perl-sig kevin approved watchcommits on perl-HTML-TreeBuilder-XPath (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TreeBuilder-XPath From pkgdb at fedoraproject.org Wed May 6 21:12:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:12:01 +0000 Subject: [pkgdb] perl-HTML-TreeBuilder-XPath (Fedora, 11) updated by kevin Message-ID: <20090506211201.849A310F8B6@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-HTML-TreeBuilder-XPath kevin has set commit to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora 11) kevin has set build to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-HTML-TreeBuilder-XPath (Fedora 11) kevin approved watchbugzilla on perl-HTML-TreeBuilder-XPath (Fedora 11) for perl-sig kevin approved watchcommits on perl-HTML-TreeBuilder-XPath (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TreeBuilder-XPath From kevin at fedoraproject.org Wed May 6 21:12:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:12:13 +0000 (UTC) Subject: rpms/perl-HTML-TreeBuilder-XPath - New directory Message-ID: <20090506211213.4824B70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-TreeBuilder-XPath In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn22288/rpms/perl-HTML-TreeBuilder-XPath Log Message: Directory /cvs/pkgs/rpms/perl-HTML-TreeBuilder-XPath added to the repository From kevin at fedoraproject.org Wed May 6 21:12:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:12:13 +0000 (UTC) Subject: rpms/perl-HTML-TreeBuilder-XPath/devel - New directory Message-ID: <20090506211213.A7EBD70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-TreeBuilder-XPath/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn22288/rpms/perl-HTML-TreeBuilder-XPath/devel Log Message: Directory /cvs/pkgs/rpms/perl-HTML-TreeBuilder-XPath/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:12:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:12:25 +0000 (UTC) Subject: rpms/perl-HTML-TreeBuilder-XPath Makefile,NONE,1.1 Message-ID: <20090506211225.5189C70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-TreeBuilder-XPath In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn22288/rpms/perl-HTML-TreeBuilder-XPath Added Files: Makefile Log Message: Setup of module perl-HTML-TreeBuilder-XPath --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-TreeBuilder-XPath 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 kevin at fedoraproject.org Wed May 6 21:12:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:12:25 +0000 (UTC) Subject: rpms/perl-HTML-TreeBuilder-XPath/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211225.99B7D70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-TreeBuilder-XPath/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn22288/rpms/perl-HTML-TreeBuilder-XPath/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-TreeBuilder-XPath --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-TreeBuilder-XPath # $Id: Makefile,v 1.1 2009/05/06 21:12:25 kevin Exp $ NAME := perl-HTML-TreeBuilder-XPath 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 pkgdb at fedoraproject.org Wed May 6 21:12:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:12:43 +0000 Subject: [pkgdb] perl-File-Flock was added for eseyman Message-ID: <20090506211243.65B2910F8AB@bastion2.fedora.phx.redhat.com> kevin has added Package perl-File-Flock with summary File locking with flock kevin has approved Package perl-File-Flock kevin has added a Fedora devel branch for perl-File-Flock with an owner of eseyman kevin has approved perl-File-Flock in Fedora devel kevin has approved Package perl-File-Flock kevin has set commit to Approved for provenpackager on perl-File-Flock (Fedora devel) kevin has set build to Approved for provenpackager on perl-File-Flock (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-File-Flock (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Flock From pkgdb at fedoraproject.org Wed May 6 21:12:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:12:44 +0000 Subject: [pkgdb] perl-File-Flock (Fedora, 9) updated by kevin Message-ID: <20090506211244.CCFD010F8B4@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-File-Flock kevin has set commit to Approved for provenpackager on perl-File-Flock (Fedora 9) kevin has set build to Approved for provenpackager on perl-File-Flock (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-File-Flock (Fedora 9) kevin approved watchbugzilla on perl-File-Flock (Fedora 9) for perl-sig kevin approved watchcommits on perl-File-Flock (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Flock From pkgdb at fedoraproject.org Wed May 6 21:12:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:12:44 +0000 Subject: [pkgdb] perl-File-Flock (Fedora, 10) updated by kevin Message-ID: <20090506211244.D43A710F89F@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-File-Flock kevin has set commit to Approved for provenpackager on perl-File-Flock (Fedora 10) kevin has set build to Approved for provenpackager on perl-File-Flock (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-File-Flock (Fedora 10) kevin approved watchbugzilla on perl-File-Flock (Fedora 10) for perl-sig kevin approved watchcommits on perl-File-Flock (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Flock From pkgdb at fedoraproject.org Wed May 6 21:12:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:12:44 +0000 Subject: [pkgdb] perl-File-Flock (Fedora, 11) updated by kevin Message-ID: <20090506211244.DCD1810F8A0@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for perl-File-Flock kevin has set commit to Approved for provenpackager on perl-File-Flock (Fedora 11) kevin has set build to Approved for provenpackager on perl-File-Flock (Fedora 11) kevin has set checkout to Approved for provenpackager on perl-File-Flock (Fedora 11) kevin approved watchbugzilla on perl-File-Flock (Fedora 11) for perl-sig kevin approved watchcommits on perl-File-Flock (Fedora 11) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Flock From pkgdb at fedoraproject.org Wed May 6 21:12:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:12:44 +0000 Subject: [pkgdb] perl-File-Flock (Fedora, devel) updated by kevin Message-ID: <20090506211244.EB05310F8BE@bastion2.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-File-Flock (Fedora devel) for perl-sig kevin approved watchcommits on perl-File-Flock (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Flock From kevin at fedoraproject.org Wed May 6 21:12:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:12:55 +0000 (UTC) Subject: rpms/perl-File-Flock - New directory Message-ID: <20090506211255.43F2E70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-File-Flock In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd22487/rpms/perl-File-Flock Log Message: Directory /cvs/pkgs/rpms/perl-File-Flock added to the repository From kevin at fedoraproject.org Wed May 6 21:12:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:12:55 +0000 (UTC) Subject: rpms/perl-File-Flock/devel - New directory Message-ID: <20090506211255.9038E70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-File-Flock/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd22487/rpms/perl-File-Flock/devel Log Message: Directory /cvs/pkgs/rpms/perl-File-Flock/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:13:08 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:13:08 +0000 (UTC) Subject: rpms/perl-File-Flock Makefile,NONE,1.1 Message-ID: <20090506211308.EF84470108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-File-Flock In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd22487/rpms/perl-File-Flock Added Files: Makefile Log Message: Setup of module perl-File-Flock --- NEW FILE Makefile --- # Top level Makefile for module perl-File-Flock 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 kevin at fedoraproject.org Wed May 6 21:13:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:13:09 +0000 (UTC) Subject: rpms/perl-File-Flock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211309.598B870108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-File-Flock/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd22487/rpms/perl-File-Flock/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-File-Flock --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-File-Flock # $Id: Makefile,v 1.1 2009/05/06 21:13:09 kevin Exp $ NAME := perl-File-Flock 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 pkgdb at fedoraproject.org Wed May 6 21:13:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:13:24 +0000 Subject: [pkgdb] glista was added for cwickert Message-ID: <20090506211324.4391610F8AB@bastion2.fedora.phx.redhat.com> kevin has added Package glista with summary Simple personal to-do list manager or task tracking tool kevin has approved Package glista kevin has added a Fedora devel branch for glista with an owner of cwickert kevin has approved glista in Fedora devel kevin has approved Package glista kevin has set commit to Approved for provenpackager on glista (Fedora devel) kevin has set build to Approved for provenpackager on glista (Fedora devel) kevin has set checkout to Approved for provenpackager on glista (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/glista From pkgdb at fedoraproject.org Wed May 6 21:13:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:13:25 +0000 Subject: [pkgdb] glista (Fedora, 10) updated by kevin Message-ID: <20090506211325.6B6E510F8B1@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for glista kevin has set commit to Approved for provenpackager on glista (Fedora 10) kevin has set build to Approved for provenpackager on glista (Fedora 10) kevin has set checkout to Approved for provenpackager on glista (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/glista From pkgdb at fedoraproject.org Wed May 6 21:13:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:13:25 +0000 Subject: [pkgdb] glista (Fedora, 11) updated by kevin Message-ID: <20090506211325.723E910F8B7@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for glista kevin has set commit to Approved for provenpackager on glista (Fedora 11) kevin has set build to Approved for provenpackager on glista (Fedora 11) kevin has set checkout to Approved for provenpackager on glista (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/glista From kevin at fedoraproject.org Wed May 6 21:13:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:13:35 +0000 (UTC) Subject: rpms/glista - New directory Message-ID: <20090506211335.3E59C70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/glista In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG22726/rpms/glista Log Message: Directory /cvs/pkgs/rpms/glista added to the repository From pkgdb at fedoraproject.org Wed May 6 21:13:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:13:25 +0000 Subject: [pkgdb] glista (Fedora, 9) updated by kevin Message-ID: <20090506211325.7922310F8C5@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for glista kevin has set commit to Approved for provenpackager on glista (Fedora 9) kevin has set build to Approved for provenpackager on glista (Fedora 9) kevin has set checkout to Approved for provenpackager on glista (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/glista From kevin at fedoraproject.org Wed May 6 21:13:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:13:35 +0000 (UTC) Subject: rpms/glista/devel - New directory Message-ID: <20090506211335.94F5E70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/glista/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG22726/rpms/glista/devel Log Message: Directory /cvs/pkgs/rpms/glista/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:13:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:13:47 +0000 (UTC) Subject: rpms/glista Makefile,NONE,1.1 Message-ID: <20090506211347.5FF5570108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/glista In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG22726/rpms/glista Added Files: Makefile Log Message: Setup of module glista --- NEW FILE Makefile --- # Top level Makefile for module glista 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 kevin at fedoraproject.org Wed May 6 21:13:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:13:47 +0000 (UTC) Subject: rpms/glista/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211347.CC59A70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/glista/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG22726/rpms/glista/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module glista --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: glista # $Id: Makefile,v 1.1 2009/05/06 21:13:47 kevin Exp $ NAME := glista 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 pkgdb at fedoraproject.org Wed May 6 21:14:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:14:05 +0000 Subject: [pkgdb] gnome-applet-alarm-clock (Fedora, 10) updated by kevin Message-ID: <20090506211405.7B5DA10F8A9@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for gnome-applet-alarm-clock kevin has set commit to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 10) kevin has set build to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 10) kevin has set checkout to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-alarm-clock From pkgdb at fedoraproject.org Wed May 6 21:14:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:14:03 +0000 Subject: [pkgdb] gnome-applet-alarm-clock was added for cwickert Message-ID: <20090506211403.AE1F710F88C@bastion2.fedora.phx.redhat.com> kevin has added Package gnome-applet-alarm-clock with summary Alarm clock for the GNOME panel kevin has approved Package gnome-applet-alarm-clock kevin has added a Fedora devel branch for gnome-applet-alarm-clock with an owner of cwickert kevin has approved gnome-applet-alarm-clock in Fedora devel kevin has approved Package gnome-applet-alarm-clock kevin has set commit to Approved for provenpackager on gnome-applet-alarm-clock (Fedora devel) kevin has set build to Approved for provenpackager on gnome-applet-alarm-clock (Fedora devel) kevin has set checkout to Approved for provenpackager on gnome-applet-alarm-clock (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-alarm-clock From pkgdb at fedoraproject.org Wed May 6 21:14:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:14:05 +0000 Subject: [pkgdb] gnome-applet-alarm-clock (Fedora, 11) updated by kevin Message-ID: <20090506211405.813BC10F8C0@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for gnome-applet-alarm-clock kevin has set commit to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 11) kevin has set build to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 11) kevin has set checkout to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-alarm-clock From kevin at fedoraproject.org Wed May 6 21:14:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:14:20 +0000 (UTC) Subject: rpms/gnome-applet-alarm-clock - New directory Message-ID: <20090506211420.333A070131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gnome-applet-alarm-clock In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM23030/rpms/gnome-applet-alarm-clock Log Message: Directory /cvs/pkgs/rpms/gnome-applet-alarm-clock added to the repository From pkgdb at fedoraproject.org Wed May 6 21:14:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:14:05 +0000 Subject: [pkgdb] gnome-applet-alarm-clock (Fedora, 9) updated by kevin Message-ID: <20090506211405.8656E10F8C3@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for gnome-applet-alarm-clock kevin has set commit to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 9) kevin has set build to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 9) kevin has set checkout to Approved for provenpackager on gnome-applet-alarm-clock (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-alarm-clock From kevin at fedoraproject.org Wed May 6 21:14:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:14:20 +0000 (UTC) Subject: rpms/gnome-applet-alarm-clock/devel - New directory Message-ID: <20090506211420.A56E170131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gnome-applet-alarm-clock/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM23030/rpms/gnome-applet-alarm-clock/devel Log Message: Directory /cvs/pkgs/rpms/gnome-applet-alarm-clock/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:14:41 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:14:41 +0000 (UTC) Subject: rpms/gnome-applet-alarm-clock Makefile,NONE,1.1 Message-ID: <20090506211441.7970B70135@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gnome-applet-alarm-clock In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM23030/rpms/gnome-applet-alarm-clock Added Files: Makefile Log Message: Setup of module gnome-applet-alarm-clock --- NEW FILE Makefile --- # Top level Makefile for module gnome-applet-alarm-clock 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 kevin at fedoraproject.org Wed May 6 21:14:42 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:14:42 +0000 (UTC) Subject: rpms/gnome-applet-alarm-clock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211442.1049D70135@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gnome-applet-alarm-clock/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM23030/rpms/gnome-applet-alarm-clock/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnome-applet-alarm-clock --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gnome-applet-alarm-clock # $Id: Makefile,v 1.1 2009/05/06 21:14:41 kevin Exp $ NAME := gnome-applet-alarm-clock 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 pkgdb at fedoraproject.org Wed May 6 21:15:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:15:23 +0000 Subject: [pkgdb] hunspell-cv was added for caolanm Message-ID: <20090506211523.30E7D10F8A4@bastion2.fedora.phx.redhat.com> kevin has added Package hunspell-cv with summary Chuvash hunspell dictionaries kevin has approved Package hunspell-cv kevin has added a Fedora devel branch for hunspell-cv with an owner of caolanm kevin has approved hunspell-cv in Fedora devel kevin has approved Package hunspell-cv kevin has set commit to Approved for provenpackager on hunspell-cv (Fedora devel) kevin has set build to Approved for provenpackager on hunspell-cv (Fedora devel) kevin has set checkout to Approved for provenpackager on hunspell-cv (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-cv From kevin at fedoraproject.org Wed May 6 21:15:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:15:37 +0000 (UTC) Subject: rpms/hunspell-cv - New directory Message-ID: <20090506211537.360E870108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/hunspell-cv In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc24138/rpms/hunspell-cv Log Message: Directory /cvs/pkgs/rpms/hunspell-cv added to the repository From kevin at fedoraproject.org Wed May 6 21:15:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:15:37 +0000 (UTC) Subject: rpms/hunspell-cv/devel - New directory Message-ID: <20090506211537.8053B70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/hunspell-cv/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc24138/rpms/hunspell-cv/devel Log Message: Directory /cvs/pkgs/rpms/hunspell-cv/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:15:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:15:48 +0000 (UTC) Subject: rpms/hunspell-cv Makefile,NONE,1.1 Message-ID: <20090506211548.7532C70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/hunspell-cv In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc24138/rpms/hunspell-cv Added Files: Makefile Log Message: Setup of module hunspell-cv --- NEW FILE Makefile --- # Top level Makefile for module hunspell-cv 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 kevin at fedoraproject.org Wed May 6 21:15:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:15:48 +0000 (UTC) Subject: rpms/hunspell-cv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211548.D393970108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/hunspell-cv/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc24138/rpms/hunspell-cv/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-cv --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: hunspell-cv # $Id: Makefile,v 1.1 2009/05/06 21:15:48 kevin Exp $ NAME := hunspell-cv 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 jussilehtola at fedoraproject.org Wed May 6 21:15:44 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:15:44 +0000 (UTC) Subject: rpms/mb2md/devel changelog.txt, NONE, 1.1 import.log, NONE, 1.1 mb2md.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090506211544.2F64A70108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23335/devel Modified Files: .cvsignore sources Added Files: changelog.txt import.log mb2md.spec Log Message: Import in Fedora. --- NEW FILE changelog.txt --- ---------------------------- revision 1.26 date: 2004/03/28 00:09:46; author: juri; state: Exp; lines: +1 -16 - and another documentation cleanup ---------------------------- revision 1.25 date: 2004/03/27 23:19:46; author: juri; state: Exp; lines: +18 -151 - bumped the version - cleaned up the introduction - removed the changelog entries (will be in a seperate file) ---------------------------- revision 1.24 date: 2004/03/24 21:02:15; author: juri; state: Exp; lines: +11 -3 - fix handling of leading and/or trailing white space in mbox names; thanks to Ian Gulliver ---------------------------- revision 1.23 date: 2004/03/22 22:37:04; author: juri; state: Exp; lines: +58 -4 - new option "-l ": UW-Imapd creates a list that holds the name of all subscibed mailboxes; this can be used to select which mbox files to convert - just give mb2md the option "-l" and specify the list file; thanks to Isaac Saldana for this one ---------------------------- revision 1.22 date: 2004/03/22 22:09:34; author: juri; state: Exp; lines: +35 -12 - make the use of the Content-Length header not the default - use the new option "-c" to enable this behaviour, because results may be unreliable if the header has wrong entries, which happens quite often - small documentation cleanup ---------------------------- revision 1.21 date: 2004/03/22 21:44:23; author: juri; state: Exp; lines: +11 -5 - cleaned up the handling of CRLF-delimited files; we now remove all CR from all lines so thaz we get real unix files as output ---------------------------- revision 1.20 date: 2004/03/20 01:57:50; author: juri; state: Exp; lines: +12 -13 - fix a regexp to get just the date of From_ line, ---------------------------- revision 1.19 date: 2004/03/19 23:05:25; author: juri; state: Exp; lines: +61 -4 - added support for the infamous mboxcl2 format (Content-Length: header) used by mutt; thanks to Chris Dunlop! ---------------------------- revision 1.18 date: 2004/03/19 18:34:23; author: juri; state: Exp; lines: +5 -2 - we ignore files that start with an empty line for now (reportedly Evolution may create such files - hope to support this violation of the mbox format later) ---------------------------- revision 1.17 date: 2004/03/19 17:59:52; author: juri; state: Exp; lines: +11 -4 - minor code cleanup ---------------------------- revision 1.16 date: 2004/03/19 17:33:00; author: juri; state: Exp; lines: +27 -1 - added support for Ximian Evolution's local mbox files (untested, as I don't have any Evolution mailboxes). Thanks to Jacob Barde for this one. - forgot the credit for the last commited patch (CRLF): Thanks goes to Martijn Polak! ---------------------------- revision 1.15 date: 2004/03/19 17:11:20; author: juri; state: Exp; lines: +9 -6 - we can now also handle mbox files in Windows format (CRLF delimited) ---------------------------- revision 1.14 date: 2004/03/19 16:41:35; author: juri; state: Exp; lines: +2 -2 - corrected a typo in the cvs Log tag ---------------------------- revision 1.13 date: 2004/03/19 16:39:42; author: juri; state: Exp; lines: +13 -1 - added change log entries for the last two fixes ---------------------------- revision 1.12 date: 2004/03/19 16:35:57; author: juri; state: Exp; lines: +3 -0 - added two cvs flags: $Id and $Logs ---------------------------- revision 1.11 date: 2004/03/19 16:31:11; author: juri; state: Exp; lines: +4 -8 - bug fix: follow the Maildir spec more closely: put all converted mail into the cur/ directory instead of new/ resolves problems with Courier-POP3d and bincimap Thanks to Richard Boulton. ---------------------------- revision 1.10 date: 2004/03/19 15:44:08; author: juri; state: Exp; lines: +10 -1 - bug fix: The program assumes that the environment setting $MAIL exists. No error checking is done, and no meaningful error is generated. Submitted by Glen Harris via the Debian package maintainer Noel Koethe ---------------------------- revision 1.9 date: 2004/03/11 01:24:13; author: juri; state: Exp; lines: +10 -4 - if specifying just a single file with -s, check whether it is a valid mbox file - if not, skip it ---------------------------- revision 1.8 date: 2003/11/11 14:49:26; author: juri; state: Exp; lines: +37 -33 - bugfix: if dummy message is present the last converted mail wasn't touched with the parsed date - patch by Wayne Davison: use Date::Parse from the TimeDate package to parse the From date and use the perl function utime() instead of touch; minor code cleanups ---------------------------- revision 1.7 date: 2003/11/11 14:47:26; author: juri; state: Exp; lines: +19 -55 - ripped out Geoffroy's changes concerning touch and FreeBSD and replaced it with a generic way that should work on all *BSD and Linux unfortunately you now need the Perl libwww package :( ---------------------------- revision 1.6 date: 2003/11/11 14:44:39; author: juri; state: Exp; lines: +7 -1 - bugfix: $unamecmd was set to /usr/bin/touch; grmbl cut-n-paste bug thanks to Nick Triantos ---------------------------- revision 1.5 date: 2003/11/11 14:43:22; author: juri; state: Exp; lines: +79 -33 - fixed a bug where dots (.) in foldernames weren't converted to '_' - fixed a bug where an empty file was created if we have a folder that has just a dummy message in it - incoorperated changes by Kjetil Torgrim Homme: handle "From " correctly - incoorperated changes by Ludovic Robinot: also use X-Mozilla-Status flags (local Mozilla mailboxes) ---------------------------- revision 1.4 date: 2003/11/11 14:41:56; author: juri; state: Exp; lines: +256 -121 changes by Geoffroy DESVERNAY: - added the '-R' switch, to permit 'one-pass conversion' - added a isamailboxfile() function to skip some 'address-book' or other files I found in users's 'Mail' directory - added a convertit() function to permit recursion - added a maildirmake() function to create empty folders (used the same code that used to create it) - added a '/bin/date' call in convert() to convert the date in case of *BSD system : it's now usable for a FreeBSD 4.7 system - added a $touchtimeswitch variable (*BSD touch need '-t' instead of '-d') - I tried not to change the default behaviour... hope it worked ! changes by Juri Haberland: - minor cleanups ---------------------------- revision 1.3 date: 2003/11/11 14:39:21; author: juri; state: Exp; lines: +227 -328 Changes by Jeff Williams: - put the mbox to maildir conversion into it's own function - made it possible to specify a source mbox file, rather than just the directory - destination can now be an absolute path instead of relative to the users home directory - the users mail directory for -m is found from $ENV{MAIL} rather than assumed to be in /var/spool/mail/$user - mbox files with .'s in their name have them converted to -'s - cleaned up a lot of the code and removed some unnecessary variables. Added the use strict pragma. ---------------------------- revision 1.2 date: 2002/10/23 14:26:27; author: juri; state: Exp; lines: +126 -85 Juri's collected changes: - fixed a bug in handling multiple source dirs - fixed a bug with zero-sized mailboxes - fixed a bug in handling "From:" headers that have a time zone - added optional absolute path names for the source dir - added the possibility to strip an extension from the mailboxes - added the command line interface to be more standard like ---------------------------- revision 1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; lines: +0 -0 - initial import including Robins's latest version 2.01 ============================================================================= --- NEW FILE import.log --- mb2md-3_20-3_fc10:HEAD:mb2md-3.20-3.fc10.src.rpm:1241644462 --- NEW FILE mb2md.spec --- Name: mb2md Version: 3.20 Release: 3%{?dist} Summary: Mailbox to maildir converter Group: Applications/Internet License: Public Domain URL: http://batleth.sapienti-sat.org/projects/mb2md Source0: http://batleth.sapienti-sat.org/projects/mb2md/mb2md-%{version}.pl.gz Source1: http://batleth.sapienti-sat.org/projects/mb2md/changelog.txt BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Convert your emails folders in mailbox format to maildirs. Some of the current features of mb2md.pl are: * converting the user's main mailbox that is referenced by the $MAIL variable * converting a single mailbox into corresponding maildir * converting multiple mailboxes in a directory into corresponding maildirs * recursive operation on a given directory to convert the complete mail storage of one user * replaces all occurrences of dots ('.') in a mailbox name by underscores ('_') * is able to handle spaces in mailbox names * converts mbox files in DOS format (CRLF) to Unix file format * can strip an extension (e.g. ".mbx") from a mailbox name prior to converting * removal of dummy message that a couple of IMAP servers (e.g. UW-IMAPD) put at the beginning of a mailbox * setting the file date of a converted message according to the date found in the "From " line of the original mail * setting the flags F,R,S,T (flagged, replied, seen, deleted) on the filename of the converted message according to the flags found in "Status:"/"X-Status:"/"X-Mozilla-Status:"/"X-Evolution:" headers of the original mail %prep %setup -q -Tc -n %{name}-%{version} # Setup executable gunzip -c %{SOURCE0} > mb2md.pl touch -r %{SOURCE0} mb2md.pl # Copy changelog cp -a %{SOURCE1} . ### Generate documentation # #--- denotes the end of the documentation section; get everything before # that, remove the shebang and the hash commentation grep -B `wc -l mb2md.pl|awk '{print $1}'` "#---------" mb2md.pl | grep -v "#-----" | grep -v "#!/" | \ cut -c3- > readme.txt touch -r %{SOURCE0} readme.txt %build %install rm -rf %{buildroot} install -D -p -m 755 mb2md.pl %{buildroot}%{_bindir}/mb2md %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc changelog.txt readme.txt %{_bindir}/mb2md %changelog * Tue May 05 2009 Jussi Lehtola - 3.20-3 - Changed name of installed script from mb2md.pl to mb2md. - Added generated readme file to %%doc. * Mon Apr 27 2009 Jussi Lehtola - 3.20-2 - Fixed awk argument, trimmed description. * Mon Apr 27 2009 Jussi Lehtola - 3.20-1 - First release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mb2md/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 6 May 2009 21:04:03 -0000 1.1 +++ .cvsignore 6 May 2009 21:15:13 -0000 1.2 @@ -0,0 +1 @@ +mb2md-3.20.pl.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mb2md/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 6 May 2009 21:04:03 -0000 1.1 +++ sources 6 May 2009 21:15:13 -0000 1.2 @@ -0,0 +1 @@ +b47eaa6ae4231a42f4a15564a08eb439 mb2md-3.20.pl.gz From pkgdb at fedoraproject.org Wed May 6 21:16:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:16:05 +0000 Subject: [pkgdb] gcolor2 was added for cwickert Message-ID: <20090506211605.87E7410F8A3@bastion2.fedora.phx.redhat.com> kevin has added Package gcolor2 with summary Simple color selector for GTK+2 kevin has approved Package gcolor2 kevin has added a Fedora devel branch for gcolor2 with an owner of cwickert kevin has approved gcolor2 in Fedora devel kevin has approved Package gcolor2 kevin has set commit to Approved for provenpackager on gcolor2 (Fedora devel) kevin has set build to Approved for provenpackager on gcolor2 (Fedora devel) kevin has set checkout to Approved for provenpackager on gcolor2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gcolor2 From pkgdb at fedoraproject.org Wed May 6 21:16:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:16:06 +0000 Subject: [pkgdb] gcolor2 (Fedora, 10) updated by kevin Message-ID: <20090506211606.A8E8510F8A6@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for gcolor2 kevin has set commit to Approved for provenpackager on gcolor2 (Fedora 10) kevin has set build to Approved for provenpackager on gcolor2 (Fedora 10) kevin has set checkout to Approved for provenpackager on gcolor2 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gcolor2 From pkgdb at fedoraproject.org Wed May 6 21:16:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:16:06 +0000 Subject: [pkgdb] gcolor2 (Fedora, 11) updated by kevin Message-ID: <20090506211606.B508C10F8A9@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for gcolor2 kevin has set commit to Approved for provenpackager on gcolor2 (Fedora 11) kevin has set build to Approved for provenpackager on gcolor2 (Fedora 11) kevin has set checkout to Approved for provenpackager on gcolor2 (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gcolor2 From kevin at fedoraproject.org Wed May 6 21:16:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:16:17 +0000 (UTC) Subject: rpms/gcolor2 - New directory Message-ID: <20090506211617.34BC470108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gcolor2 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM24324/rpms/gcolor2 Log Message: Directory /cvs/pkgs/rpms/gcolor2 added to the repository From kevin at fedoraproject.org Wed May 6 21:16:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:16:17 +0000 (UTC) Subject: rpms/gcolor2/devel - New directory Message-ID: <20090506211617.8B60370108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gcolor2/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM24324/rpms/gcolor2/devel Log Message: Directory /cvs/pkgs/rpms/gcolor2/devel added to the repository From pkgdb at fedoraproject.org Wed May 6 21:16:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:16:06 +0000 Subject: [pkgdb] gcolor2 (Fedora, 9) updated by kevin Message-ID: <20090506211606.BDD4810F8AC@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for gcolor2 kevin has set commit to Approved for provenpackager on gcolor2 (Fedora 9) kevin has set build to Approved for provenpackager on gcolor2 (Fedora 9) kevin has set checkout to Approved for provenpackager on gcolor2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gcolor2 From kevin at fedoraproject.org Wed May 6 21:16:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:16:30 +0000 (UTC) Subject: rpms/gcolor2 Makefile,NONE,1.1 Message-ID: <20090506211630.C63D070108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gcolor2 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM24324/rpms/gcolor2 Added Files: Makefile Log Message: Setup of module gcolor2 --- NEW FILE Makefile --- # Top level Makefile for module gcolor2 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 kevin at fedoraproject.org Wed May 6 21:16:31 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:16:31 +0000 (UTC) Subject: rpms/gcolor2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211631.31F7F70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/gcolor2/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM24324/rpms/gcolor2/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gcolor2 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gcolor2 # $Id: Makefile,v 1.1 2009/05/06 21:16:31 kevin Exp $ NAME := gcolor2 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 pkgdb at fedoraproject.org Wed May 6 21:16:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:16:46 +0000 Subject: [pkgdb] xfce4-cddrive-plugin was added for cwickert Message-ID: <20090506211646.50FF010F890@bastion2.fedora.phx.redhat.com> kevin has added Package xfce4-cddrive-plugin with summary Xfce panel plugin to open or close a CD-ROM drive tray kevin has approved Package xfce4-cddrive-plugin kevin has added a Fedora devel branch for xfce4-cddrive-plugin with an owner of cwickert kevin has approved xfce4-cddrive-plugin in Fedora devel kevin has approved Package xfce4-cddrive-plugin kevin has set commit to Approved for provenpackager on xfce4-cddrive-plugin (Fedora devel) kevin has set build to Approved for provenpackager on xfce4-cddrive-plugin (Fedora devel) kevin has set checkout to Approved for provenpackager on xfce4-cddrive-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-cddrive-plugin From pkgdb at fedoraproject.org Wed May 6 21:16:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:16:47 +0000 Subject: [pkgdb] xfce4-cddrive-plugin (Fedora, 10) updated by kevin Message-ID: <20090506211647.D8EE410F8A0@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for xfce4-cddrive-plugin kevin has set commit to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 10) kevin has set build to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 10) kevin has set checkout to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-cddrive-plugin From pkgdb at fedoraproject.org Wed May 6 21:16:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:16:47 +0000 Subject: [pkgdb] xfce4-cddrive-plugin (Fedora, 9) updated by kevin Message-ID: <20090506211647.E334610F8AA@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for xfce4-cddrive-plugin kevin has set commit to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 9) kevin has set build to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 9) kevin has set checkout to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-cddrive-plugin From kevin at fedoraproject.org Wed May 6 21:17:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:17:00 +0000 (UTC) Subject: rpms/xfce4-cddrive-plugin - New directory Message-ID: <20090506211700.3816870108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-cddrive-plugin In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd24660/rpms/xfce4-cddrive-plugin Log Message: Directory /cvs/pkgs/rpms/xfce4-cddrive-plugin added to the repository From pkgdb at fedoraproject.org Wed May 6 21:16:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:16:47 +0000 Subject: [pkgdb] xfce4-cddrive-plugin (Fedora, 11) updated by kevin Message-ID: <20090506211647.EBB7F10F8AF@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for xfce4-cddrive-plugin kevin has set commit to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 11) kevin has set build to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 11) kevin has set checkout to Approved for provenpackager on xfce4-cddrive-plugin (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-cddrive-plugin From kevin at fedoraproject.org Wed May 6 21:17:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:17:00 +0000 (UTC) Subject: rpms/xfce4-cddrive-plugin/devel - New directory Message-ID: <20090506211700.9D18C70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-cddrive-plugin/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd24660/rpms/xfce4-cddrive-plugin/devel Log Message: Directory /cvs/pkgs/rpms/xfce4-cddrive-plugin/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:17:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:17:13 +0000 (UTC) Subject: rpms/xfce4-cddrive-plugin Makefile,NONE,1.1 Message-ID: <20090506211713.D019070108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-cddrive-plugin In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd24660/rpms/xfce4-cddrive-plugin Added Files: Makefile Log Message: Setup of module xfce4-cddrive-plugin --- NEW FILE Makefile --- # Top level Makefile for module xfce4-cddrive-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 kevin at fedoraproject.org Wed May 6 21:17:14 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:17:14 +0000 (UTC) Subject: rpms/xfce4-cddrive-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211714.2CEDA70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-cddrive-plugin/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd24660/rpms/xfce4-cddrive-plugin/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-cddrive-plugin --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfce4-cddrive-plugin # $Id: Makefile,v 1.1 2009/05/06 21:17:14 kevin Exp $ NAME := xfce4-cddrive-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 pkgdb at fedoraproject.org Wed May 6 21:17:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:17:27 +0000 Subject: [pkgdb] xfce4-cellmodem-plugin was added for cwickert Message-ID: <20090506211727.599F610F8A1@bastion2.fedora.phx.redhat.com> kevin has added Package xfce4-cellmodem-plugin with summary Cell Modem monitor plugin for the Xfce panel kevin has approved Package xfce4-cellmodem-plugin kevin has added a Fedora devel branch for xfce4-cellmodem-plugin with an owner of cwickert kevin has approved xfce4-cellmodem-plugin in Fedora devel kevin has approved Package xfce4-cellmodem-plugin kevin has set commit to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora devel) kevin has set build to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora devel) kevin has set checkout to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-cellmodem-plugin From pkgdb at fedoraproject.org Wed May 6 21:17:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:17:28 +0000 Subject: [pkgdb] xfce4-cellmodem-plugin (Fedora, 9) updated by kevin Message-ID: <20090506211728.8DAF210F8A5@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for xfce4-cellmodem-plugin kevin has set commit to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 9) kevin has set build to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 9) kevin has set checkout to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-cellmodem-plugin From pkgdb at fedoraproject.org Wed May 6 21:17:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:17:28 +0000 Subject: [pkgdb] xfce4-cellmodem-plugin (Fedora, 10) updated by kevin Message-ID: <20090506211728.9631110F8BD@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for xfce4-cellmodem-plugin kevin has set commit to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 10) kevin has set build to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 10) kevin has set checkout to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-cellmodem-plugin From pkgdb at fedoraproject.org Wed May 6 21:17:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:17:28 +0000 Subject: [pkgdb] xfce4-cellmodem-plugin (Fedora, 11) updated by kevin Message-ID: <20090506211728.A72F710F8C0@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for xfce4-cellmodem-plugin kevin has set commit to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 11) kevin has set build to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 11) kevin has set checkout to Approved for provenpackager on xfce4-cellmodem-plugin (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-cellmodem-plugin From kevin at fedoraproject.org Wed May 6 21:17:38 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:17:38 +0000 (UTC) Subject: rpms/xfce4-cellmodem-plugin - New directory Message-ID: <20090506211738.382D770108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-cellmodem-plugin In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY25072/rpms/xfce4-cellmodem-plugin Log Message: Directory /cvs/pkgs/rpms/xfce4-cellmodem-plugin added to the repository From kevin at fedoraproject.org Wed May 6 21:17:38 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:17:38 +0000 (UTC) Subject: rpms/xfce4-cellmodem-plugin/devel - New directory Message-ID: <20090506211738.791D970108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-cellmodem-plugin/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY25072/rpms/xfce4-cellmodem-plugin/devel Log Message: Directory /cvs/pkgs/rpms/xfce4-cellmodem-plugin/devel added to the repository From jussilehtola at fedoraproject.org Wed May 6 21:17:45 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:17:45 +0000 (UTC) Subject: rpms/mb2md/EL-4 mb2md.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090506211745.0648B70108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24631/EL-4 Modified Files: sources Added Files: mb2md.spec Log Message: Import in Fedora. --- NEW FILE mb2md.spec --- Name: mb2md Version: 3.20 Release: 3%{?dist} Summary: Mailbox to maildir converter Group: Applications/Internet License: Public Domain URL: http://batleth.sapienti-sat.org/projects/mb2md Source0: http://batleth.sapienti-sat.org/projects/mb2md/mb2md-%{version}.pl.gz Source1: http://batleth.sapienti-sat.org/projects/mb2md/changelog.txt BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Convert your emails folders in mailbox format to maildirs. Some of the current features of mb2md.pl are: * converting the user's main mailbox that is referenced by the $MAIL variable * converting a single mailbox into corresponding maildir * converting multiple mailboxes in a directory into corresponding maildirs * recursive operation on a given directory to convert the complete mail storage of one user * replaces all occurrences of dots ('.') in a mailbox name by underscores ('_') * is able to handle spaces in mailbox names * converts mbox files in DOS format (CRLF) to Unix file format * can strip an extension (e.g. ".mbx") from a mailbox name prior to converting * removal of dummy message that a couple of IMAP servers (e.g. UW-IMAPD) put at the beginning of a mailbox * setting the file date of a converted message according to the date found in the "From " line of the original mail * setting the flags F,R,S,T (flagged, replied, seen, deleted) on the filename of the converted message according to the flags found in "Status:"/"X-Status:"/"X-Mozilla-Status:"/"X-Evolution:" headers of the original mail %prep %setup -q -Tc -n %{name}-%{version} # Setup executable gunzip -c %{SOURCE0} > mb2md.pl touch -r %{SOURCE0} mb2md.pl # Copy changelog cp -a %{SOURCE1} . ### Generate documentation # #--- denotes the end of the documentation section; get everything before # that, remove the shebang and the hash commentation grep -B `wc -l mb2md.pl|awk '{print $1}'` "#---------" mb2md.pl | grep -v "#-----" | grep -v "#!/" | \ cut -c3- > readme.txt touch -r %{SOURCE0} readme.txt %build %install rm -rf %{buildroot} install -D -p -m 755 mb2md.pl %{buildroot}%{_bindir}/mb2md %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc changelog.txt readme.txt %{_bindir}/mb2md %changelog * Tue May 05 2009 Jussi Lehtola - 3.20-3 - Changed name of installed script from mb2md.pl to mb2md. - Added generated readme file to %%doc. * Mon Apr 27 2009 Jussi Lehtola - 3.20-2 - Fixed awk argument, trimmed description. * Mon Apr 27 2009 Jussi Lehtola - 3.20-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mb2md/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 6 May 2009 21:04:03 -0000 1.1 +++ sources 6 May 2009 21:17:14 -0000 1.2 @@ -0,0 +1 @@ +b47eaa6ae4231a42f4a15564a08eb439 mb2md-3.20.pl.gz From jussilehtola at fedoraproject.org Wed May 6 21:17:45 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:17:45 +0000 (UTC) Subject: rpms/mb2md/EL-5 mb2md.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090506211745.564FD70108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24631/EL-5 Modified Files: sources Added Files: mb2md.spec Log Message: Import in Fedora. --- NEW FILE mb2md.spec --- Name: mb2md Version: 3.20 Release: 3%{?dist} Summary: Mailbox to maildir converter Group: Applications/Internet License: Public Domain URL: http://batleth.sapienti-sat.org/projects/mb2md Source0: http://batleth.sapienti-sat.org/projects/mb2md/mb2md-%{version}.pl.gz Source1: http://batleth.sapienti-sat.org/projects/mb2md/changelog.txt BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Convert your emails folders in mailbox format to maildirs. Some of the current features of mb2md.pl are: * converting the user's main mailbox that is referenced by the $MAIL variable * converting a single mailbox into corresponding maildir * converting multiple mailboxes in a directory into corresponding maildirs * recursive operation on a given directory to convert the complete mail storage of one user * replaces all occurrences of dots ('.') in a mailbox name by underscores ('_') * is able to handle spaces in mailbox names * converts mbox files in DOS format (CRLF) to Unix file format * can strip an extension (e.g. ".mbx") from a mailbox name prior to converting * removal of dummy message that a couple of IMAP servers (e.g. UW-IMAPD) put at the beginning of a mailbox * setting the file date of a converted message according to the date found in the "From " line of the original mail * setting the flags F,R,S,T (flagged, replied, seen, deleted) on the filename of the converted message according to the flags found in "Status:"/"X-Status:"/"X-Mozilla-Status:"/"X-Evolution:" headers of the original mail %prep %setup -q -Tc -n %{name}-%{version} # Setup executable gunzip -c %{SOURCE0} > mb2md.pl touch -r %{SOURCE0} mb2md.pl # Copy changelog cp -a %{SOURCE1} . ### Generate documentation # #--- denotes the end of the documentation section; get everything before # that, remove the shebang and the hash commentation grep -B `wc -l mb2md.pl|awk '{print $1}'` "#---------" mb2md.pl | grep -v "#-----" | grep -v "#!/" | \ cut -c3- > readme.txt touch -r %{SOURCE0} readme.txt %build %install rm -rf %{buildroot} install -D -p -m 755 mb2md.pl %{buildroot}%{_bindir}/mb2md %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc changelog.txt readme.txt %{_bindir}/mb2md %changelog * Tue May 05 2009 Jussi Lehtola - 3.20-3 - Changed name of installed script from mb2md.pl to mb2md. - Added generated readme file to %%doc. * Mon Apr 27 2009 Jussi Lehtola - 3.20-2 - Fixed awk argument, trimmed description. * Mon Apr 27 2009 Jussi Lehtola - 3.20-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mb2md/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 6 May 2009 21:04:03 -0000 1.1 +++ sources 6 May 2009 21:17:15 -0000 1.2 @@ -0,0 +1 @@ +b47eaa6ae4231a42f4a15564a08eb439 mb2md-3.20.pl.gz From jussilehtola at fedoraproject.org Wed May 6 21:17:45 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:17:45 +0000 (UTC) Subject: rpms/mb2md/F-10 mb2md.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090506211745.A040E70108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24631/F-10 Modified Files: sources Added Files: mb2md.spec Log Message: Import in Fedora. --- NEW FILE mb2md.spec --- Name: mb2md Version: 3.20 Release: 3%{?dist} Summary: Mailbox to maildir converter Group: Applications/Internet License: Public Domain URL: http://batleth.sapienti-sat.org/projects/mb2md Source0: http://batleth.sapienti-sat.org/projects/mb2md/mb2md-%{version}.pl.gz Source1: http://batleth.sapienti-sat.org/projects/mb2md/changelog.txt BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Convert your emails folders in mailbox format to maildirs. Some of the current features of mb2md.pl are: * converting the user's main mailbox that is referenced by the $MAIL variable * converting a single mailbox into corresponding maildir * converting multiple mailboxes in a directory into corresponding maildirs * recursive operation on a given directory to convert the complete mail storage of one user * replaces all occurrences of dots ('.') in a mailbox name by underscores ('_') * is able to handle spaces in mailbox names * converts mbox files in DOS format (CRLF) to Unix file format * can strip an extension (e.g. ".mbx") from a mailbox name prior to converting * removal of dummy message that a couple of IMAP servers (e.g. UW-IMAPD) put at the beginning of a mailbox * setting the file date of a converted message according to the date found in the "From " line of the original mail * setting the flags F,R,S,T (flagged, replied, seen, deleted) on the filename of the converted message according to the flags found in "Status:"/"X-Status:"/"X-Mozilla-Status:"/"X-Evolution:" headers of the original mail %prep %setup -q -Tc -n %{name}-%{version} # Setup executable gunzip -c %{SOURCE0} > mb2md.pl touch -r %{SOURCE0} mb2md.pl # Copy changelog cp -a %{SOURCE1} . ### Generate documentation # #--- denotes the end of the documentation section; get everything before # that, remove the shebang and the hash commentation grep -B `wc -l mb2md.pl|awk '{print $1}'` "#---------" mb2md.pl | grep -v "#-----" | grep -v "#!/" | \ cut -c3- > readme.txt touch -r %{SOURCE0} readme.txt %build %install rm -rf %{buildroot} install -D -p -m 755 mb2md.pl %{buildroot}%{_bindir}/mb2md %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc changelog.txt readme.txt %{_bindir}/mb2md %changelog * Tue May 05 2009 Jussi Lehtola - 3.20-3 - Changed name of installed script from mb2md.pl to mb2md. - Added generated readme file to %%doc. * Mon Apr 27 2009 Jussi Lehtola - 3.20-2 - Fixed awk argument, trimmed description. * Mon Apr 27 2009 Jussi Lehtola - 3.20-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mb2md/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 6 May 2009 21:04:03 -0000 1.1 +++ sources 6 May 2009 21:17:15 -0000 1.2 @@ -0,0 +1 @@ +b47eaa6ae4231a42f4a15564a08eb439 mb2md-3.20.pl.gz From jussilehtola at fedoraproject.org Wed May 6 21:17:46 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:17:46 +0000 (UTC) Subject: rpms/mb2md/F-11 mb2md.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090506211746.06AC570108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24631/F-11 Modified Files: sources Added Files: mb2md.spec Log Message: Import in Fedora. --- NEW FILE mb2md.spec --- Name: mb2md Version: 3.20 Release: 3%{?dist} Summary: Mailbox to maildir converter Group: Applications/Internet License: Public Domain URL: http://batleth.sapienti-sat.org/projects/mb2md Source0: http://batleth.sapienti-sat.org/projects/mb2md/mb2md-%{version}.pl.gz Source1: http://batleth.sapienti-sat.org/projects/mb2md/changelog.txt BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Convert your emails folders in mailbox format to maildirs. Some of the current features of mb2md.pl are: * converting the user's main mailbox that is referenced by the $MAIL variable * converting a single mailbox into corresponding maildir * converting multiple mailboxes in a directory into corresponding maildirs * recursive operation on a given directory to convert the complete mail storage of one user * replaces all occurrences of dots ('.') in a mailbox name by underscores ('_') * is able to handle spaces in mailbox names * converts mbox files in DOS format (CRLF) to Unix file format * can strip an extension (e.g. ".mbx") from a mailbox name prior to converting * removal of dummy message that a couple of IMAP servers (e.g. UW-IMAPD) put at the beginning of a mailbox * setting the file date of a converted message according to the date found in the "From " line of the original mail * setting the flags F,R,S,T (flagged, replied, seen, deleted) on the filename of the converted message according to the flags found in "Status:"/"X-Status:"/"X-Mozilla-Status:"/"X-Evolution:" headers of the original mail %prep %setup -q -Tc -n %{name}-%{version} # Setup executable gunzip -c %{SOURCE0} > mb2md.pl touch -r %{SOURCE0} mb2md.pl # Copy changelog cp -a %{SOURCE1} . ### Generate documentation # #--- denotes the end of the documentation section; get everything before # that, remove the shebang and the hash commentation grep -B `wc -l mb2md.pl|awk '{print $1}'` "#---------" mb2md.pl | grep -v "#-----" | grep -v "#!/" | \ cut -c3- > readme.txt touch -r %{SOURCE0} readme.txt %build %install rm -rf %{buildroot} install -D -p -m 755 mb2md.pl %{buildroot}%{_bindir}/mb2md %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc changelog.txt readme.txt %{_bindir}/mb2md %changelog * Tue May 05 2009 Jussi Lehtola - 3.20-3 - Changed name of installed script from mb2md.pl to mb2md. - Added generated readme file to %%doc. * Mon Apr 27 2009 Jussi Lehtola - 3.20-2 - Fixed awk argument, trimmed description. * Mon Apr 27 2009 Jussi Lehtola - 3.20-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mb2md/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 6 May 2009 21:04:03 -0000 1.1 +++ sources 6 May 2009 21:17:15 -0000 1.2 @@ -0,0 +1 @@ +b47eaa6ae4231a42f4a15564a08eb439 mb2md-3.20.pl.gz From kevin at fedoraproject.org Wed May 6 21:17:49 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:17:49 +0000 (UTC) Subject: rpms/xfce4-cellmodem-plugin Makefile,NONE,1.1 Message-ID: <20090506211749.ED64F70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-cellmodem-plugin In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY25072/rpms/xfce4-cellmodem-plugin Added Files: Makefile Log Message: Setup of module xfce4-cellmodem-plugin --- NEW FILE Makefile --- # Top level Makefile for module xfce4-cellmodem-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 kevin at fedoraproject.org Wed May 6 21:17:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:17:50 +0000 (UTC) Subject: rpms/xfce4-cellmodem-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211750.3E50A70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-cellmodem-plugin/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY25072/rpms/xfce4-cellmodem-plugin/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-cellmodem-plugin --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfce4-cellmodem-plugin # $Id: Makefile,v 1.1 2009/05/06 21:17:50 kevin Exp $ NAME := xfce4-cellmodem-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 pkgdb at fedoraproject.org Wed May 6 21:18:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:18:06 +0000 Subject: [pkgdb] xfce4-notifyd was added for cwickert Message-ID: <20090506211806.3DC8910F8A9@bastion2.fedora.phx.redhat.com> kevin has added Package xfce4-notifyd with summary Simple notification daemon for Xfce kevin has approved Package xfce4-notifyd kevin has added a Fedora devel branch for xfce4-notifyd with an owner of cwickert kevin has approved xfce4-notifyd in Fedora devel kevin has approved Package xfce4-notifyd kevin has set commit to Approved for provenpackager on xfce4-notifyd (Fedora devel) kevin has set build to Approved for provenpackager on xfce4-notifyd (Fedora devel) kevin has set checkout to Approved for provenpackager on xfce4-notifyd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-notifyd From pkgdb at fedoraproject.org Wed May 6 21:18:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:18:07 +0000 Subject: [pkgdb] xfce4-notifyd (Fedora, 10) updated by kevin Message-ID: <20090506211807.CECFB10F8CA@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for xfce4-notifyd kevin has set commit to Approved for provenpackager on xfce4-notifyd (Fedora 10) kevin has set build to Approved for provenpackager on xfce4-notifyd (Fedora 10) kevin has set checkout to Approved for provenpackager on xfce4-notifyd (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-notifyd From pkgdb at fedoraproject.org Wed May 6 21:18:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:18:07 +0000 Subject: [pkgdb] xfce4-notifyd (Fedora, 9) updated by kevin Message-ID: <20090506211807.D72BC10F8CF@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for xfce4-notifyd kevin has set commit to Approved for provenpackager on xfce4-notifyd (Fedora 9) kevin has set build to Approved for provenpackager on xfce4-notifyd (Fedora 9) kevin has set checkout to Approved for provenpackager on xfce4-notifyd (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-notifyd From pkgdb at fedoraproject.org Wed May 6 21:18:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:18:07 +0000 Subject: [pkgdb] xfce4-notifyd (Fedora, 11) updated by kevin Message-ID: <20090506211807.DFC9A10F8D2@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for xfce4-notifyd kevin has set commit to Approved for provenpackager on xfce4-notifyd (Fedora 11) kevin has set build to Approved for provenpackager on xfce4-notifyd (Fedora 11) kevin has set checkout to Approved for provenpackager on xfce4-notifyd (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-notifyd From kevin at fedoraproject.org Wed May 6 21:18:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:18:17 +0000 (UTC) Subject: rpms/xfce4-notifyd/devel - New directory Message-ID: <20090506211817.8E89F70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-notifyd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA25350/rpms/xfce4-notifyd/devel Log Message: Directory /cvs/pkgs/rpms/xfce4-notifyd/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:18:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:18:17 +0000 (UTC) Subject: rpms/xfce4-notifyd - New directory Message-ID: <20090506211817.3CDF870108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-notifyd In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA25350/rpms/xfce4-notifyd Log Message: Directory /cvs/pkgs/rpms/xfce4-notifyd added to the repository From kevin at fedoraproject.org Wed May 6 21:18:31 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:18:31 +0000 (UTC) Subject: rpms/xfce4-notifyd Makefile,NONE,1.1 Message-ID: <20090506211831.38EB970108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-notifyd In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA25350/rpms/xfce4-notifyd Added Files: Makefile Log Message: Setup of module xfce4-notifyd --- NEW FILE Makefile --- # Top level Makefile for module xfce4-notifyd 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 kevin at fedoraproject.org Wed May 6 21:18:31 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:18:31 +0000 (UTC) Subject: rpms/xfce4-notifyd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211831.A160970108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-notifyd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA25350/rpms/xfce4-notifyd/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-notifyd --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfce4-notifyd # $Id: Makefile,v 1.1 2009/05/06 21:18:31 kevin Exp $ NAME := xfce4-notifyd 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 pkgdb at fedoraproject.org Wed May 6 21:18:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:18:44 +0000 Subject: [pkgdb] xfce4-radio-plugin was added for cwickert Message-ID: <20090506211844.CE6DC10F8AD@bastion2.fedora.phx.redhat.com> kevin has added Package xfce4-radio-plugin with summary V4l radio device control plugin for the Xfce panel kevin has approved Package xfce4-radio-plugin kevin has added a Fedora devel branch for xfce4-radio-plugin with an owner of cwickert kevin has approved xfce4-radio-plugin in Fedora devel kevin has approved Package xfce4-radio-plugin kevin has set commit to Approved for provenpackager on xfce4-radio-plugin (Fedora devel) kevin has set build to Approved for provenpackager on xfce4-radio-plugin (Fedora devel) kevin has set checkout to Approved for provenpackager on xfce4-radio-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-radio-plugin From pkgdb at fedoraproject.org Wed May 6 21:18:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:18:45 +0000 Subject: [pkgdb] xfce4-radio-plugin (Fedora, 10) updated by kevin Message-ID: <20090506211846.06A7810F8B1@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for xfce4-radio-plugin kevin has set commit to Approved for provenpackager on xfce4-radio-plugin (Fedora 10) kevin has set build to Approved for provenpackager on xfce4-radio-plugin (Fedora 10) kevin has set checkout to Approved for provenpackager on xfce4-radio-plugin (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-radio-plugin From pkgdb at fedoraproject.org Wed May 6 21:18:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:18:45 +0000 Subject: [pkgdb] xfce4-radio-plugin (Fedora, 11) updated by kevin Message-ID: <20090506211846.1163310F8C1@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for xfce4-radio-plugin kevin has set commit to Approved for provenpackager on xfce4-radio-plugin (Fedora 11) kevin has set build to Approved for provenpackager on xfce4-radio-plugin (Fedora 11) kevin has set checkout to Approved for provenpackager on xfce4-radio-plugin (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-radio-plugin From pkgdb at fedoraproject.org Wed May 6 21:18:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:18:45 +0000 Subject: [pkgdb] xfce4-radio-plugin (Fedora, 9) updated by kevin Message-ID: <20090506211846.1A2EF10F8DB@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for xfce4-radio-plugin kevin has set commit to Approved for provenpackager on xfce4-radio-plugin (Fedora 9) kevin has set build to Approved for provenpackager on xfce4-radio-plugin (Fedora 9) kevin has set checkout to Approved for provenpackager on xfce4-radio-plugin (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-radio-plugin From kevin at fedoraproject.org Wed May 6 21:18:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:18:56 +0000 (UTC) Subject: rpms/xfce4-radio-plugin - New directory Message-ID: <20090506211856.45E6F70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-radio-plugin In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa25783/rpms/xfce4-radio-plugin Log Message: Directory /cvs/pkgs/rpms/xfce4-radio-plugin added to the repository From kevin at fedoraproject.org Wed May 6 21:18:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:18:56 +0000 (UTC) Subject: rpms/xfce4-radio-plugin/devel - New directory Message-ID: <20090506211856.CD19670108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-radio-plugin/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa25783/rpms/xfce4-radio-plugin/devel Log Message: Directory /cvs/pkgs/rpms/xfce4-radio-plugin/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:19:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:19:09 +0000 (UTC) Subject: rpms/xfce4-radio-plugin Makefile,NONE,1.1 Message-ID: <20090506211909.7E03070108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-radio-plugin In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa25783/rpms/xfce4-radio-plugin Added Files: Makefile Log Message: Setup of module xfce4-radio-plugin --- NEW FILE Makefile --- # Top level Makefile for module xfce4-radio-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 kevin at fedoraproject.org Wed May 6 21:19:10 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:19:10 +0000 (UTC) Subject: rpms/xfce4-radio-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506211910.08E9170108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/xfce4-radio-plugin/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa25783/rpms/xfce4-radio-plugin/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-radio-plugin --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfce4-radio-plugin # $Id: Makefile,v 1.1 2009/05/06 21:19:09 kevin Exp $ NAME := xfce4-radio-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 pkgdb at fedoraproject.org Wed May 6 21:19:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:19:34 +0000 Subject: [pkgdb] meterbridge was added for oget Message-ID: <20090506211934.3D14B10F8BB@bastion2.fedora.phx.redhat.com> kevin has added Package meterbridge with summary Meter Bridge for JACK kevin has approved Package meterbridge kevin has added a Fedora devel branch for meterbridge with an owner of oget kevin has approved meterbridge in Fedora devel kevin has approved Package meterbridge kevin has set commit to Approved for provenpackager on meterbridge (Fedora devel) kevin has set build to Approved for provenpackager on meterbridge (Fedora devel) kevin has set checkout to Approved for provenpackager on meterbridge (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/meterbridge From pkgdb at fedoraproject.org Wed May 6 21:19:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:19:35 +0000 Subject: [pkgdb] meterbridge (Fedora, 10) updated by kevin Message-ID: <20090506211936.0190810F8C8@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for meterbridge kevin has set commit to Approved for provenpackager on meterbridge (Fedora 10) kevin has set build to Approved for provenpackager on meterbridge (Fedora 10) kevin has set checkout to Approved for provenpackager on meterbridge (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/meterbridge From pkgdb at fedoraproject.org Wed May 6 21:19:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:19:35 +0000 Subject: [pkgdb] meterbridge (Fedora, 9) updated by kevin Message-ID: <20090506211936.2223510F8CC@bastion2.fedora.phx.redhat.com> kevin added a Fedora 9 branch for meterbridge kevin has set commit to Approved for provenpackager on meterbridge (Fedora 9) kevin has set build to Approved for provenpackager on meterbridge (Fedora 9) kevin has set checkout to Approved for provenpackager on meterbridge (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/meterbridge From pkgdb at fedoraproject.org Wed May 6 21:19:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 06 May 2009 21:19:35 +0000 Subject: [pkgdb] meterbridge (Fedora, 11) updated by kevin Message-ID: <20090506211936.2C83110F8CE@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for meterbridge kevin has set commit to Approved for provenpackager on meterbridge (Fedora 11) kevin has set build to Approved for provenpackager on meterbridge (Fedora 11) kevin has set checkout to Approved for provenpackager on meterbridge (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/meterbridge From kevin at fedoraproject.org Wed May 6 21:19:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:19:54 +0000 (UTC) Subject: rpms/meterbridge - New directory Message-ID: <20090506211954.526FA70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/meterbridge In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26161/rpms/meterbridge Log Message: Directory /cvs/pkgs/rpms/meterbridge added to the repository From kevin at fedoraproject.org Wed May 6 21:19:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:19:54 +0000 (UTC) Subject: rpms/meterbridge/devel - New directory Message-ID: <20090506211954.A7FCD70108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/meterbridge/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26161/rpms/meterbridge/devel Log Message: Directory /cvs/pkgs/rpms/meterbridge/devel added to the repository From kevin at fedoraproject.org Wed May 6 21:20:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:20:09 +0000 (UTC) Subject: rpms/meterbridge Makefile,NONE,1.1 Message-ID: <20090506212009.951E170108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/meterbridge In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26161/rpms/meterbridge Added Files: Makefile Log Message: Setup of module meterbridge --- NEW FILE Makefile --- # Top level Makefile for module meterbridge 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 kevin at fedoraproject.org Wed May 6 21:20:10 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Wed, 6 May 2009 21:20:10 +0000 (UTC) Subject: rpms/meterbridge/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090506212010.9A82170108@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/meterbridge/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26161/rpms/meterbridge/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module meterbridge --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: meterbridge # $Id: Makefile,v 1.1 2009/05/06 21:20:10 kevin Exp $ NAME := meterbridge 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 ynemoy at fedoraproject.org Wed May 6 21:20:28 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Wed, 6 May 2009 21:20:28 +0000 (UTC) Subject: rpms/xmonad/devel import.log, NONE, 1.1 manpage.patch, NONE, 1.1 xmonad-start, NONE, 1.1 xmonad.desktop, NONE, 1.1 xmonad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090506212028.77A9C70108@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/xmonad/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26120/devel Modified Files: .cvsignore sources Added Files: import.log manpage.patch xmonad-start xmonad.desktop xmonad.spec Log Message: Initial import --- NEW FILE import.log --- xmonad-0_8_1-11_fc10:HEAD:xmonad-0.8.1-11.fc10.src.rpm:1241644704 manpage.patch: --- NEW FILE manpage.patch --- diff -r -u -X /home/yankee/Projekten/fedora-devshell/diff.excludes .pkg_src/branches/xmonad-0.8.1_orig/man/xmonad.hs ./man/xmonad.hs --- .pkg_src/branches/xmonad-0.8.1_orig/man/xmonad.hs 2009-01-16 17:47:27.000000000 -0500 +++ ./man/xmonad.hs 2009-04-27 18:31:12.195829219 -0400 @@ -246,7 +246,8 @@ -- Run xmonad with the settings you specify. No need to modify this. -- -main = xmonad defaults +main = do spawn "xterm -e '/usr/bin/man xmonad'" + xmonad defaults -- A structure containing your configuration settings, overriding -- fields in the default config. Any you don't override, will --- NEW FILE xmonad-start --- #!/bin/sh if [ ! -d ~/.xmonad ]; then mkdir -p ~/.xmonad cp /etc/skel/.xmonad/xmonad.hs ~/.xmonad/ fi exec xmonad --- NEW FILE xmonad.desktop --- [Desktop Entry] Encoding=UTF-8 Name=xmonad-start Comment=Tiling window manager Exec=xmonad-start Terminal=False TryExec=xmonad-start [Window Manager] SessionManaged=true # vi: encoding=utf-8 --- NEW FILE xmonad.spec --- %global X11_version 1.4.3 %bcond_without doc %bcond_without prof # ghc does not emit debug information %global debug_package %{nil} Name: xmonad Version: 0.8.1 Release: 11%{?dist} Summary: A tiling window manager Group: User Interface/X License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: xmonad.desktop Source2: xmonad-start Patch0: manpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc BuildRequires: ghc-X11-devel >= %{X11_version} %if %{with doc} BuildRequires: ghc-doc %endif %if %{with prof} BuildRequires: ghc-prof, ghc-X11-prof >= %{X11_version} %endif # for latest macros.ghc BuildRequires: ghc >= 6.10.2-3 Requires: ghc-%{name}-devel = %{version}-%{release} # required until there is a command to open some system default # xterminal Requires: xterm # for xmessage Requires: xorg-x11-apps %description xmonad is a tiling window manager for X. Windows are arranged automatically to tile the screen without gaps or overlap, maximising screen use. All features of the window manager are accessible from the keyboard: a mouse is strictly optional. xmonad is written and extensible in Haskell. Custom layout algorithms, and other extensions, may be written by the user in config files. Layouts are applied dynamically, and different layouts may be used on each workspace. Xinerama is fully supported, allowing windows to be tiled on several screens. %package -n ghc-%{name}-devel Summary: Haskell %{name} library Group: Development/Libraries Requires: ghc-X11-devel >= %{X11_version} Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} %description -n ghc-%{name}-devel This package provides the Haskell %{name} library built for ghc-%{ghc_version}. %if %{with doc} %package -n ghc-%{name}-doc Summary: Documentation for %{name} Group: Development/Libraries Requires: ghc-doc = %{ghc_version} Requires(post): ghc-doc = %{ghc_version} Requires(postun): ghc-doc = %{ghc_version} %description -n ghc-%{name}-doc This package contains development documentation files for the %{name} library. %endif %if %{with prof} %package -n ghc-%{name}-prof Summary: Profiling libraries for %{name} Group: Development/Libraries Requires: ghc-%{name}-devel = %{version}-%{release} Requires: ghc-X11-prof >= %{X11_version} Requires: ghc-prof = %{ghc_version} %description -n ghc-%{name}-prof This package contains profiling libraries for %{name}. %endif %prep %setup -q %patch0 -p0 %build %ifarch ppc # hack around mysterious runghc fail %global cabal ./cabal ghc --make Setup -o cabal %endif %cabal_configure --ghc %{?with_prof:-p} %cabal build %if %{with doc} %cabal haddock %endif %ghc_gen_scripts %install rm -rf $RPM_BUILD_ROOT %cabal_install %ghc_install_scripts %ghc_gen_filelists ghc-%{name} install -p -m 0644 -D man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 install -p -m 0644 -D %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop install -p -m 0755 -D %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/%{name}-start install -p -m 0644 -D man/xmonad.hs $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/%{name}.hs %clean rm -rf $RPM_BUILD_ROOT %post -n ghc-%{name}-devel %ghc_register_pkg %if %{with doc} %post -n ghc-%{name}-doc %ghc_reindex_haddock %endif %preun -n ghc-%{name}-devel if [ "$1" -eq 0 ] ; then %ghc_unregister_pkg fi %if %{with doc} %postun -n ghc-%{name}-doc if [ "$1" -eq 0 ] ; then %ghc_reindex_haddock fi %endif %files %defattr(-,root,root,-) %doc CONFIG LICENSE README STYLE TODO man/%{name}.hs %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/%{name}-start %{_mandir}/man1/%{name}.1* %{_datadir}/xsessions/%{name}.desktop %{_sysconfdir}/skel/.%{name}/%{name}.hs %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %defattr(-,root,root,-) %if %{with doc} %files -n ghc-%{name}-doc -f ghc-%{name}-doc.files %defattr(-,root,root,-) %endif %if %{with prof} %files -n ghc-%{name}-prof -f ghc-%{name}-prof.files %defattr(-,root,root,-) %endif %changelog * Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-11 - adds runghc hack taken from haddock * Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-10 - converts the sample config into a patch on the upstream source - renumbers down the source lines * Mon Apr 20 2009 Jens Petersen - 0.8.1-9 - update to latest macros.ghc without ghc_version (cabal2spec-0.15) - require xorg-x11-apps for xmessage * Mon Apr 6 2009 Jens Petersen - merge xmonad-session into xmonad-start - fix with_prof configure test * Thu Apr 02 2009 Till Maas - 0.8.1-8 - remove tabs in spec - rename start-xmonad to xmonad-start for consistency with xmonad-session - add directory creation and exec of xmonad to start-xmonad - install xmonad.hs that only displays manpage in /etc/skel/.xmonad/xmonad.hs - add xterm dependency * Tue Mar 31 2009 Yaakov M. Nemoy - 0.8.1-7 - added session and start scripts * Mon Mar 30 2009 Till Maas - 0.8.1-6 - add desktop file - install man page - include sample config file (xmonad.hs) - include other documentation files * Tue Mar 17 2009 Yaakov M. Nemoy - 0.8.1-5 - refixes permissions after doing it wrong the first time * Fri Mar 13 2009 Yaakov M. Nemoy - 0.8.1-4 - fixed license to BSD - fixed version of X11 to be a tad more flexible - fixes permissions of /usr/bin/xmonad * Mon Mar 2 2009 Yaakov M. Nemoy - 0.8.1-3 - updated to newest cabal2spec 0.12 - this includes the shiny new devel package * Tue Feb 24 2009 Yaakov M. Nemoy - 0.8.1-2 - updated spec to meet new guidelines ala cabal2spec 0.7 * Wed Jan 21 2009 ynemoy - 0.8.1-1 - initial packaging for Fedora created by cabal2spec Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xmonad/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 6 May 2009 20:56:25 -0000 1.1 +++ .cvsignore 6 May 2009 21:19:57 -0000 1.2 @@ -0,0 +1 @@ +xmonad-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xmonad/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 6 May 2009 20:56:25 -0000 1.1 +++ sources 6 May 2009 21:19:57 -0000 1.2 @@ -0,0 +1 @@ +03a8f0a420902d9eea3df1d8d62598c7 xmonad-0.8.1.tar.gz From jussilehtola at fedoraproject.org Wed May 6 21:23:56 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:23:56 +0000 (UTC) Subject: rpms/mb2md/EL-4 changelog.txt,NONE,1.1 Message-ID: <20090506212356.8135770108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26882/EL-4 Added Files: changelog.txt Log Message: Added missing changelog.txt from initial import. --- NEW FILE changelog.txt --- ---------------------------- revision 1.26 date: 2004/03/28 00:09:46; author: juri; state: Exp; lines: +1 -16 - and another documentation cleanup ---------------------------- revision 1.25 date: 2004/03/27 23:19:46; author: juri; state: Exp; lines: +18 -151 - bumped the version - cleaned up the introduction - removed the changelog entries (will be in a seperate file) ---------------------------- revision 1.24 date: 2004/03/24 21:02:15; author: juri; state: Exp; lines: +11 -3 - fix handling of leading and/or trailing white space in mbox names; thanks to Ian Gulliver ---------------------------- revision 1.23 date: 2004/03/22 22:37:04; author: juri; state: Exp; lines: +58 -4 - new option "-l ": UW-Imapd creates a list that holds the name of all subscibed mailboxes; this can be used to select which mbox files to convert - just give mb2md the option "-l" and specify the list file; thanks to Isaac Saldana for this one ---------------------------- revision 1.22 date: 2004/03/22 22:09:34; author: juri; state: Exp; lines: +35 -12 - make the use of the Content-Length header not the default - use the new option "-c" to enable this behaviour, because results may be unreliable if the header has wrong entries, which happens quite often - small documentation cleanup ---------------------------- revision 1.21 date: 2004/03/22 21:44:23; author: juri; state: Exp; lines: +11 -5 - cleaned up the handling of CRLF-delimited files; we now remove all CR from all lines so thaz we get real unix files as output ---------------------------- revision 1.20 date: 2004/03/20 01:57:50; author: juri; state: Exp; lines: +12 -13 - fix a regexp to get just the date of From_ line, ---------------------------- revision 1.19 date: 2004/03/19 23:05:25; author: juri; state: Exp; lines: +61 -4 - added support for the infamous mboxcl2 format (Content-Length: header) used by mutt; thanks to Chris Dunlop! ---------------------------- revision 1.18 date: 2004/03/19 18:34:23; author: juri; state: Exp; lines: +5 -2 - we ignore files that start with an empty line for now (reportedly Evolution may create such files - hope to support this violation of the mbox format later) ---------------------------- revision 1.17 date: 2004/03/19 17:59:52; author: juri; state: Exp; lines: +11 -4 - minor code cleanup ---------------------------- revision 1.16 date: 2004/03/19 17:33:00; author: juri; state: Exp; lines: +27 -1 - added support for Ximian Evolution's local mbox files (untested, as I don't have any Evolution mailboxes). Thanks to Jacob Barde for this one. - forgot the credit for the last commited patch (CRLF): Thanks goes to Martijn Polak! ---------------------------- revision 1.15 date: 2004/03/19 17:11:20; author: juri; state: Exp; lines: +9 -6 - we can now also handle mbox files in Windows format (CRLF delimited) ---------------------------- revision 1.14 date: 2004/03/19 16:41:35; author: juri; state: Exp; lines: +2 -2 - corrected a typo in the cvs Log tag ---------------------------- revision 1.13 date: 2004/03/19 16:39:42; author: juri; state: Exp; lines: +13 -1 - added change log entries for the last two fixes ---------------------------- revision 1.12 date: 2004/03/19 16:35:57; author: juri; state: Exp; lines: +3 -0 - added two cvs flags: $Id and $Logs ---------------------------- revision 1.11 date: 2004/03/19 16:31:11; author: juri; state: Exp; lines: +4 -8 - bug fix: follow the Maildir spec more closely: put all converted mail into the cur/ directory instead of new/ resolves problems with Courier-POP3d and bincimap Thanks to Richard Boulton. ---------------------------- revision 1.10 date: 2004/03/19 15:44:08; author: juri; state: Exp; lines: +10 -1 - bug fix: The program assumes that the environment setting $MAIL exists. No error checking is done, and no meaningful error is generated. Submitted by Glen Harris via the Debian package maintainer Noel Koethe ---------------------------- revision 1.9 date: 2004/03/11 01:24:13; author: juri; state: Exp; lines: +10 -4 - if specifying just a single file with -s, check whether it is a valid mbox file - if not, skip it ---------------------------- revision 1.8 date: 2003/11/11 14:49:26; author: juri; state: Exp; lines: +37 -33 - bugfix: if dummy message is present the last converted mail wasn't touched with the parsed date - patch by Wayne Davison: use Date::Parse from the TimeDate package to parse the From date and use the perl function utime() instead of touch; minor code cleanups ---------------------------- revision 1.7 date: 2003/11/11 14:47:26; author: juri; state: Exp; lines: +19 -55 - ripped out Geoffroy's changes concerning touch and FreeBSD and replaced it with a generic way that should work on all *BSD and Linux unfortunately you now need the Perl libwww package :( ---------------------------- revision 1.6 date: 2003/11/11 14:44:39; author: juri; state: Exp; lines: +7 -1 - bugfix: $unamecmd was set to /usr/bin/touch; grmbl cut-n-paste bug thanks to Nick Triantos ---------------------------- revision 1.5 date: 2003/11/11 14:43:22; author: juri; state: Exp; lines: +79 -33 - fixed a bug where dots (.) in foldernames weren't converted to '_' - fixed a bug where an empty file was created if we have a folder that has just a dummy message in it - incoorperated changes by Kjetil Torgrim Homme: handle "From " correctly - incoorperated changes by Ludovic Robinot: also use X-Mozilla-Status flags (local Mozilla mailboxes) ---------------------------- revision 1.4 date: 2003/11/11 14:41:56; author: juri; state: Exp; lines: +256 -121 changes by Geoffroy DESVERNAY: - added the '-R' switch, to permit 'one-pass conversion' - added a isamailboxfile() function to skip some 'address-book' or other files I found in users's 'Mail' directory - added a convertit() function to permit recursion - added a maildirmake() function to create empty folders (used the same code that used to create it) - added a '/bin/date' call in convert() to convert the date in case of *BSD system : it's now usable for a FreeBSD 4.7 system - added a $touchtimeswitch variable (*BSD touch need '-t' instead of '-d') - I tried not to change the default behaviour... hope it worked ! changes by Juri Haberland: - minor cleanups ---------------------------- revision 1.3 date: 2003/11/11 14:39:21; author: juri; state: Exp; lines: +227 -328 Changes by Jeff Williams: - put the mbox to maildir conversion into it's own function - made it possible to specify a source mbox file, rather than just the directory - destination can now be an absolute path instead of relative to the users home directory - the users mail directory for -m is found from $ENV{MAIL} rather than assumed to be in /var/spool/mail/$user - mbox files with .'s in their name have them converted to -'s - cleaned up a lot of the code and removed some unnecessary variables. Added the use strict pragma. ---------------------------- revision 1.2 date: 2002/10/23 14:26:27; author: juri; state: Exp; lines: +126 -85 Juri's collected changes: - fixed a bug in handling multiple source dirs - fixed a bug with zero-sized mailboxes - fixed a bug in handling "From:" headers that have a time zone - added optional absolute path names for the source dir - added the possibility to strip an extension from the mailboxes - added the command line interface to be more standard like ---------------------------- revision 1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; lines: +0 -0 - initial import including Robins's latest version 2.01 ============================================================================= From jussilehtola at fedoraproject.org Wed May 6 21:23:56 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:23:56 +0000 (UTC) Subject: rpms/mb2md/EL-5 changelog.txt,NONE,1.1 Message-ID: <20090506212356.C225070108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26882/EL-5 Added Files: changelog.txt Log Message: Added missing changelog.txt from initial import. --- NEW FILE changelog.txt --- ---------------------------- revision 1.26 date: 2004/03/28 00:09:46; author: juri; state: Exp; lines: +1 -16 - and another documentation cleanup ---------------------------- revision 1.25 date: 2004/03/27 23:19:46; author: juri; state: Exp; lines: +18 -151 - bumped the version - cleaned up the introduction - removed the changelog entries (will be in a seperate file) ---------------------------- revision 1.24 date: 2004/03/24 21:02:15; author: juri; state: Exp; lines: +11 -3 - fix handling of leading and/or trailing white space in mbox names; thanks to Ian Gulliver ---------------------------- revision 1.23 date: 2004/03/22 22:37:04; author: juri; state: Exp; lines: +58 -4 - new option "-l ": UW-Imapd creates a list that holds the name of all subscibed mailboxes; this can be used to select which mbox files to convert - just give mb2md the option "-l" and specify the list file; thanks to Isaac Saldana for this one ---------------------------- revision 1.22 date: 2004/03/22 22:09:34; author: juri; state: Exp; lines: +35 -12 - make the use of the Content-Length header not the default - use the new option "-c" to enable this behaviour, because results may be unreliable if the header has wrong entries, which happens quite often - small documentation cleanup ---------------------------- revision 1.21 date: 2004/03/22 21:44:23; author: juri; state: Exp; lines: +11 -5 - cleaned up the handling of CRLF-delimited files; we now remove all CR from all lines so thaz we get real unix files as output ---------------------------- revision 1.20 date: 2004/03/20 01:57:50; author: juri; state: Exp; lines: +12 -13 - fix a regexp to get just the date of From_ line, ---------------------------- revision 1.19 date: 2004/03/19 23:05:25; author: juri; state: Exp; lines: +61 -4 - added support for the infamous mboxcl2 format (Content-Length: header) used by mutt; thanks to Chris Dunlop! ---------------------------- revision 1.18 date: 2004/03/19 18:34:23; author: juri; state: Exp; lines: +5 -2 - we ignore files that start with an empty line for now (reportedly Evolution may create such files - hope to support this violation of the mbox format later) ---------------------------- revision 1.17 date: 2004/03/19 17:59:52; author: juri; state: Exp; lines: +11 -4 - minor code cleanup ---------------------------- revision 1.16 date: 2004/03/19 17:33:00; author: juri; state: Exp; lines: +27 -1 - added support for Ximian Evolution's local mbox files (untested, as I don't have any Evolution mailboxes). Thanks to Jacob Barde for this one. - forgot the credit for the last commited patch (CRLF): Thanks goes to Martijn Polak! ---------------------------- revision 1.15 date: 2004/03/19 17:11:20; author: juri; state: Exp; lines: +9 -6 - we can now also handle mbox files in Windows format (CRLF delimited) ---------------------------- revision 1.14 date: 2004/03/19 16:41:35; author: juri; state: Exp; lines: +2 -2 - corrected a typo in the cvs Log tag ---------------------------- revision 1.13 date: 2004/03/19 16:39:42; author: juri; state: Exp; lines: +13 -1 - added change log entries for the last two fixes ---------------------------- revision 1.12 date: 2004/03/19 16:35:57; author: juri; state: Exp; lines: +3 -0 - added two cvs flags: $Id and $Logs ---------------------------- revision 1.11 date: 2004/03/19 16:31:11; author: juri; state: Exp; lines: +4 -8 - bug fix: follow the Maildir spec more closely: put all converted mail into the cur/ directory instead of new/ resolves problems with Courier-POP3d and bincimap Thanks to Richard Boulton. ---------------------------- revision 1.10 date: 2004/03/19 15:44:08; author: juri; state: Exp; lines: +10 -1 - bug fix: The program assumes that the environment setting $MAIL exists. No error checking is done, and no meaningful error is generated. Submitted by Glen Harris via the Debian package maintainer Noel Koethe ---------------------------- revision 1.9 date: 2004/03/11 01:24:13; author: juri; state: Exp; lines: +10 -4 - if specifying just a single file with -s, check whether it is a valid mbox file - if not, skip it ---------------------------- revision 1.8 date: 2003/11/11 14:49:26; author: juri; state: Exp; lines: +37 -33 - bugfix: if dummy message is present the last converted mail wasn't touched with the parsed date - patch by Wayne Davison: use Date::Parse from the TimeDate package to parse the From date and use the perl function utime() instead of touch; minor code cleanups ---------------------------- revision 1.7 date: 2003/11/11 14:47:26; author: juri; state: Exp; lines: +19 -55 - ripped out Geoffroy's changes concerning touch and FreeBSD and replaced it with a generic way that should work on all *BSD and Linux unfortunately you now need the Perl libwww package :( ---------------------------- revision 1.6 date: 2003/11/11 14:44:39; author: juri; state: Exp; lines: +7 -1 - bugfix: $unamecmd was set to /usr/bin/touch; grmbl cut-n-paste bug thanks to Nick Triantos ---------------------------- revision 1.5 date: 2003/11/11 14:43:22; author: juri; state: Exp; lines: +79 -33 - fixed a bug where dots (.) in foldernames weren't converted to '_' - fixed a bug where an empty file was created if we have a folder that has just a dummy message in it - incoorperated changes by Kjetil Torgrim Homme: handle "From " correctly - incoorperated changes by Ludovic Robinot: also use X-Mozilla-Status flags (local Mozilla mailboxes) ---------------------------- revision 1.4 date: 2003/11/11 14:41:56; author: juri; state: Exp; lines: +256 -121 changes by Geoffroy DESVERNAY: - added the '-R' switch, to permit 'one-pass conversion' - added a isamailboxfile() function to skip some 'address-book' or other files I found in users's 'Mail' directory - added a convertit() function to permit recursion - added a maildirmake() function to create empty folders (used the same code that used to create it) - added a '/bin/date' call in convert() to convert the date in case of *BSD system : it's now usable for a FreeBSD 4.7 system - added a $touchtimeswitch variable (*BSD touch need '-t' instead of '-d') - I tried not to change the default behaviour... hope it worked ! changes by Juri Haberland: - minor cleanups ---------------------------- revision 1.3 date: 2003/11/11 14:39:21; author: juri; state: Exp; lines: +227 -328 Changes by Jeff Williams: - put the mbox to maildir conversion into it's own function - made it possible to specify a source mbox file, rather than just the directory - destination can now be an absolute path instead of relative to the users home directory - the users mail directory for -m is found from $ENV{MAIL} rather than assumed to be in /var/spool/mail/$user - mbox files with .'s in their name have them converted to -'s - cleaned up a lot of the code and removed some unnecessary variables. Added the use strict pragma. ---------------------------- revision 1.2 date: 2002/10/23 14:26:27; author: juri; state: Exp; lines: +126 -85 Juri's collected changes: - fixed a bug in handling multiple source dirs - fixed a bug with zero-sized mailboxes - fixed a bug in handling "From:" headers that have a time zone - added optional absolute path names for the source dir - added the possibility to strip an extension from the mailboxes - added the command line interface to be more standard like ---------------------------- revision 1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; lines: +0 -0 - initial import including Robins's latest version 2.01 ============================================================================= From jussilehtola at fedoraproject.org Wed May 6 21:23:57 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:23:57 +0000 (UTC) Subject: rpms/mb2md/F-10 changelog.txt,NONE,1.1 Message-ID: <20090506212357.2D70970108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26882/F-10 Added Files: changelog.txt Log Message: Added missing changelog.txt from initial import. --- NEW FILE changelog.txt --- ---------------------------- revision 1.26 date: 2004/03/28 00:09:46; author: juri; state: Exp; lines: +1 -16 - and another documentation cleanup ---------------------------- revision 1.25 date: 2004/03/27 23:19:46; author: juri; state: Exp; lines: +18 -151 - bumped the version - cleaned up the introduction - removed the changelog entries (will be in a seperate file) ---------------------------- revision 1.24 date: 2004/03/24 21:02:15; author: juri; state: Exp; lines: +11 -3 - fix handling of leading and/or trailing white space in mbox names; thanks to Ian Gulliver ---------------------------- revision 1.23 date: 2004/03/22 22:37:04; author: juri; state: Exp; lines: +58 -4 - new option "-l ": UW-Imapd creates a list that holds the name of all subscibed mailboxes; this can be used to select which mbox files to convert - just give mb2md the option "-l" and specify the list file; thanks to Isaac Saldana for this one ---------------------------- revision 1.22 date: 2004/03/22 22:09:34; author: juri; state: Exp; lines: +35 -12 - make the use of the Content-Length header not the default - use the new option "-c" to enable this behaviour, because results may be unreliable if the header has wrong entries, which happens quite often - small documentation cleanup ---------------------------- revision 1.21 date: 2004/03/22 21:44:23; author: juri; state: Exp; lines: +11 -5 - cleaned up the handling of CRLF-delimited files; we now remove all CR from all lines so thaz we get real unix files as output ---------------------------- revision 1.20 date: 2004/03/20 01:57:50; author: juri; state: Exp; lines: +12 -13 - fix a regexp to get just the date of From_ line, ---------------------------- revision 1.19 date: 2004/03/19 23:05:25; author: juri; state: Exp; lines: +61 -4 - added support for the infamous mboxcl2 format (Content-Length: header) used by mutt; thanks to Chris Dunlop! ---------------------------- revision 1.18 date: 2004/03/19 18:34:23; author: juri; state: Exp; lines: +5 -2 - we ignore files that start with an empty line for now (reportedly Evolution may create such files - hope to support this violation of the mbox format later) ---------------------------- revision 1.17 date: 2004/03/19 17:59:52; author: juri; state: Exp; lines: +11 -4 - minor code cleanup ---------------------------- revision 1.16 date: 2004/03/19 17:33:00; author: juri; state: Exp; lines: +27 -1 - added support for Ximian Evolution's local mbox files (untested, as I don't have any Evolution mailboxes). Thanks to Jacob Barde for this one. - forgot the credit for the last commited patch (CRLF): Thanks goes to Martijn Polak! ---------------------------- revision 1.15 date: 2004/03/19 17:11:20; author: juri; state: Exp; lines: +9 -6 - we can now also handle mbox files in Windows format (CRLF delimited) ---------------------------- revision 1.14 date: 2004/03/19 16:41:35; author: juri; state: Exp; lines: +2 -2 - corrected a typo in the cvs Log tag ---------------------------- revision 1.13 date: 2004/03/19 16:39:42; author: juri; state: Exp; lines: +13 -1 - added change log entries for the last two fixes ---------------------------- revision 1.12 date: 2004/03/19 16:35:57; author: juri; state: Exp; lines: +3 -0 - added two cvs flags: $Id and $Logs ---------------------------- revision 1.11 date: 2004/03/19 16:31:11; author: juri; state: Exp; lines: +4 -8 - bug fix: follow the Maildir spec more closely: put all converted mail into the cur/ directory instead of new/ resolves problems with Courier-POP3d and bincimap Thanks to Richard Boulton. ---------------------------- revision 1.10 date: 2004/03/19 15:44:08; author: juri; state: Exp; lines: +10 -1 - bug fix: The program assumes that the environment setting $MAIL exists. No error checking is done, and no meaningful error is generated. Submitted by Glen Harris via the Debian package maintainer Noel Koethe ---------------------------- revision 1.9 date: 2004/03/11 01:24:13; author: juri; state: Exp; lines: +10 -4 - if specifying just a single file with -s, check whether it is a valid mbox file - if not, skip it ---------------------------- revision 1.8 date: 2003/11/11 14:49:26; author: juri; state: Exp; lines: +37 -33 - bugfix: if dummy message is present the last converted mail wasn't touched with the parsed date - patch by Wayne Davison: use Date::Parse from the TimeDate package to parse the From date and use the perl function utime() instead of touch; minor code cleanups ---------------------------- revision 1.7 date: 2003/11/11 14:47:26; author: juri; state: Exp; lines: +19 -55 - ripped out Geoffroy's changes concerning touch and FreeBSD and replaced it with a generic way that should work on all *BSD and Linux unfortunately you now need the Perl libwww package :( ---------------------------- revision 1.6 date: 2003/11/11 14:44:39; author: juri; state: Exp; lines: +7 -1 - bugfix: $unamecmd was set to /usr/bin/touch; grmbl cut-n-paste bug thanks to Nick Triantos ---------------------------- revision 1.5 date: 2003/11/11 14:43:22; author: juri; state: Exp; lines: +79 -33 - fixed a bug where dots (.) in foldernames weren't converted to '_' - fixed a bug where an empty file was created if we have a folder that has just a dummy message in it - incoorperated changes by Kjetil Torgrim Homme: handle "From " correctly - incoorperated changes by Ludovic Robinot: also use X-Mozilla-Status flags (local Mozilla mailboxes) ---------------------------- revision 1.4 date: 2003/11/11 14:41:56; author: juri; state: Exp; lines: +256 -121 changes by Geoffroy DESVERNAY: - added the '-R' switch, to permit 'one-pass conversion' - added a isamailboxfile() function to skip some 'address-book' or other files I found in users's 'Mail' directory - added a convertit() function to permit recursion - added a maildirmake() function to create empty folders (used the same code that used to create it) - added a '/bin/date' call in convert() to convert the date in case of *BSD system : it's now usable for a FreeBSD 4.7 system - added a $touchtimeswitch variable (*BSD touch need '-t' instead of '-d') - I tried not to change the default behaviour... hope it worked ! changes by Juri Haberland: - minor cleanups ---------------------------- revision 1.3 date: 2003/11/11 14:39:21; author: juri; state: Exp; lines: +227 -328 Changes by Jeff Williams: - put the mbox to maildir conversion into it's own function - made it possible to specify a source mbox file, rather than just the directory - destination can now be an absolute path instead of relative to the users home directory - the users mail directory for -m is found from $ENV{MAIL} rather than assumed to be in /var/spool/mail/$user - mbox files with .'s in their name have them converted to -'s - cleaned up a lot of the code and removed some unnecessary variables. Added the use strict pragma. ---------------------------- revision 1.2 date: 2002/10/23 14:26:27; author: juri; state: Exp; lines: +126 -85 Juri's collected changes: - fixed a bug in handling multiple source dirs - fixed a bug with zero-sized mailboxes - fixed a bug in handling "From:" headers that have a time zone - added optional absolute path names for the source dir - added the possibility to strip an extension from the mailboxes - added the command line interface to be more standard like ---------------------------- revision 1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; lines: +0 -0 - initial import including Robins's latest version 2.01 ============================================================================= From jussilehtola at fedoraproject.org Wed May 6 21:23:57 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Wed, 6 May 2009 21:23:57 +0000 (UTC) Subject: rpms/mb2md/F-11 changelog.txt,NONE,1.1 Message-ID: <20090506212357.7BF9970108@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/mb2md/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26882/F-11 Added Files: changelog.txt Log Message: Added missing changelog.txt from initial import. --- NEW FILE changelog.txt --- ---------------------------- revision 1.26 date: 2004/03/28 00:09:46; author: juri; state: Exp; lines: +1 -16 - and another documentation cleanup ---------------------------- revision 1.25 date: 2004/03/27 23:19:46; author: juri; state: Exp; lines: +18 -151 - bumped the version - cleaned up the introduction - removed the changelog entries (will be in a seperate file) ---------------------------- revision 1.24 date: 2004/03/24 21:02:15; author: juri; state: Exp; lines: +11 -3 - fix handling of leading and/or trailing white space in mbox names; thanks to Ian Gulliver ---------------------------- revision 1.23 date: 2004/03/22 22:37:04; author: juri; state: Exp; lines: +58 -4 - new option "-l ": UW-Imapd creates a list that holds the name of all subscibed mailboxes; this can be used to select which mbox files to convert - just give mb2md the option "-l" and specify the list file; thanks to Isaac Saldana for this one ---------------------------- revision 1.22 date: 2004/03/22 22:09:34; author: juri; state: Exp; lines: +35 -12 - make the use of the Content-Length header not the default - use the new option "-c" to enable this behaviour, because results may be unreliable if the header has wrong entries, which happens quite often - small documentation cleanup ---------------------------- revision 1.21 date: 2004/03/22 21:44:23; author: juri; state: Exp; lines: +11 -5 - cleaned up the handling of CRLF-delimited files; we now remove all CR from all lines so thaz we get real unix files as output ---------------------------- revision 1.20 date: 2004/03/20 01:57:50; author: juri; state: Exp; lines: +12 -13 - fix a regexp to get just the date of From_ line, ---------------------------- revision 1.19 date: 2004/03/19 23:05:25; author: juri; state: Exp; lines: +61 -4 - added support for the infamous mboxcl2 format (Content-Length: header) used by mutt; thanks to Chris Dunlop! ---------------------------- revision 1.18 date: 2004/03/19 18:34:23; author: juri; state: Exp; lines: +5 -2 - we ignore files that start with an empty line for now (reportedly Evolution may create such files - hope to support this violation of the mbox format later) ---------------------------- revision 1.17 date: 2004/03/19 17:59:52; author: juri; state: Exp; lines: +11 -4 - minor code cleanup ---------------------------- revision 1.16 date: 2004/03/19 17:33:00; author: juri; state: Exp; lines: +27 -1 - added support for Ximian Evolution's local mbox files (untested, as I don't have any Evolution mailboxes). Thanks to Jacob Barde for this one. - forgot the credit for the last commited patch (CRLF): Thanks goes to Martijn Polak! ---------------------------- revision 1.15 date: 2004/03/19 17:11:20; author: juri; state: Exp; lines: +9 -6 - we can now also handle mbox files in Windows format (CRLF delimited) ---------------------------- revision 1.14 date: 2004/03/19 16:41:35; author: juri; state: Exp; lines: +2 -2 - corrected a typo in the cvs Log tag ---------------------------- revision 1.13 date: 2004/03/19 16:39:42; author: juri; state: Exp; lines: +13 -1 - added change log entries for the last two fixes ---------------------------- revision 1.12 date: 2004/03/19 16:35:57; author: juri; state: Exp; lines: +3 -0 - added two cvs flags: $Id and $Logs ---------------------------- revision 1.11 date: 2004/03/19 16:31:11; author: juri; state: Exp; lines: +4 -8 - bug fix: follow the Maildir spec more closely: put all converted mail into the cur/ directory instead of new/ resolves problems with Courier-POP3d and bincimap Thanks to Richard Boulton. ---------------------------- revision 1.10 date: 2004/03/19 15:44:08; author: juri; state: Exp; lines: +10 -1 - bug fix: The program assumes that the environment setting $MAIL exists. No error checking is done, and no meaningful error is generated. Submitted by Glen Harris via the Debian package maintainer Noel Koethe ---------------------------- revision 1.9 date: 2004/03/11 01:24:13; author: juri; state: Exp; lines: +10 -4 - if specifying just a single file with -s, check whether it is a valid mbox file - if not, skip it ---------------------------- revision 1.8 date: 2003/11/11 14:49:26; author: juri; state: Exp; lines: +37 -33 - bugfix: if dummy message is present the last converted mail wasn't touched with the parsed date - patch by Wayne Davison: use Date::Parse from the TimeDate package to parse the From date and use the perl function utime() instead of touch; minor code cleanups ---------------------------- revision 1.7 date: 2003/11/11 14:47:26; author: juri; state: Exp; lines: +19 -55 - ripped out Geoffroy's changes concerning touch and FreeBSD and replaced it with a generic way that should work on all *BSD and Linux unfortunately you now need the Perl libwww package :( ---------------------------- revision 1.6 date: 2003/11/11 14:44:39; author: juri; state: Exp; lines: +7 -1 - bugfix: $unamecmd was set to /usr/bin/touch; grmbl cut-n-paste bug thanks to Nick Triantos ---------------------------- revision 1.5 date: 2003/11/11 14:43:22; author: juri; state: Exp; lines: +79 -33 - fixed a bug where dots (.) in foldernames weren't converted to '_' - fixed a bug where an empty file was created if we have a folder that has just a dummy message in it - incoorperated changes by Kjetil Torgrim Homme: handle "From " correctly - incoorperated changes by Ludovic Robinot: also use X-Mozilla-Status flags (local Mozilla mailboxes) ---------------------------- revision 1.4 date: 2003/11/11 14:41:56; author: juri; state: Exp; lines: +256 -121 changes by Geoffroy DESVERNAY: - added the '-R' switch, to permit 'one-pass conversion' - added a isamailboxfile() function to skip some 'address-book' or other files I found in users's 'Mail' directory - added a convertit() function to permit recursion - added a maildirmake() function to create empty folders (used the same code that used to create it) - added a '/bin/date' call in convert() to convert the date in case of *BSD system : it's now usable for a FreeBSD 4.7 system - added a $touchtimeswitch variable (*BSD touch need '-t' instead of '-d') - I tried not to change the default behaviour... hope it worked ! changes by Juri Haberland: - minor cleanups ---------------------------- revision 1.3 date: 2003/11/11 14:39:21; author: juri; state: Exp; lines: +227 -328 Changes by Jeff Williams: - put the mbox to maildir conversion into it's own function - made it possible to specify a source mbox file, rather than just the directory - destination can now be an absolute path instead of relative to the users home directory - the users mail directory for -m is found from $ENV{MAIL} rather than assumed to be in /var/spool/mail/$user - mbox files with .'s in their name have them converted to -'s - cleaned up a lot of the code and removed some unnecessary variables. Added the use strict pragma. ---------------------------- revision 1.2 date: 2002/10/23 14:26:27; author: juri; state: Exp; lines: +126 -85 Juri's collected changes: - fixed a bug in handling multiple source dirs - fixed a bug with zero-sized mailboxes - fixed a bug in handling "From:" headers that have a time zone - added optional absolute path names for the source dir - added the possibility to strip an extension from the mailboxes - added the command line interface to be more standard like ---------------------------- revision 1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2002/10/23 13:41:24; author: juri; state: Exp; lines: +0 -0 - initial import including Robins's latest version 2.01 ============================================================================= From hadess at fedoraproject.org Wed May 6 21:25:28 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 6 May 2009 21:25:28 +0000 (UTC) Subject: rpms/totem-pl-parser/devel .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 totem-pl-parser.spec, 1.37, 1.38 Message-ID: <20090506212528.D052D70108@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem-pl-parser/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27143 Modified Files: .cvsignore sources totem-pl-parser.spec Log Message: * Wed May 06 2009 Bastien Nocera 2.27.1-1 - Update to 2.27.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- .cvsignore 31 Mar 2009 11:56:23 -0000 1.21 +++ .cvsignore 6 May 2009 21:24:58 -0000 1.22 @@ -1 +1 @@ -totem-pl-parser-2.26.1.tar.bz2 +totem-pl-parser-2.27.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 31 Mar 2009 11:56:23 -0000 1.21 +++ sources 6 May 2009 21:24:58 -0000 1.22 @@ -1 +1 @@ -269a003146eaca6b9af0b90ad592571f totem-pl-parser-2.26.1.tar.bz2 +397c8e850647d38a446a16a62f11cd0c totem-pl-parser-2.27.1.tar.bz2 Index: totem-pl-parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- totem-pl-parser.spec 31 Mar 2009 11:56:23 -0000 1.37 +++ totem-pl-parser.spec 6 May 2009 21:24:58 -0000 1.38 @@ -1,5 +1,5 @@ Name: totem-pl-parser -Version: 2.26.1 +Version: 2.27.1 Release: 1%{?dist} Summary: Totem Playlist Parser library @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/totem-pl-parser %changelog +* Wed May 06 2009 Bastien Nocera 2.27.1-1 +- Update to 2.27.1 + * Tue Mar 31 2009 - Bastien Nocera - 2.26.1-1 - Update to 2.26.1 From awjb at fedoraproject.org Wed May 6 21:47:23 2009 From: awjb at fedoraproject.org (Andreas Bierfert) Date: Wed, 6 May 2009 21:47:23 +0000 (UTC) Subject: rpms/multisync/devel multisync.spec,1.12,1.13 Message-ID: <20090506214723.D976670108@cvs1.fedora.phx.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/multisync/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29989 Modified Files: multisync.spec Log Message: - fix #499454 Index: multisync.spec =================================================================== RCS file: /cvs/pkgs/rpms/multisync/devel/multisync.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- multisync.spec 27 Mar 2009 18:49:59 -0000 1.12 +++ multisync.spec 6 May 2009 21:46:53 -0000 1.13 @@ -1,6 +1,6 @@ Name: multisync Version: 0.91.1 -Release: 0.1.svn384%{?dist} +Release: 0.2.svn384%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications @@ -29,12 +29,12 @@ libopensync-plugin-* packages. %prep %setup -q -n multisync-gui -echo "env.Append(CCFLAGS = '$RPM_OPT_FLAGS')" >> SConstruct %build +export CFLAGS="$RPM_OPT_FLAGS" NOCOLOR=1 # both don't like smp flags so disable them for now ./configure --prefix=%{_prefix} -v --disable-rpath -%{__make} +%{__make} all_debug # all_debug for better build logs %install @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/*desktop %changelog +* Wed May 6 2009 Ville Skytt?? - 0.91.1-0.2.svn384 +- Build with $RPM_OPT_FLAGS, output more useful build logs. + * Sat Feb 07 2009 Andreas Bierfert - 0.91.1-0.1.svn384 - fix #430406 From ynemoy at fedoraproject.org Wed May 6 21:49:26 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Wed, 6 May 2009 21:49:26 +0000 (UTC) Subject: rpms/xmonad/devel xmonad-config-manpage.patch, NONE, 1.1 xmonad.desktop, 1.1, 1.2 xmonad.spec, 1.1, 1.2 manpage.patch, 1.1, NONE Message-ID: <20090506214926.AA4D570108@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/xmonad/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30425 Modified Files: xmonad.desktop xmonad.spec Added Files: xmonad-config-manpage.patch Removed Files: manpage.patch Log Message: Applies patches from Jens as part of the review xmonad-config-manpage.patch: --- NEW FILE xmonad-config-manpage.patch --- diff -r -u -X /home/yankee/Projekten/fedora-devshell/diff.excludes xmonad-0.8.1_orig/man/xmonad.hs xmonad-0.8.1/man/xmonad.hs --- xmonad-0.8.1_orig/man/xmonad.hs 2009-01-16 17:47:27.000000000 -0500 +++ xmonad-0.8.1/man/xmonad.hs 2009-04-27 18:31:12.195829219 -0400 @@ -246,7 +246,8 @@ -- Run xmonad with the settings you specify. No need to modify this. -- -main = xmonad defaults +main = do spawn "xterm -e '/usr/bin/man xmonad'" + xmonad defaults -- A structure containing your configuration settings, overriding -- fields in the default config. Any you don't override, will Index: xmonad.desktop =================================================================== RCS file: /cvs/pkgs/rpms/xmonad/devel/xmonad.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- xmonad.desktop 6 May 2009 21:19:57 -0000 1.1 +++ xmonad.desktop 6 May 2009 21:48:56 -0000 1.2 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=xmonad-start +Name=xmonad Comment=Tiling window manager Exec=xmonad-start Terminal=False Index: xmonad.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmonad/devel/xmonad.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- xmonad.spec 6 May 2009 21:19:58 -0000 1.1 +++ xmonad.spec 6 May 2009 21:48:56 -0000 1.2 @@ -8,7 +8,7 @@ Name: xmonad Version: 0.8.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A tiling window manager Group: User Interface/X @@ -17,7 +17,7 @@ URL: http://hackage.haskell.o Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: xmonad.desktop Source2: xmonad-start -Patch0: manpage.patch +Patch0: xmonad-config-manpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha @@ -91,7 +91,7 @@ This package contains profiling librarie %prep %setup -q -%patch0 -p0 +%patch0 -p1 -b .orig %build %ifarch ppc @@ -149,7 +149,7 @@ fi %files %defattr(-,root,root,-) -%doc CONFIG LICENSE README STYLE TODO man/%{name}.hs +%doc CONFIG LICENSE README STYLE TODO man/%{name}.hs.orig %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/%{name}-start %{_mandir}/man1/%{name}.1* @@ -174,6 +174,13 @@ fi %changelog +* Wed May 6 2009 Yaakov M. Nemoy - 0.8.1-12 +- applies changes from jens' patch +- renames xmonad.desktop entry +- adds .orig of the xmonad default config +- modifies manpage patch to use 'better' filenames +- renames manpage patch + * Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-11 - adds runghc hack taken from haddock --- manpage.patch DELETED --- From myoung at fedoraproject.org Wed May 6 21:49:41 2009 From: myoung at fedoraproject.org (Michael Young) Date: Wed, 6 May 2009 21:49:41 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.30-rc4-git3.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.11, 1.1014.2.12 config-generic, 1.238.6.18, 1.238.6.19 kernel.spec, 1.1294.2.23, 1.1294.2.24 linux-2.6-utrace.patch, 1.107.6.2, 1.107.6.3 sources, 1.976.2.12, 1.976.2.13 upstream, 1.888.2.11, 1.888.2.12 xen.pvops.patch, 1.1.2.18, 1.1.2.19 linux-2.6-cdrom-door-status.patch, 1.3, NONE linux-2.6-iwl3945-remove-useless-exports.patch, 1.1.2.2, NONE Message-ID: <20090506214941.6CCB170108@cvs1.fedora.phx.redhat.com> Author: myoung Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30270 Modified Files: Tag: private-myoung-dom0-branch .cvsignore config-generic kernel.spec linux-2.6-utrace.patch sources upstream xen.pvops.patch Added Files: Tag: private-myoung-dom0-branch patch-2.6.30-rc4-git3.bz2.sign Removed Files: Tag: private-myoung-dom0-branch linux-2.6-cdrom-door-status.patch linux-2.6-iwl3945-remove-useless-exports.patch Log Message: update pvops patch and hopefully allow i686 to work again --- NEW FILE patch-2.6.30-rc4-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBKAXx4yGugalF9Dw4RAqfWAJoDNLhYZCKzgvuWxmBYrc4wXLmRtQCdEbFB 7BQzBfklrSPdsImfPTO2BBQ= =qPCI -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1014.2.11 retrieving revision 1.1014.2.12 diff -u -p -r1.1014.2.11 -r1.1014.2.12 --- .cvsignore 2 May 2009 18:00:24 -0000 1.1014.2.11 +++ .cvsignore 6 May 2009 21:48:44 -0000 1.1014.2.12 @@ -7,3 +7,4 @@ kernel-2.6.29 linux-2.6.29.tar.bz2 patch-2.6.29-git15.bz2 patch-2.6.30-rc4.bz2 +patch-2.6.30-rc4-git3.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.238.6.18 retrieving revision 1.238.6.19 diff -u -p -r1.238.6.18 -r1.238.6.19 --- config-generic 2 May 2009 18:00:24 -0000 1.238.6.18 +++ config-generic 6 May 2009 21:48:44 -0000 1.238.6.19 @@ -2820,6 +2820,7 @@ CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_ZAURUS=m # Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1294.2.23 retrieving revision 1.1294.2.24 diff -u -p -r1.1294.2.23 -r1.1294.2.24 --- kernel.spec 2 May 2009 21:34:23 -0000 1.1294.2.23 +++ kernel.spec 6 May 2009 21:48:44 -0000 1.1294.2.24 @@ -59,7 +59,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -642,10 +642,6 @@ Patch800: linux-2.6-crash-driver.patch Patch1515: linux-2.6.29-lirc.patch -# Fix the return code CD accesses when the CDROM drive door is closed -# but the drive isn't yet ready. -Patch1550: linux-2.6-cdrom-door-status.patch - Patch1700: agp-set_memory_ucwb.patch # nouveau + drm fixes Patch1811: drm-next.patch @@ -677,8 +673,6 @@ Patch3000: linux-2.6-btrfs-experimental- Patch9002: cpufreq-add-atom-to-p4-clockmod.patch -Patch9100: linux-2.6-iwl3945-remove-useless-exports.patch - #snmp fixes Patch10000: linux-2.6-missing-rfc2465-stats.patch @@ -1213,10 +1207,6 @@ ApplyPatch linux-2.6-crash-driver.patch # http://www.lirc.org/ ApplyPatch linux-2.6.29-lirc.patch -# Fix the return code CD accesses when the CDROM drive door is closed -# but the drive isn't yet ready. -ApplyPatch linux-2.6-cdrom-door-status.patch - ApplyPatch linux-2.6-e1000-ich9.patch ApplyPatch agp-set_memory_ucwb.patch @@ -1245,8 +1235,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch -ApplyPatch linux-2.6-iwl3945-remove-useless-exports.patch - ApplyPatch xen.pvops.pre.patch ApplyPatch xen.pvops.patch ApplyPatch xen.pvops.post.patch @@ -1843,6 +1831,16 @@ fi # ||----w | # || || %changelog +* Wed May 06 2009 Michael Young +- update pvops patch from xen-tip/master - hopefully i686 will work again + +* Wed May 06 2009 Kyle McMartin +- Linux 2.6.30-rc4-git3 +- linux-2.6-cdrom-door-status.patch: merged upstream. +- linux-2.6-iwl3945-remove-useless-exports.patch: merged upstream. +- linux-2.6-utrace.patch: rebase against changes to fs/proc/array.c +- USB_NET_CDC_EEM=m + * Sat May 02 2009 Michael Young - update pvops patch from xen-tip/master - Try enabling CONFIG_XEN_GNTDEV and CONFIG_XEN_PCI_PASSTHROUGH 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.107.6.2 retrieving revision 1.107.6.3 diff -u -p -r1.107.6.2 -r1.107.6.3 --- linux-2.6-utrace.patch 24 Apr 2009 22:27:12 -0000 1.107.6.2 +++ linux-2.6-utrace.patch 6 May 2009 21:48:45 -0000 1.107.6.3 @@ -1,46 +1,5 @@ -utrace core - -This adds the utrace facility, a new modular interface in the kernel for -implementing user thread tracing and debugging. This fits on top of the -tracehook_* layer, so the new code is well-isolated. - -The new interface is in and the DocBook utrace book -describes it. It allows for multiple separate tracing engines to work in -parallel without interfering with each other. Higher-level tracing -facilities can be implemented as loadable kernel modules using this layer. - -The new facility is made optional under CONFIG_UTRACE. -When this is not enabled, no new code is added. -It can only be enabled on machines that have all the -prerequisites and select CONFIG_HAVE_ARCH_TRACEHOOK. - -In this initial version, utrace and ptrace do not play together at all. -If ptrace is attached to a thread, the attach calls in the utrace kernel -API return -EBUSY. If utrace is attached to a thread, the PTRACE_ATTACH -or PTRACE_TRACEME request will return EBUSY to userland. The old ptrace -code is otherwise unchanged and nothing using ptrace should be affected -by this patch as long as utrace is not used at the same time. In the -future we can clean up the ptrace implementation and rework it to use -the utrace API. - -Signed-off-by: Roland McGrath ---- - Documentation/DocBook/Makefile | 2 +- - Documentation/DocBook/utrace.tmpl | 571 +++++++++ - fs/proc/array.c | 3 + - include/linux/init_task.h | 1 + - include/linux/sched.h | 6 + - include/linux/tracehook.h | 61 +- - include/linux/utrace.h | 692 +++++++++++ - include/linux/utrace_struct.h | 58 + - init/Kconfig | 9 + - kernel/Makefile | 1 + - kernel/ptrace.c | 18 +- - kernel/utrace.c | 2351 +++++++++++++++++++++++++++++++++++++ - 12 files changed, 3770 insertions(+), 3 deletions(-) - diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile -index a3a83d3..0a07ba9 100644 +index b1eb661..02851f6 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -9,7 +9,7 @@ @@ -54,7 +13,7 @@ index a3a83d3..0a07ba9 100644 mac80211.xml debugobjects.xml sh.xml regulator.xml \ diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl new file mode 100644 -index ...b802c55 100644 +index 0000000..b802c55 --- /dev/null +++ b/Documentation/DocBook/utrace.tmpl @@ -0,0 +1,571 @@ @@ -630,18 +589,18 @@ index ...b802c55 100644 + + diff --git a/fs/proc/array.c b/fs/proc/array.c -index 7e4877d..0c683ed 100644 +index 725a650..e299a63 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c -@@ -81,6 +81,7 @@ - #include +@@ -82,6 +82,7 @@ #include + #include #include +#include #include #include -@@ -187,6 +188,8 @@ static inline void task_state(struct seq +@@ -188,6 +189,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, cred->uid, cred->euid, cred->suid, cred->fsuid, cred->gid, cred->egid, cred->sgid, cred->fsgid); @@ -651,10 +610,10 @@ index 7e4877d..0c683ed 100644 if (p->files) fdt = files_fdtable(p->files); diff --git a/include/linux/init_task.h b/include/linux/init_task.h -index dcfb933..5625de6 100644 +index d87247d..0d0b55d 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h -@@ -183,6 +183,7 @@ extern struct cred init_cred; +@@ -170,6 +170,7 @@ extern struct cred init_cred; [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \ }, \ .dirties = INIT_PROP_LOCAL_SINGLE(dirties), \ @@ -663,7 +622,7 @@ index dcfb933..5625de6 100644 INIT_TRACE_IRQFLAGS \ INIT_LOCKDEP \ diff --git a/include/linux/sched.h b/include/linux/sched.h -index 98e1fe5..e9c3350 100644 +index b4c38bc..30db106 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -59,6 +59,7 @@ struct sched_param { @@ -674,7 +633,7 @@ index 98e1fe5..e9c3350 100644 #include #include -@@ -1290,6 +1291,11 @@ struct task_struct { +@@ -1291,6 +1292,11 @@ struct task_struct { #endif seccomp_t seccomp; @@ -687,7 +646,7 @@ index 98e1fe5..e9c3350 100644 u32 parent_exec_id; u32 self_exec_id; diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h -index 4ec4821..a7de30f 100644 +index 4ec4821..a7de30f 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h @@ -49,6 +49,7 @@ @@ -707,7 +666,7 @@ index 4ec4821..a7de30f 100644 return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall +@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall(struct pt_regs *regs) static inline __must_check int tracehook_report_syscall_entry( struct pt_regs *regs) { @@ -717,7 +676,7 @@ index 4ec4821..a7de30f 100644 ptrace_report_syscall(regs); return 0; } -@@ -134,6 +140,8 @@ static inline __must_check int tracehook +@@ -134,6 +140,8 @@ static inline __must_check int tracehook_report_syscall_entry( */ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step) { @@ -726,7 +685,7 @@ index 4ec4821..a7de30f 100644 ptrace_report_syscall(regs); } -@@ -194,6 +202,8 @@ static inline void tracehook_report_exec +@@ -194,6 +202,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt, struct linux_binprm *bprm, struct pt_regs *regs) { @@ -735,7 +694,7 @@ index 4ec4821..a7de30f 100644 if (!ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXEC, 0) && unlikely(task_ptrace(current) & PT_PTRACED)) send_sig(SIGTRAP, current, 0); -@@ -211,6 +221,8 @@ static inline void tracehook_report_exec +@@ -211,6 +221,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt, */ static inline void tracehook_report_exit(long *exit_code) { @@ -744,7 +703,7 @@ index 4ec4821..a7de30f 100644 ptrace_event(PT_TRACE_EXIT, PTRACE_EVENT_EXIT, *exit_code); } -@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clon +@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clone(unsigned clone_flags) static inline void tracehook_finish_clone(struct task_struct *child, unsigned long clone_flags, int trace) { @@ -752,7 +711,7 @@ index 4ec4821..a7de30f 100644 ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace); } -@@ -280,6 +293,8 @@ static inline void tracehook_report_clon +@@ -280,6 +293,8 @@ static inline void tracehook_report_clone(int trace, struct pt_regs *regs, unsigned long clone_flags, pid_t pid, struct task_struct *child) { @@ -761,7 +720,7 @@ index 4ec4821..a7de30f 100644 if (unlikely(trace) || unlikely(clone_flags & CLONE_PTRACE)) { /* * The child starts up with an immediate SIGSTOP. -@@ -311,6 +326,9 @@ static inline void tracehook_report_clon +@@ -311,6 +326,9 @@ static inline void tracehook_report_clone_complete(int trace, pid_t pid, struct task_struct *child) { @@ -771,7 +730,7 @@ index 4ec4821..a7de30f 100644 if (unlikely(trace)) ptrace_event(0, trace, pid); } -@@ -345,6 +363,7 @@ static inline void tracehook_report_vfor +@@ -345,6 +363,7 @@ static inline void tracehook_report_vfork_done(struct task_struct *child, */ static inline void tracehook_prepare_release_task(struct task_struct *task) { @@ -779,7 +738,7 @@ index 4ec4821..a7de30f 100644 } /** -@@ -359,6 +378,7 @@ static inline void tracehook_prepare_rel +@@ -359,6 +378,7 @@ static inline void tracehook_prepare_release_task(struct task_struct *task) static inline void tracehook_finish_release_task(struct task_struct *task) { ptrace_release_task(task); @@ -787,7 +746,7 @@ index 4ec4821..a7de30f 100644 } /** -@@ -380,6 +400,8 @@ static inline void tracehook_signal_hand +@@ -380,6 +400,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info, const struct k_sigaction *ka, struct pt_regs *regs, int stepping) { @@ -796,7 +755,7 @@ index 4ec4821..a7de30f 100644 if (stepping) ptrace_notify(SIGTRAP); } -@@ -397,6 +419,8 @@ static inline void tracehook_signal_hand +@@ -397,6 +419,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info, static inline int tracehook_consider_ignored_signal(struct task_struct *task, int sig) { @@ -805,7 +764,7 @@ index 4ec4821..a7de30f 100644 return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -416,6 +440,9 @@ static inline int tracehook_consider_ign +@@ -416,6 +440,9 @@ static inline int tracehook_consider_ignored_signal(struct task_struct *task, static inline int tracehook_consider_fatal_signal(struct task_struct *task, int sig) { @@ -815,7 +774,7 @@ index 4ec4821..a7de30f 100644 return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -430,6 +457,8 @@ static inline int tracehook_consider_fat +@@ -430,6 +457,8 @@ static inline int tracehook_consider_fatal_signal(struct task_struct *task, */ static inline int tracehook_force_sigpending(void) { @@ -824,7 +783,7 @@ index 4ec4821..a7de30f 100644 return 0; } -@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(s +@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(struct task_struct *task, siginfo_t *info, struct k_sigaction *return_ka) { @@ -833,7 +792,7 @@ index 4ec4821..a7de30f 100644 return 0; } -@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(s +@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(struct task_struct *task, */ static inline int tracehook_notify_jctl(int notify, int why) { @@ -842,7 +801,7 @@ index 4ec4821..a7de30f 100644 return notify ?: (current->ptrace & PT_PTRACED) ? why : 0; } -@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl( +@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl(int notify, int why) static inline int tracehook_notify_death(struct task_struct *task, void **death_cookie, int group_dead) { @@ -851,7 +810,7 @@ index 4ec4821..a7de30f 100644 if (task_detached(task)) return task->ptrace ? SIGCHLD : DEATH_REAP; -@@ -545,6 +580,20 @@ static inline void tracehook_report_deat +@@ -545,6 +580,20 @@ static inline void tracehook_report_death(struct task_struct *task, int signal, void *death_cookie, int group_dead) { @@ -872,7 +831,7 @@ index 4ec4821..a7de30f 100644 } #ifdef TIF_NOTIFY_RESUME -@@ -574,10 +623,20 @@ static inline void set_notify_resume(str +@@ -574,10 +623,20 @@ static inline void set_notify_resume(struct task_struct *task) * asynchronously, this will be called again before we return to * user mode. * @@ -896,7 +855,7 @@ index 4ec4821..a7de30f 100644 diff --git a/include/linux/utrace.h b/include/linux/utrace.h new file mode 100644 -index ...f46cc0f 100644 +index 0000000..f46cc0f --- /dev/null +++ b/include/linux/utrace.h @@ -0,0 +1,692 @@ @@ -1594,7 +1553,7 @@ index ...f46cc0f 100644 +#endif /* linux/utrace.h */ diff --git a/include/linux/utrace_struct.h b/include/linux/utrace_struct.h new file mode 100644 -index ...aba7e09 100644 +index 0000000..aba7e09 --- /dev/null +++ b/include/linux/utrace_struct.h @@ -0,0 +1,58 @@ @@ -1657,10 +1616,10 @@ index ...aba7e09 100644 + +#endif /* linux/utrace_struct.h */ diff --git a/init/Kconfig b/init/Kconfig -index f2f9b53..0d104d9 100644 +index 7be4d38..a6987df 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1141,6 +1141,15 @@ config STOP_MACHINE +@@ -1149,6 +1149,15 @@ config STOP_MACHINE help Need stop_machine() primitive. @@ -1677,7 +1636,7 @@ index f2f9b53..0d104d9 100644 config PREEMPT_NOTIFIERS diff --git a/kernel/Makefile b/kernel/Makefile -index 4242366..a79634e 100644 +index 4242366..a79634e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o @@ -1689,7 +1648,7 @@ index 4242366..a79634e 100644 obj-$(CONFIG_AUDITSYSCALL) += auditsc.o obj-$(CONFIG_AUDIT_TREE) += audit_tree.o diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index aaad0ec..8ba9b73 100644 +index 0692ab5..1d33e9c 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -16,6 +16,7 @@ @@ -1700,8 +1659,8 @@ index aaad0ec..8ba9b73 100644 #include #include #include -@@ -176,6 +177,14 @@ bool ptrace_may_access(struct task_struc - return (!err ? true : false); +@@ -174,6 +175,14 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode) + return !err; } +/* @@ -1715,7 +1674,7 @@ index aaad0ec..8ba9b73 100644 int ptrace_attach(struct task_struct *task) { int retval; -@@ -214,6 +223,11 @@ repeat: +@@ -212,6 +221,11 @@ repeat: goto repeat; } @@ -1727,7 +1686,7 @@ index aaad0ec..8ba9b73 100644 if (!task->mm) goto bad; /* the same process cannot be attached many times */ -@@ -590,7 +604,9 @@ int ptrace_traceme(void) +@@ -588,7 +602,9 @@ int ptrace_traceme(void) */ repeat: task_lock(current); @@ -1740,7 +1699,7 @@ index aaad0ec..8ba9b73 100644 */ diff --git a/kernel/utrace.c b/kernel/utrace.c new file mode 100644 -index ...c2bb162 100644 +index 0000000..c2bb162 --- /dev/null +++ b/kernel/utrace.c @@ -0,0 +1,2351 @@ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.976.2.12 retrieving revision 1.976.2.13 diff -u -p -r1.976.2.12 -r1.976.2.13 --- sources 2 May 2009 18:00:25 -0000 1.976.2.12 +++ sources 6 May 2009 21:48:45 -0000 1.976.2.13 @@ -1,2 +1,3 @@ 64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2 1672a3064a2bfe049715a1103f03561c patch-2.6.30-rc4.bz2 +f04330e41b862632d60568dfd32ded6c patch-2.6.30-rc4-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.888.2.11 retrieving revision 1.888.2.12 diff -u -p -r1.888.2.11 -r1.888.2.12 --- upstream 2 May 2009 18:00:25 -0000 1.888.2.11 +++ upstream 6 May 2009 21:48:45 -0000 1.888.2.12 @@ -1,2 +1,3 @@ linux-2.6.29.tar.bz2 patch-2.6.30-rc4.bz2 +patch-2.6.30-rc4-git3.bz2 xen.pvops.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -p -N -r 1.1.2.18 -r 1.1.2.19 xen.pvops.patch Index: xen.pvops.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -u -p -r1.1.2.18 -r1.1.2.19 --- xen.pvops.patch 2 May 2009 18:00:25 -0000 1.1.2.18 +++ xen.pvops.patch 6 May 2009 21:48:45 -0000 1.1.2.19 @@ -11168,7 +11168,7 @@ index 34c1304..5d55158 100644 0: always panic on uncorrected errors, log corrected errors 1: panic or SIGBUS on uncorrected errors, log corrected errors diff --git a/MAINTAINERS b/MAINTAINERS -index c547f4a..0e4bb2e 100644 +index 2b349ba..85826f5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3333,6 +3333,14 @@ F: drivers/serial/kgdboc.c @@ -11204,7 +11204,7 @@ index c547f4a..0e4bb2e 100644 P: Christoph Hellwig M: hch at infradead.org diff --git a/Makefile b/Makefile -index eb38c83..7cc8517 100644 +index b18afad..396e626 100644 --- a/Makefile +++ b/Makefile @@ -557,6 +557,10 @@ ifdef CONFIG_FUNCTION_TRACER @@ -19771,7 +19771,7 @@ index 7e4a459..fd69c51 100644 switch (c->x86) { case 0xf: diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index c4f6678..a86769e 100644 +index c1caefc..591012f 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -13,6 +13,7 @@ @@ -20063,10 +20063,10 @@ index 483eda9..789efe2 100644 }; diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c -index 863f895..80ec191 100644 +index 6fb0b35..4bbc965 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c -@@ -449,6 +449,8 @@ void mce_log_therm_throt_event(__u64 status) +@@ -450,6 +450,8 @@ void mce_log_therm_throt_event(__u64 status) * Periodic polling timer for "silent" machine check errors. If the * poller finds an MCE, poll 2x faster. When the poller finds no more * errors, poll 2x slower (up to check_interval seconds). @@ -20075,22 +20075,7 @@ index 863f895..80ec191 100644 */ static int check_interval = 5 * 60; /* 5 minutes */ -@@ -633,11 +635,12 @@ static void mce_init_timer(void) - { - struct timer_list *t = &__get_cpu_var(mce_timer); - -+ /* Disable polling if check_interval is 0 */ -+ if (!check_interval) -+ return; - /* data race harmless because everyone sets to the same value */ - if (!next_interval) - next_interval = check_interval * HZ; -- if (!next_interval) -- return; - setup_timer(t, mcheck_timer, smp_processor_id()); - t->expires = round_jiffies(jiffies + next_interval); - add_timer(t); -@@ -838,25 +841,32 @@ static int __init mcheck_disable(char *str) +@@ -839,25 +841,32 @@ static int __init mcheck_disable(char *str) mce_dont_init = 1; return 1; } @@ -28237,6 +28222,59 @@ index 7aa03a5..e68aea6 100644 if (pgd == NULL) goto out; +diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c +index 821e970..e69bdad 100644 +--- a/arch/x86/mm/tlb.c ++++ b/arch/x86/mm/tlb.c +@@ -147,13 +147,25 @@ void smp_invalidate_interrupt(struct pt_regs *regs) + * BUG(); + */ + +- if (f->flush_mm == percpu_read(cpu_tlbstate.active_mm)) { +- if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK) { ++ if (f->flush_mm == NULL || ++ f->flush_mm == percpu_read(cpu_tlbstate.active_mm)) { ++ int tlbstate = percpu_read(cpu_tlbstate.state); ++ ++ /* ++ * flush_mm == NULL means flush everything, including ++ * global tlbs, which will only happen when flushing ++ * kernel mappings. ++ */ ++ if (f->flush_mm == NULL) ++ __flush_tlb_all(); ++ else if (tlbstate == TLBSTATE_OK) { + if (f->flush_va == TLB_FLUSH_ALL) + local_flush_tlb(); + else + __flush_tlb_one(f->flush_va); +- } else ++ } ++ ++ if (tlbstate == TLBSTATE_LAZY) + leave_mm(cpu); + } + out: +@@ -275,16 +287,11 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long va) + preempt_enable(); + } + +-static void do_flush_tlb_all(void *info) ++void flush_tlb_all(void) + { +- unsigned long cpu = smp_processor_id(); ++ flush_tlb_others(cpu_online_mask, NULL, TLB_FLUSH_ALL); + + __flush_tlb_all(); + if (percpu_read(cpu_tlbstate.state) == TLBSTATE_LAZY) +- leave_mm(cpu); +-} +- +-void flush_tlb_all(void) +-{ +- on_each_cpu(do_flush_tlb_all, NULL, 1); ++ leave_mm(smp_processor_id()); + } diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 202864a..c638685 100644 --- a/arch/x86/oprofile/nmi_int.c @@ -28298,15 +28336,14 @@ index 10131fb..4da7230 100644 * doesn't hurt other P6 variant */ apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED); diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile -index d49202e..9ade7be 100644 +index d49202e..64182c5 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile -@@ -4,6 +4,8 @@ obj-$(CONFIG_PCI_BIOS) += pcbios.o +@@ -4,6 +4,7 @@ obj-$(CONFIG_PCI_BIOS) += pcbios.o obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_$(BITS).o direct.o mmconfig-shared.o obj-$(CONFIG_PCI_DIRECT) += direct.o obj-$(CONFIG_PCI_OLPC) += olpc.o +obj-$(CONFIG_PCI_XEN) += xen.o -+obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen/ obj-y += fixup.o obj-$(CONFIG_ACPI) += acpi.o @@ -28412,10 +28449,10 @@ index 25a1f8e..4e2f90a 100644 #endif diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c new file mode 100644 -index 0000000..859f335 +index 0000000..e134fb8 --- /dev/null +++ b/arch/x86/pci/xen.c -@@ -0,0 +1,81 @@ +@@ -0,0 +1,51 @@ +/* + * Xen PCI Frontend Stub - puts some "dummy" functions in to the Linux + * x86 PCI core to support the Xen PCI Frontend @@ -28432,35 +28469,8 @@ index 0000000..859f335 + +#include + -+#include -+ -+static int pcifront_raw_pci_read(unsigned int domain, unsigned int bus, -+ unsigned int devfn, int reg, int len, u32 *val) -+{ -+ return -ENODEV; -+} -+ -+static int pcifront_raw_pci_write(unsigned int domain, unsigned int bus, -+ unsigned int devfn, int reg, int len, u32 val) -+{ -+ return -ENODEV; -+} -+ -+struct pci_raw_ops pcifront_raw_bus_ops = { -+ .read = pcifront_raw_pci_read, -+ .write = pcifront_raw_pci_write, -+}; -+ +static int xen_pcifront_enable_irq(struct pci_dev *dev) +{ -+ int irq; -+ -+ irq = xen_setup_pirq(dev->irq, "pci"); -+ if (irq < 0) -+ return irq; -+ -+ dev->irq = irq; -+ + return 0; +} + @@ -28473,7 +28483,6 @@ index 0000000..859f335 [...2257 lines suppressed...] -+ -+#ifdef __KERNEL__ -+ -+struct pcifront_device; -+struct pci_bus; -+ -+struct pcifront_sd { -+ int domain; -+ struct pcifront_device *pdev; -+}; -+ -+static inline struct pcifront_device * -+pcifront_get_pdev(struct pcifront_sd *sd) -+{ -+ return sd->pdev; -+} -+ -+static inline void pcifront_init_sd(struct pcifront_sd *sd, -+ unsigned int domain, unsigned int bus, -+ struct pcifront_device *pdev) -+{ -+ sd->domain = domain; -+ sd->pdev = pdev; -+} -+ -+static inline void pcifront_setup_root_resources(struct pci_bus *bus, -+ struct pcifront_sd *sd) -+{ -+} -+ -+extern struct rw_semaphore pci_bus_sem; -+ -+#endif /* __KERNEL__ */ -+ -+#endif /* __XEN_ASM_PCIFRONT_H__ */ diff --git a/include/xen/privcmd.h b/include/xen/privcmd.h new file mode 100644 index 0000000..c5d9067 @@ -51134,7 +49531,7 @@ index eef8cd2..3421e27 100644 val2 = (u32) (unsigned long) utime; diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c -index d82142b..37c6363 100644 +index 26e0875..07c3d7c 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -17,9 +17,11 @@ @@ -55401,7 +53798,7 @@ index e124bf5..97a2f81 100644 #ifdef CONFIG_DEBUG_RT_MUTEXES # include "rtmutex-debug.h" diff --git a/kernel/sched.c b/kernel/sched.c -index b902e58..66bf4f9 100644 +index 26efa47..772483e 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -72,13 +72,15 @@ @@ -55968,7 +54365,7 @@ index 27dad29..68320f6 100644 +/* performance counters: */ +cond_syscall(sys_perf_counter_open); diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index e3d2c7d..11d87c0 100644 +index ea78fa1..9fbc05f 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -27,6 +27,7 @@ @@ -55987,7 +54384,7 @@ index e3d2c7d..11d87c0 100644 #include #include -@@ -1292,6 +1294,16 @@ static struct ctl_table vm_table[] = { +@@ -1295,6 +1297,16 @@ static struct ctl_table vm_table[] = { .extra2 = &one, }, #endif @@ -56004,7 +54401,7 @@ index e3d2c7d..11d87c0 100644 #ifdef CONFIG_UNEVICTABLE_LRU { .ctl_name = CTL_UNNUMBERED, -@@ -1302,6 +1314,16 @@ static struct ctl_table vm_table[] = { +@@ -1305,6 +1317,16 @@ static struct ctl_table vm_table[] = { .proc_handler = &scan_unevictable_handler, }, #endif @@ -57825,7 +56222,7 @@ index 960cbf4..df20acd 100644 return 0; } diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 1ce5dc6..b6183bc 100644 +index a884c09..9b6e922 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -171,6 +171,13 @@ static struct trace_array global_trace; @@ -58191,7 +56588,7 @@ index 1ce5dc6..b6183bc 100644 tracing_ctrl_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) { -@@ -3596,7 +3679,7 @@ struct dentry *tracing_dentry_percpu(void) +@@ -3597,7 +3680,7 @@ struct dentry *tracing_dentry_percpu(void) static void tracing_init_debugfs_percpu(long cpu) { struct dentry *d_percpu = tracing_dentry_percpu(); @@ -58200,7 +56597,7 @@ index 1ce5dc6..b6183bc 100644 /* strlen(cpu) + MAX(log10(cpu)) + '\0' */ char cpu_dir[7]; -@@ -3611,21 +3694,15 @@ static void tracing_init_debugfs_percpu(long cpu) +@@ -3612,21 +3695,15 @@ static void tracing_init_debugfs_percpu(long cpu) } /* per cpu trace_pipe */ @@ -58228,7 +56625,7 @@ index 1ce5dc6..b6183bc 100644 } #ifdef CONFIG_FTRACE_SELFTEST -@@ -3781,6 +3858,22 @@ static const struct file_operations trace_options_core_fops = { +@@ -3782,6 +3859,22 @@ static const struct file_operations trace_options_core_fops = { .write = trace_options_core_write, }; @@ -58251,7 +56648,7 @@ index 1ce5dc6..b6183bc 100644 static struct dentry *trace_options_init_dentry(void) { struct dentry *d_tracer; -@@ -3808,7 +3901,6 @@ create_trace_option_file(struct trace_option_dentry *topt, +@@ -3809,7 +3902,6 @@ create_trace_option_file(struct trace_option_dentry *topt, struct tracer_opt *opt) { struct dentry *t_options; @@ -58259,7 +56656,7 @@ index 1ce5dc6..b6183bc 100644 t_options = trace_options_init_dentry(); if (!t_options) -@@ -3817,11 +3909,9 @@ create_trace_option_file(struct trace_option_dentry *topt, +@@ -3818,11 +3910,9 @@ create_trace_option_file(struct trace_option_dentry *topt, topt->flags = flags; topt->opt = opt; @@ -58272,7 +56669,7 @@ index 1ce5dc6..b6183bc 100644 } static struct trace_option_dentry * -@@ -3876,123 +3966,84 @@ static struct dentry * +@@ -3877,123 +3967,84 @@ static struct dentry * create_trace_option_core_file(const char *option, long index) { struct dentry *t_options; @@ -61733,7 +60130,7 @@ index 0000000..603c81b + This may also hide some real bugs. + diff --git a/lib/dma-debug.c b/lib/dma-debug.c -index d3da7ed..5d61019 100644 +index 69da09a..cdd205d 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -85,6 +85,7 @@ static u32 show_num_errors = 1; @@ -61841,7 +60238,7 @@ index d3da7ed..5d61019 100644 /* * DMA-API debugging init code * -@@ -490,6 +548,8 @@ void dma_debug_init(u32 num_entries) +@@ -439,6 +497,8 @@ void dma_debug_init(u32 num_entries) return; } @@ -62449,7 +60846,7 @@ index cbe9e05..28be15e 100644 + up_write(&mm->mmap_sem); } diff --git a/mm/mmap.c b/mm/mmap.c -index 3303d1b..8a49df4 100644 +index 6b7b1a9..2c1c2cb 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -28,6 +28,7 @@ @@ -62460,7 +60857,7 @@ index 3303d1b..8a49df4 100644 #include #include -@@ -1223,6 +1224,9 @@ munmap_back: +@@ -1219,6 +1220,9 @@ munmap_back: if (correct_wcount) atomic_inc(&inode->i_writecount); out: @@ -62470,7 +60867,7 @@ index 3303d1b..8a49df4 100644 mm->total_vm += len >> PAGE_SHIFT; vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); if (vm_flags & VM_LOCKED) { -@@ -1756,6 +1760,12 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -1752,6 +1756,12 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) do { long nrpages = vma_pages(vma); @@ -63234,7 +61631,7 @@ index c8fb456..499a67e 100644 -DEFINE_TRACE(kfree_skb); EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb); diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index ce6356c..273cdfd 100644 +index f091a5a..c0b24c7 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -39,6 +39,7 @@ --- linux-2.6-cdrom-door-status.patch DELETED --- --- linux-2.6-iwl3945-remove-useless-exports.patch DELETED --- From mjakubicek at fedoraproject.org Wed May 6 21:56:28 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Wed, 6 May 2009 21:56:28 +0000 (UTC) Subject: rpms/trousers/F-11 trousers.spec,1.14,1.15 Message-ID: <20090506215628.C1AFE70108@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/trousers/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31211/F-11 Modified Files: trousers.spec Log Message: - Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155). Index: trousers.spec =================================================================== RCS file: /cvs/pkgs/rpms/trousers/F-11/trousers.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- trousers.spec 27 Apr 2009 16:07:23 -0000 1.14 +++ trousers.spec 6 May 2009 21:55:58 -0000 1.15 @@ -3,7 +3,7 @@ %define name trousers %define version 0.3.1 -%define release 15 +%define release 16 Name: %{name} Summary: TCG's Software Stack v1.2 @@ -87,7 +87,7 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libts rm -rf ${RPM_BUILD_ROOT} %pre -getent group tss >/dev/null || groupadd -g 59 r tss +getent group tss >/dev/null || groupadd -g 59 -r tss getent passwd tss >/dev/null || \ useradd -r -u 59 -g tss -d /dev/null -s /sbin/nologin \ -c "Account used by the trousers package to sandbox the tcsd daemon" tss @@ -135,6 +135,9 @@ fi %{_libdir}/libtddl.a %changelog +* Wed May 06 2009 Milos Jakubicek - 0.3.1-16 +- Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155). + * Mon Apr 27 2009 Milos Jakubicek - 0.3.1-15 - Fix FTBFS: added trousers-0.3.1-gcc44.patch From mjakubicek at fedoraproject.org Wed May 6 21:56:28 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Wed, 6 May 2009 21:56:28 +0000 (UTC) Subject: rpms/trousers/F-10 trousers.spec,1.11,1.12 Message-ID: <20090506215628.9921970108@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/trousers/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31211/F-10 Modified Files: trousers.spec Log Message: - Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155). Index: trousers.spec =================================================================== RCS file: /cvs/pkgs/rpms/trousers/F-10/trousers.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- trousers.spec 16 Dec 2008 23:29:16 -0000 1.11 +++ trousers.spec 6 May 2009 21:55:58 -0000 1.12 @@ -3,7 +3,7 @@ %define name trousers %define version 0.3.1 -%define release 12 +%define release 13 Name: %{name} Summary: TCG's Software Stack v1.2 @@ -83,7 +83,7 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libts rm -rf ${RPM_BUILD_ROOT} %pre -getent group tss >/dev/null || groupadd -g 59 r tss +getent group tss >/dev/null || groupadd -g 59 -r tss getent passwd tss >/dev/null || \ useradd -r -u 59 -g tss -d /dev/null -s /sbin/nologin \ -c "Account used by the trousers package to sandbox the tcsd daemon" tss @@ -131,6 +131,9 @@ fi %{_libdir}/libtddl.a %changelog +* Wed May 06 2009 Milos Jakubicek - 0.3.1-13 +- Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155). + * Tue Dec 16 2008 David Woodhouse - 0.3.1-12 - Bump release to avoid wrong tag in rawhide From mjakubicek at fedoraproject.org Wed May 6 21:56:29 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Wed, 6 May 2009 21:56:29 +0000 (UTC) Subject: rpms/trousers/devel trousers.spec,1.14,1.15 Message-ID: <20090506215629.25C7970108@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/trousers/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31211/devel Modified Files: trousers.spec Log Message: - Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155). Index: trousers.spec =================================================================== RCS file: /cvs/pkgs/rpms/trousers/devel/trousers.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- trousers.spec 27 Apr 2009 16:07:23 -0000 1.14 +++ trousers.spec 6 May 2009 21:55:58 -0000 1.15 @@ -3,7 +3,7 @@ %define name trousers %define version 0.3.1 -%define release 15 +%define release 16 Name: %{name} Summary: TCG's Software Stack v1.2 @@ -87,7 +87,7 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libts rm -rf ${RPM_BUILD_ROOT} %pre -getent group tss >/dev/null || groupadd -g 59 r tss +getent group tss >/dev/null || groupadd -g 59 -r tss getent passwd tss >/dev/null || \ useradd -r -u 59 -g tss -d /dev/null -s /sbin/nologin \ -c "Account used by the trousers package to sandbox the tcsd daemon" tss @@ -135,6 +135,9 @@ fi %{_libdir}/libtddl.a %changelog +* Wed May 06 2009 Milos Jakubicek - 0.3.1-16 +- Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155). + * Mon Apr 27 2009 Milos Jakubicek - 0.3.1-15 - Fix FTBFS: added trousers-0.3.1-gcc44.patch From ynemoy at fedoraproject.org Wed May 6 22:00:59 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Wed, 6 May 2009 22:00:59 +0000 (UTC) Subject: rpms/xmonad/F-11 xmonad-config-manpage.patch, NONE, 1.1 xmonad-start, NONE, 1.1 xmonad.desktop, NONE, 1.1 xmonad.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090506220059.13F4F70108@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/xmonad/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32150 Modified Files: sources Added Files: xmonad-config-manpage.patch xmonad-start xmonad.desktop xmonad.spec Log Message: Branch from devel xmonad-config-manpage.patch: --- NEW FILE xmonad-config-manpage.patch --- diff -r -u -X /home/yankee/Projekten/fedora-devshell/diff.excludes xmonad-0.8.1_orig/man/xmonad.hs xmonad-0.8.1/man/xmonad.hs --- xmonad-0.8.1_orig/man/xmonad.hs 2009-01-16 17:47:27.000000000 -0500 +++ xmonad-0.8.1/man/xmonad.hs 2009-04-27 18:31:12.195829219 -0400 @@ -246,7 +246,8 @@ -- Run xmonad with the settings you specify. No need to modify this. -- -main = xmonad defaults +main = do spawn "xterm -e '/usr/bin/man xmonad'" + xmonad defaults -- A structure containing your configuration settings, overriding -- fields in the default config. Any you don't override, will --- NEW FILE xmonad-start --- #!/bin/sh if [ ! -d ~/.xmonad ]; then mkdir -p ~/.xmonad cp /etc/skel/.xmonad/xmonad.hs ~/.xmonad/ fi exec xmonad --- NEW FILE xmonad.desktop --- [Desktop Entry] Encoding=UTF-8 Name=xmonad Comment=Tiling window manager Exec=xmonad-start Terminal=False TryExec=xmonad-start [Window Manager] SessionManaged=true # vi: encoding=utf-8 --- NEW FILE xmonad.spec --- %global X11_version 1.4.3 %bcond_without doc %bcond_without prof # ghc does not emit debug information %global debug_package %{nil} Name: xmonad Version: 0.8.1 Release: 12%{?dist} Summary: A tiling window manager Group: User Interface/X License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: xmonad.desktop Source2: xmonad-start Patch0: xmonad-config-manpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc BuildRequires: ghc-X11-devel >= %{X11_version} %if %{with doc} BuildRequires: ghc-doc %endif %if %{with prof} BuildRequires: ghc-prof, ghc-X11-prof >= %{X11_version} %endif # for latest macros.ghc BuildRequires: ghc >= 6.10.2-3 Requires: ghc-%{name}-devel = %{version}-%{release} # required until there is a command to open some system default # xterminal Requires: xterm # for xmessage Requires: xorg-x11-apps %description xmonad is a tiling window manager for X. Windows are arranged automatically to tile the screen without gaps or overlap, maximising screen use. All features of the window manager are accessible from the keyboard: a mouse is strictly optional. xmonad is written and extensible in Haskell. Custom layout algorithms, and other extensions, may be written by the user in config files. Layouts are applied dynamically, and different layouts may be used on each workspace. Xinerama is fully supported, allowing windows to be tiled on several screens. %package -n ghc-%{name}-devel Summary: Haskell %{name} library Group: Development/Libraries Requires: ghc-X11-devel >= %{X11_version} Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} %description -n ghc-%{name}-devel This package provides the Haskell %{name} library built for ghc-%{ghc_version}. %if %{with doc} %package -n ghc-%{name}-doc Summary: Documentation for %{name} Group: Development/Libraries Requires: ghc-doc = %{ghc_version} Requires(post): ghc-doc = %{ghc_version} Requires(postun): ghc-doc = %{ghc_version} %description -n ghc-%{name}-doc This package contains development documentation files for the %{name} library. %endif %if %{with prof} %package -n ghc-%{name}-prof Summary: Profiling libraries for %{name} Group: Development/Libraries Requires: ghc-%{name}-devel = %{version}-%{release} Requires: ghc-X11-prof >= %{X11_version} Requires: ghc-prof = %{ghc_version} %description -n ghc-%{name}-prof This package contains profiling libraries for %{name}. %endif %prep %setup -q %patch0 -p1 -b .orig %build %ifarch ppc # hack around mysterious runghc fail %global cabal ./cabal ghc --make Setup -o cabal %endif %cabal_configure --ghc %{?with_prof:-p} %cabal build %if %{with doc} %cabal haddock %endif %ghc_gen_scripts %install rm -rf $RPM_BUILD_ROOT %cabal_install %ghc_install_scripts %ghc_gen_filelists ghc-%{name} install -p -m 0644 -D man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 install -p -m 0644 -D %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop install -p -m 0755 -D %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/%{name}-start install -p -m 0644 -D man/xmonad.hs $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/%{name}.hs %clean rm -rf $RPM_BUILD_ROOT %post -n ghc-%{name}-devel %ghc_register_pkg %if %{with doc} %post -n ghc-%{name}-doc %ghc_reindex_haddock %endif %preun -n ghc-%{name}-devel if [ "$1" -eq 0 ] ; then %ghc_unregister_pkg fi %if %{with doc} %postun -n ghc-%{name}-doc if [ "$1" -eq 0 ] ; then %ghc_reindex_haddock fi %endif %files %defattr(-,root,root,-) %doc CONFIG LICENSE README STYLE TODO man/%{name}.hs.orig %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/%{name}-start %{_mandir}/man1/%{name}.1* %{_datadir}/xsessions/%{name}.desktop %{_sysconfdir}/skel/.%{name}/%{name}.hs %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %defattr(-,root,root,-) %if %{with doc} %files -n ghc-%{name}-doc -f ghc-%{name}-doc.files %defattr(-,root,root,-) %endif %if %{with prof} %files -n ghc-%{name}-prof -f ghc-%{name}-prof.files %defattr(-,root,root,-) %endif %changelog * Wed May 6 2009 Yaakov M. Nemoy - 0.8.1-12 - applies changes from jens' patch - renames xmonad.desktop entry - adds .orig of the xmonad default config - modifies manpage patch to use 'better' filenames - renames manpage patch * Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-11 - adds runghc hack taken from haddock * Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-10 - converts the sample config into a patch on the upstream source - renumbers down the source lines * Mon Apr 20 2009 Jens Petersen - 0.8.1-9 - update to latest macros.ghc without ghc_version (cabal2spec-0.15) - require xorg-x11-apps for xmessage * Mon Apr 6 2009 Jens Petersen - merge xmonad-session into xmonad-start - fix with_prof configure test * Thu Apr 02 2009 Till Maas - 0.8.1-8 - remove tabs in spec - rename start-xmonad to xmonad-start for consistency with xmonad-session - add directory creation and exec of xmonad to start-xmonad - install xmonad.hs that only displays manpage in /etc/skel/.xmonad/xmonad.hs - add xterm dependency * Tue Mar 31 2009 Yaakov M. Nemoy - 0.8.1-7 - added session and start scripts * Mon Mar 30 2009 Till Maas - 0.8.1-6 - add desktop file - install man page - include sample config file (xmonad.hs) - include other documentation files * Tue Mar 17 2009 Yaakov M. Nemoy - 0.8.1-5 - refixes permissions after doing it wrong the first time * Fri Mar 13 2009 Yaakov M. Nemoy - 0.8.1-4 - fixed license to BSD - fixed version of X11 to be a tad more flexible - fixes permissions of /usr/bin/xmonad * Mon Mar 2 2009 Yaakov M. Nemoy - 0.8.1-3 - updated to newest cabal2spec 0.12 - this includes the shiny new devel package * Tue Feb 24 2009 Yaakov M. Nemoy - 0.8.1-2 - updated spec to meet new guidelines ala cabal2spec 0.7 * Wed Jan 21 2009 ynemoy - 0.8.1-1 - initial packaging for Fedora created by cabal2spec Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xmonad/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 6 May 2009 20:56:25 -0000 1.1 +++ sources 6 May 2009 22:00:28 -0000 1.2 @@ -0,0 +1 @@ +03a8f0a420902d9eea3df1d8d62598c7 xmonad-0.8.1.tar.gz From clumens at fedoraproject.org Wed May 6 22:04:12 2009 From: clumens at fedoraproject.org (Christopher Edward Lumens) Date: Wed, 6 May 2009 22:04:12 +0000 (UTC) Subject: rpms/anaconda/F-11 anaconda-efi.patch,1.3,1.4 Message-ID: <20090506220412.7F2BB70108@cvs1.fedora.phx.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32621 Modified Files: anaconda-efi.patch Log Message: In a previous commit, I screwed up this patch to where a .orig file was also included in it. That's no good. anaconda-efi.patch: Index: anaconda-efi.patch =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda-efi.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- anaconda-efi.patch 9 Apr 2009 21:04:58 -0000 1.3 +++ anaconda-efi.patch 6 May 2009 22:04:12 -0000 1.4 @@ -219,1013 +219,6 @@ diff -ruN anaconda-11.5.0.42.orig/script --grubpkg ${grubpkg} local ret=$? if [ $ret -ne 0 ]; then -diff -ruN anaconda-11.5.0.42.orig/scripts/mk-images.orig anaconda-11.5.0.42/scripts/mk-images.orig ---- anaconda-11.5.0.42.orig/scripts/mk-images.orig 1969-12-31 19:00:00.000000000 -0500 -+++ anaconda-11.5.0.42/scripts/mk-images.orig 2009-04-09 16:53:01.000000000 -0400 -@@ -0,0 +1,1003 @@ -+#!/bin/bash -+# -+# mk-images -+# -+# Copyright (C) 2007 Red Hat, Inc. All rights reserved. -+# -+# 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, see . -+# -+ -+LANG=C -+ -+PATH=$PATH:/sbin:/usr/sbin -+IMAGEUUID=$(date +%Y%m%d%H%M).$(uname -i) -+TMPDIR=${TMPDIR:-/tmp} -+ -+usage () { -+ echo "usage: mk-images